diff --git a/components/system/chooseDeviceSingle.vue b/components/system/chooseDeviceSingle.vue index e02110b..e2abd1c 100644 --- a/components/system/chooseDeviceSingle.vue +++ b/components/system/chooseDeviceSingle.vue @@ -23,17 +23,16 @@ 操作 - - {{items.serialno}} - {{items.name}} - {{items.model}} - {{items.type}} - {{items.deptName}} - - + + {{items.serialno}} + {{items.name}} + {{items.model}} + {{items.type}} + {{items.deptName}} + + 暂无数据 - diff --git a/components/system/chooseUserMulti.vue b/components/system/chooseUserMulti.vue index 7951485..9c5a7a6 100644 --- a/components/system/chooseUserMulti.vue +++ b/components/system/chooseUserMulti.vue @@ -14,7 +14,7 @@ - + 暂无数据 diff --git a/components/wyb-table/wyb-table.vue b/components/wyb-table/wyb-table.vue index 6438933..a891285 100644 --- a/components/wyb-table/wyb-table.vue +++ b/components/wyb-table/wyb-table.vue @@ -51,7 +51,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: fontSize[0] + 'rpx', color: headerFtColor, padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx', backgroundColor: headerBgColor, @@ -96,7 +95,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: fontSize[0] + 'rpx', fontWeight: headerWeight ? 'bold' : 'normal', color: headerFtColor, padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx', @@ -172,7 +170,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: (fontSize[1] || fontSize[0]) + 'rpx', minHeight: (minHeight[1] || minHeight[0]) + 'rpx', padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx', borderRight: '1px solid' + borderColor, @@ -200,7 +197,6 @@ color: checkerColor, backgroundColor: checkerBgColor, paddingTop: (fontSize[1] || fontSize[0]) * 0.15 + 'rpx', - fontSize: (fontSize[1] || fontSize[0]) + 'rpx', }" /> @@ -218,7 +214,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: (fontSize[1] || fontSize[0]) + 'rpx', textDecoration: autoTextDecoration(cIndex, hIndex), color: autoContentColor(cIndex, hIndex), minHeight: (minHeight[1] || minHeight[0]) + 'rpx', @@ -257,7 +252,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: (fontSize[1] || fontSize[0]) + 'rpx', minHeight: (minHeight[1] || minHeight[0]) + 'rpx', padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx', borderRight: '1px solid' + borderColor, @@ -280,7 +274,6 @@ : textAlign === 'left' ? 'flex-start' : 'flex-end', - fontSize: (fontSize[1] || fontSize[0]) + 'rpx', color: contentFtColor, minHeight: (minHeight[1] || minHeight[0]) + 'rpx', padding: padding[0] + 'rpx ' + (padding[1] || padding[0]) + 'rpx', diff --git a/pages/index/index.vue b/pages/index/index.vue index 39c7f46..0986351 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1112,7 +1112,7 @@ .table_tr1 { position: relative; - font-size: 14px; + font-size: 17px; width: 100%; height: 16.65%; color: #fff; diff --git a/request/js/config.js b/request/js/config.js index 15495ea..90da782 100644 --- a/request/js/config.js +++ b/request/js/config.js @@ -15,7 +15,7 @@ export const globalInterceptor = { */ export const config = { // baseURL: "/gyhl", - baseURL:"http://36.137.58.70:52/gyhl/", + baseURL:"http://36.213.68.14:32/gyhl", // baseURL: 'http://120.132.17.220:8888', // baseURL: 'http://192.168.1.50:8888', // baseURL: "http://36.212.152.5:32/gyhl",