Compare commits
No commits in common. "master" and "feature/v1" have entirely different histories.
master
...
feature/v1
|
|
@ -23,16 +23,17 @@
|
||||||
<t-th>操作</t-th>
|
<t-th>操作</t-th>
|
||||||
</t-tr>
|
</t-tr>
|
||||||
<span @click="choose(items)" v-for="items in tableList" :key="items.userId" class="t-tr-span">
|
<span @click="choose(items)" v-for="items in tableList" :key="items.userId" class="t-tr-span">
|
||||||
<t-tr font-size="17" >
|
<t-tr font-size="17" >
|
||||||
<t-td>{{items.serialno}}</t-td>
|
<t-td>{{items.serialno}}</t-td>
|
||||||
<t-td>{{items.name}}</t-td>
|
<t-td>{{items.name}}</t-td>
|
||||||
<t-td>{{items.model}}</t-td>
|
<t-td>{{items.model}}</t-td>
|
||||||
<t-td>{{items.type}}</t-td>
|
<t-td>{{items.type}}</t-td>
|
||||||
<t-td>{{items.deptName}}</t-td>
|
<t-td>{{items.deptName}}</t-td>
|
||||||
<t-td style="color: #007AFF;" ><button @click="choose(items)" type="primary" plain="true">选择</button></t-td>
|
<t-td style="color: #007AFF;" ><button @click="choose(items)" type="primary" plain="true">选择</button></t-td>
|
||||||
</t-tr>
|
</t-tr>
|
||||||
</span>
|
</span>
|
||||||
<view v-if="show_nodata" class="nodata" style="text-align: center;font-size: 18px;color: #999;line-height: 40px;">暂无数据</view>
|
<view v-if="show_nodata" class="nodata" style="text-align: center;font-size: 18px;color: #999;line-height: 40px;">暂无数据</view>
|
||||||
|
|
||||||
</t-table>
|
</t-table>
|
||||||
<uni-pagination show-icon="true" :pageSize="search_data.pagesize" :total="total_pages" :current="search_data.pageno" class="pagination" @change="changePages"></uni-pagination>
|
<uni-pagination show-icon="true" :pageSize="search_data.pagesize" :total="total_pages" :current="search_data.pageno" class="pagination" @change="changePages"></uni-pagination>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
<button @click="search(1)" type="primary">查询</button>
|
<button @click="search(1)" type="primary">查询</button>
|
||||||
</view>
|
</view>
|
||||||
<view class="table_container">
|
<view class="table_container">
|
||||||
<wyb-table @change="changeSelect" ref="table" :enableCheck="enableCheck" :headers="headers" :contents="tableList" style="font-size: 16px;" />
|
<wyb-table @change="changeSelect" ref="table" :enableCheck="enableCheck" :headers="headers" :contents="tableList" />
|
||||||
<view v-if="show_nodata" class="nodata" style="text-align: center;font-size: 18px;color: #999;line-height: 40px;">暂无数据</view>
|
<view v-if="show_nodata" class="nodata" style="text-align: center;font-size: 18px;color: #999;line-height: 40px;">暂无数据</view>
|
||||||
<uni-pagination show-icon="true" :pageSize="search_data.pagesize" :total="total_pages" :current="search_data.pageno" class="pagination" @change="changePages"></uni-pagination>
|
<uni-pagination show-icon="true" :pageSize="search_data.pagesize" :total="total_pages" :current="search_data.pageno" class="pagination" @change="changePages"></uni-pagination>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: fontSize[0] + 'rpx',
|
||||||
color: headerFtColor,
|
color: headerFtColor,
|
||||||
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
||||||
backgroundColor: headerBgColor,
|
backgroundColor: headerBgColor,
|
||||||
|
|
@ -95,6 +96,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: fontSize[0] + 'rpx',
|
||||||
fontWeight: headerWeight ? 'bold' : 'normal',
|
fontWeight: headerWeight ? 'bold' : 'normal',
|
||||||
color: headerFtColor,
|
color: headerFtColor,
|
||||||
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
||||||
|
|
@ -170,6 +172,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: (fontSize[1] || fontSize[0]) + 'rpx',
|
||||||
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
||||||
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
||||||
borderRight: '1px solid' + borderColor,
|
borderRight: '1px solid' + borderColor,
|
||||||
|
|
@ -197,6 +200,7 @@
|
||||||
color: checkerColor,
|
color: checkerColor,
|
||||||
backgroundColor: checkerBgColor,
|
backgroundColor: checkerBgColor,
|
||||||
paddingTop: (fontSize[1] || fontSize[0]) * 0.15 + 'rpx',
|
paddingTop: (fontSize[1] || fontSize[0]) * 0.15 + 'rpx',
|
||||||
|
fontSize: (fontSize[1] || fontSize[0]) + 'rpx',
|
||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -214,6 +218,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: (fontSize[1] || fontSize[0]) + 'rpx',
|
||||||
textDecoration: autoTextDecoration(cIndex, hIndex),
|
textDecoration: autoTextDecoration(cIndex, hIndex),
|
||||||
color: autoContentColor(cIndex, hIndex),
|
color: autoContentColor(cIndex, hIndex),
|
||||||
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
||||||
|
|
@ -252,6 +257,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: (fontSize[1] || fontSize[0]) + 'rpx',
|
||||||
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
||||||
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
||||||
borderRight: '1px solid' + borderColor,
|
borderRight: '1px solid' + borderColor,
|
||||||
|
|
@ -274,6 +280,7 @@
|
||||||
: textAlign === 'left'
|
: textAlign === 'left'
|
||||||
? 'flex-start'
|
? 'flex-start'
|
||||||
: 'flex-end',
|
: 'flex-end',
|
||||||
|
fontSize: (fontSize[1] || fontSize[0]) + 'rpx',
|
||||||
color: contentFtColor,
|
color: contentFtColor,
|
||||||
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
minHeight: (minHeight[1] || minHeight[0]) + 'rpx',
|
||||||
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx',
|
||||||
|
|
|
||||||
|
|
@ -1112,7 +1112,7 @@
|
||||||
|
|
||||||
.table_tr1 {
|
.table_tr1 {
|
||||||
position: relative;
|
position: relative;
|
||||||
font-size: 17px;
|
font-size: 14px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 16.65%;
|
height: 16.65%;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ export const globalInterceptor = {
|
||||||
*/
|
*/
|
||||||
export const config = {
|
export const config = {
|
||||||
// baseURL: "/gyhl",
|
// baseURL: "/gyhl",
|
||||||
baseURL:"http://36.213.68.14:32/gyhl",
|
baseURL:"http://36.137.58.70:52/gyhl/",
|
||||||
// baseURL: 'http://120.132.17.220:8888',
|
// baseURL: 'http://120.132.17.220:8888',
|
||||||
// baseURL: 'http://192.168.1.50:8888',
|
// baseURL: 'http://192.168.1.50:8888',
|
||||||
// baseURL: "http://36.212.152.5:32/gyhl",
|
// baseURL: "http://36.212.152.5:32/gyhl",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue