Bladeren bron

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 jaren geleden
bovenliggende
commit
646add03d9

+ 6 - 6
src/views/equipment/table/eqListTable.vue

@@ -33,19 +33,19 @@
         </div>
         <el-table :data='tableData' style='width: 100%' :border='true' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable >
+            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width="150">
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' >
+            <el-table-column prop='sl' label='数量'  width="100">
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌'>
+            <el-table-column prop='brand' label='品牌' width="120">
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width="150">
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floorcode' label='楼层' >
+            <el-table-column prop='floorcode' label='楼层' width="100">
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
@@ -85,7 +85,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 12,
             innerVisible: false, //详情弹框
             keyword: '',
             manufacturer: '',

+ 1 - 1
src/views/equipment/table/otherTable.vue

@@ -95,7 +95,7 @@ export default {
             formatter,
             number_format,
             currentPage: 1,
-            size: 10,
+            size: 12,
             keyword: '',
             handleresults: '',
             handledate: '',

+ 6 - 6
src/views/equipment/table/standTable.vue

@@ -33,20 +33,20 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='150'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
-            <el-table-column prop='sl' label='数量' >
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌'>
+            <el-table-column prop='brand' label='品牌' width='120'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层' >
+            <el-table-column prop='floor' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
@@ -84,7 +84,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 13,
             keyword: '',
             floor: '',
             row: {},

+ 4 - 4
src/views/equipment/table/tjTable.vue

@@ -13,12 +13,12 @@
             ></el-input>
             <el-input clearable placeholder='搜索品牌' size='small' @blur='getList' prefix-icon='el-icon-search' v-model='brand' style='width:192px'></el-input>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' style='width: 100%' :border='true'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='category' label='类别' width='160'>
+            <el-table-column prop='category' label='类别'  show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.category || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' width='100'>
+            <el-table-column prop='sl' label='数量' >
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌'>
@@ -51,7 +51,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 11,
+            size: 13,
             lb: '',
             brand: ''
         }

+ 1 - 1
src/views/equipment/table/wbTable.vue

@@ -135,7 +135,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 12,
             sjjssj: '',
             reportdate: '',
             ischange: '',

+ 1 - 1
src/views/equipment/table/wxTable.vue

@@ -143,7 +143,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 10,
+            size: 12,
             reportdate: '',
             sjjssj: '',
             ischange: '',

+ 4 - 4
src/views/equipment/table/zwTable.vue

@@ -62,10 +62,10 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号'></el-table-column>
-            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable>
+            <el-table-column prop='nd' label='年度' show-overflow-tooltip resizable width="80">
                 <template slot-scope='{row}'>{{row.nd || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable>
+            <el-table-column prop='qs' label='期数' show-overflow-tooltip resizable width="80">
                 <template slot-scope='{row}'>{{row.qs || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable>
@@ -74,7 +74,7 @@
             <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.xm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable>
+            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width="100">
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable>
@@ -129,7 +129,7 @@ export default {
             yssjwcsj: '',
             lxsjwcsj: '',
             ssfasm: '',
-            size: 10,
+            size: 12,
             keyword: '',
             nd: '',
             lb: '',

+ 5 - 5
src/views/legendLibrary/index.vue

@@ -99,15 +99,15 @@
                 <el-input size='small' @change='getTableList' prefix-icon='el-icon-search' v-model='keyword' style='width:192px;margin-right:12px;'></el-input>
             </div>
             <el-table :data='tableData' :key='key' :border='true' style='width: 100%'>
-                <el-table-column prop='Name' label='图例名称'>
+                <el-table-column prop='Name' label='图例名称' width='120'>
                     <template slot-scope='{row}'>{{row.Name }}</template>
                 </el-table-column>
-                <el-table-column prop='style' label='图例样式'>
+                <el-table-column prop='style' label='图例样式' width='150'>
                     <template slot-scope='{row}'>
                         <img class='img' :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
                     </template>
                 </el-table-column>
-                <el-table-column prop='Unit' label='单位'>
+                <el-table-column prop='Unit' label='单位' width='120'>
                     <template slot-scope='{row}'>{{row.Unit}}</template>
                 </el-table-column>
                 <el-table-column prop='position' label='对应广场说明书的位置' show-overflow-tooltip>
@@ -116,12 +116,12 @@
                     </template>
                 </el-table-column>
                 <el-table-column label='对应工程信息化' align='center'>
-                    <el-table-column prop='type' label='位置/设备分类' width='240' show-overflow-tooltip>
+                    <el-table-column prop='type' label='位置/设备分类' show-overflow-tooltip>
                         <template slot-scope='{row}'>
                             <span v-for='item in row.InfoLocal ' :key='item.name'>{{item.name}}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop='system' label='专业' show-overflow-tooltip>
+                    <el-table-column prop='system' label='专业' show-overflow-tooltip width='120'>
                         <template slot-scope='{row}'>
                             <span v-for='(item,index) in row.InfoSystems ' :key='index'>{{item.Name}}</span>
                         </template>