瀏覽代碼

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

yunxing 4 年之前
父節點
當前提交
5f8383ae23

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
         "axios": "^0.19.2",
         "core-js": "^3.4.4",
         "element-ui": "^2.13.2",
-        "meri-design": "^1.2.8",
+        "meri-design": "^1.3.2",
         "moment": "^2.24.0",
         "quill": "^1.3.7",
         "vue": "^2.6.10",

+ 15 - 6
src/assets/css/rotation.css

@@ -1,7 +1,7 @@
 .overview {
   background: #f2f5f7;
   padding: 16px 20px 20px 20px;
-  height: 100%;
+  height: calc(100% - 48px);
   width: 100%;
 }
 .overview .view-title {
@@ -27,7 +27,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #1f2429;
-  line-height: 21px;
 }
 .overview .view-title .view-button {
   font-family: PingFangSC-Regular, PingFang SC;
@@ -42,6 +41,7 @@
   align-items: center;
   justify-content: center;
   cursor: pointer;
+  border-radius: 4px;
 }
 .overview .view-title .view-button img {
   display: inline-block;
@@ -62,11 +62,13 @@
 }
 .overview .view-box .view-left .lb-left {
   width: 100%;
+  height: 66%;
   flex: 1;
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
   border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-left img {
   width: 100%;
@@ -75,11 +77,12 @@
   z-index: 99;
   position: absolute;
   top: 0;
-  right: 2px;
+  right: 0px;
   width: 32px;
   height: 32px;
   background: rgba(0, 0, 0, 0.6);
   border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-left .lb-img {
   z-index: 101;
@@ -88,6 +91,7 @@
   position: absolute;
   top: 8px;
   right: 10px;
+  cursor: pointer;
 }
 .overview .view-box .view-left .lb-bottom {
   height: 34%;
@@ -101,6 +105,7 @@
   align-items: center;
   background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
   margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-left .lb-bottom nav span:nth-of-type(1) {
   width: 2px;
@@ -116,7 +121,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #025baa;
-  line-height: 19px;
 }
 .overview .view-box .view-left .lb-bottom .place-p1 {
   height: 24px;
@@ -130,6 +134,7 @@
   width: 16px;
   height: 16px;
   margin-right: 3px;
+  margin-top: -3px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 {
   margin: 16px 0;
@@ -191,20 +196,23 @@
 }
 .overview .view-box .view-right .view-right-box .lb-right {
   flex: 1;
+  height: 47%;
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
   border: 1px solid #ccc;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
   z-index: 99;
   position: absolute;
   top: 0;
-  right: 2px;
+  right: 0px;
   width: 32px;
   height: 32px;
   background: rgba(0, 0, 0, 0.6);
   border-radius: 0px 4px 0px 4px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-img {
   z-index: 101;
@@ -213,6 +221,7 @@
   position: absolute;
   top: 8px;
   right: 10px;
+  cursor: pointer;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
   height: 53%;
@@ -227,6 +236,7 @@
   align-items: center;
   background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
   margin-bottom: 12px;
+  border-radius: 4px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(1) {
   width: 2px;
@@ -242,7 +252,6 @@
   font-family: MicrosoftYaHeiSemibold;
   font-weight: bold;
   color: #025baa;
-  line-height: 19px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom .view-right-bottom {
   overflow: auto;

+ 12 - 5
src/assets/css/rotation.less

@@ -25,7 +25,6 @@
                 font-family: MicrosoftYaHeiSemibold;
                 font-weight: bold;
                 color: #1f2429;
-                line-height: 21px;
             }
         }
         .view-button {
@@ -41,6 +40,7 @@
             align-items: center;
             justify-content: center;
             cursor: pointer;
+            border-radius: 4px;
             img {
                 display: inline-block;
                 height: 16px;
@@ -69,6 +69,7 @@
                 margin-bottom: 10px;
                 position: relative;
                 border: 1px solid #ccc;
+                border-radius: 4px;
                 img {
                     width: 100%;
                     // height: 100%;
@@ -77,11 +78,12 @@
                     z-index: 99;
                     position: absolute;
                     top: 0;
-                    right: 2px;
+                    right: 0px;
                     width: 32px;
                     height: 32px;
                     background: rgba(0, 0, 0, 0.6);
                     border-radius: 0px 4px 0px 4px;
+                    cursor: pointer;
                 }
                 .lb-img {
                     z-index: 101;
@@ -90,6 +92,7 @@
                     position: absolute;
                     top: 8px;
                     right: 10px;
+                    cursor: pointer;
                 }
             }
             .lb-bottom {
@@ -103,6 +106,7 @@
                     align-items: center;
                     background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
                     margin-bottom: 12px;
+                    border-radius: 4px;
                     span:nth-of-type(1) {
                         width: 2px;
                         height: 16px;
@@ -117,7 +121,6 @@
                         font-family: MicrosoftYaHeiSemibold;
                         font-weight: bold;
                         color: #025baa;
-                        line-height: 19px;
                     }
                 }
                 .place-p1 {
@@ -131,6 +134,7 @@
                         width: 16px;
                         height: 16px;
                         margin-right: 3px;
+                        margin-top: -3px;
                     }
                 }
                 .place-p2 {
@@ -199,15 +203,17 @@
                     margin-bottom: 10px;
                     position: relative;
                     border: 1px solid #ccc;
+                    border-radius: 4px;
                     .lb-icon {
                         z-index: 99;
                         position: absolute;
                         top: 0;
-                        right: 2px;
+                        right: 0px;
                         width: 32px;
                         height: 32px;
                         background: rgba(0, 0, 0, 0.6);
                         border-radius: 0px 4px 0px 4px;
+                        cursor: pointer;
                     }
                     .lb-img {
                         z-index: 101;
@@ -216,6 +222,7 @@
                         position: absolute;
                         top: 8px;
                         right: 10px;
+                        cursor: pointer;
                     }
                 }
                 .lb-right-bottom {
@@ -230,6 +237,7 @@
                         align-items: center;
                         background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
                         margin-bottom: 12px;
+                        border-radius: 4px;
                         span:nth-of-type(1) {
                             width: 2px;
                             height: 16px;
@@ -244,7 +252,6 @@
                             font-family: MicrosoftYaHeiSemibold;
                             font-weight: bold;
                             color: #025baa;
-                            line-height: 19px;
                         }
                     }
                     .view-right-bottom {

+ 2 - 1
src/components/Select/Select.vue

@@ -29,7 +29,7 @@
                     v-html="fakePlaceholder">
                 </span>
             </span>
-            <Triangle v-show="!clearable" :class="triangleClass"></Triangle>
+            <Triangle v-show="!clearable" :class="triangleClass" @click="handleInput"></Triangle>
             <Remove class="p-select-clear" @click.stop="clearAll" v-show="!hideClear && clearable"></Remove>
         </div>
     </div>
@@ -482,6 +482,7 @@ export default {
         * params event事件对象
         */
         handleInput (event) {
+            console.log(event)
             this.query = event.target.value || event.data || ''
             this.showPlaceholder = !this.query
             if (!this.dropInstance) return

+ 5 - 4
src/components/menuList.vue

@@ -87,10 +87,10 @@ export default {
         this.timer = setInterval(() => {
             this.getDraftNum()
         }, this.interval)
-    },
-    // 页面关闭时,清除定时器
-    beforeDestroy() {
-        clearInterval(this.timer)
+        // 页面销毁前,清除定时器
+        this.$once('hook:beforeDestroy', () => {
+            clearInterval(this.timer)
+        })
     },
     methods: {
         /**
@@ -243,6 +243,7 @@ export default {
             float: left;
             width: 80px;
             height: 48px;
+            margin: 0 10px;
             cursor: pointer;
             transition: all 0.2s;
         }

+ 5 - 6
src/utils/plugins/components.js

@@ -325,16 +325,15 @@ var system = [
                             label: "门禁管理",
                             id: "RDQD2",
                             param: { tab_code: "rd01" },
-                        },
-                        {
-                            label: "BA楼宇智能化",
-                            id: "RDQD1",
-                            param: { tab_code: "rd02" },
-                        },
+                        }, 
                         {
                             label: "视频监控",
                             id: "RDQD3",
                             param: { tab_code: "rd03" },
+                        },{
+                            label: "BA楼宇智能化",
+                            id: "RDQD1",
+                            param: { tab_code: "rd02" },
                         },
                     ],
                 },

+ 7 - 4
src/views/equipment/table/djspTable.vue

@@ -22,11 +22,11 @@
             ></el-input>
             <Select @change='getList' v-model='floor' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' :span-method='objectSpanMethod' border style='width: 100%' @row-click='innerVisible = true'>
-            <el-table-column prop='floor' label='楼层' width='200'>
+        <el-table :data='tableData' :span-method='objectSpanMethod' :border='true' style='width: 100%' @row-click='innerVisible = true'>
+            <el-table-column prop='floor' label='楼层' width='50'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='welldes' label='电井间'>
+            <el-table-column prop='welldes' label='电井间' width="120">
                 <template slot-scope='{row}'>{{row.welldes || '--'}}</template>
             </el-table-column>
             <el-table-column prop='meterbox' label='商铺电表数' width='200'>
@@ -40,7 +40,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryShops } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -130,6 +130,9 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(){
+            this.getList()
         }
     },
     mounted() {

+ 20 - 11
src/views/equipment/table/eqDetaileDialog.vue

@@ -48,35 +48,35 @@
             <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable>
+            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable width="80">
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' width='100'>
+            <el-table-column prop='sl' label='数量' width='80'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
             <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbglgs || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sb_status' label='设备状态'>
+            <el-table-column prop='sb_status' label='设备状态' width="80">
                 <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width="80">
                 <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="80">
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' sortable label='楼层' width='100'>
+            <el-table-column prop='floor' sortable label='楼层' width='80'>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
+            <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
             <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable>
@@ -97,7 +97,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { mapGetters } from 'vuex'
 import { queryAsset } from '@/api/equipmentList.js'
 import { querySelect } from '@/api/public.js'
@@ -272,6 +272,15 @@ export default {
                 this.tabFind()
             },
             deep: true
+        },
+        sbglgs(){
+            this.queryTableList()
+        },
+        status(){
+            this.queryTableList()
+        },
+        floor(){
+            this.queryTableList()
         }
     }
 }

+ 14 - 13
src/views/equipment/table/eqListTable.vue

@@ -20,7 +20,7 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' @cancel='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
             <el-input
                 placeholder='搜索生产厂商'
                 clearable
@@ -32,20 +32,20 @@
             ></el-input>
         </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 width="150">
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='type_name' label='设备名称' show-overflow-tooltip resizable width='250'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'  width="100">
+            <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='品牌' width="120">
+            <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 width="150">
+            <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='楼层' width="100">
+            <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>
@@ -73,7 +73,7 @@
     </div>
 </template>
 <script>
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
@@ -85,7 +85,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 12,
+            size: 11,
             innerVisible: false, //详情弹框
             keyword: '',
             manufacturer: '',
@@ -119,11 +119,9 @@ export default {
                 major: this.major
             }
             //下拉
-            if (this.floor) {
-                console.log(this.floor)
+            if (this.floor) {             
                 postParams.gname = this.floor
             }
-            console.log(this.floor)
             //输入框搜索
             data.keyword = ''
             if (this.keyword) {
@@ -138,7 +136,6 @@ export default {
             if (data.keyword == '') {
                 delete data.keyword
             }
-
             queryEquipmentList({ data, postParams }).then(res => {
                 //console.log(res)
                 this.tableData = res.data.data
@@ -152,6 +149,10 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {

+ 11 - 8
src/views/equipment/table/otherTable.vue

@@ -26,7 +26,6 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-
             <Select
                 width='180'
                 tipPlace='top'
@@ -38,7 +37,7 @@
             ></Select>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
             <el-table-column prop='lb' label='其他事项详情' show-overflow-tooltip resizable>
                 <el-table-column prop='zlwfwe' label='记录事项' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.jlsx || '--'}}</template>
@@ -49,23 +48,23 @@
                 <el-table-column prop='content' label='内容' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.content || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='zfje' label='金额(万元)'>
+            <el-table-column prop='zfje' label='金额(万元)' width='80'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2) || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='handledate' label='处理日期'>
+            <el-table-column prop='handledate' label='处理日期' width='130'>
                 <template slot-scope='{row}'>{{row.handledate?formatter(row.handledate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable>
+            <el-table-column prop='handleresults' label='处置结果' show-overflow-tooltip resizable width='100'>
                 <template slot-scope='{row}'>{{row.handleresults || '--'}}</template>
             </el-table-column>
             <el-table-column prop='zlwfwz ' label='资料存放位置' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.zlwfwz || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='recordtime' label='记录日期'>
+            <el-table-column prop='recordtime' label='记录日期' width='140'>
                 <template slot-scope='{row}'>{{row.createdate?formatter(row.createdate): '--'}}</template>
             </el-table-column>
         </el-table>
@@ -87,6 +86,7 @@ import { queryQtsx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { formatter, number_format } from '@/utils/format.js'
 import { querySelect } from '@/api/public.js'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -95,7 +95,7 @@ export default {
             formatter,
             number_format,
             currentPage: 1,
-            size: 12,
+            size: 10,
             keyword: '',
             handleresults: '',
             handledate: '',
@@ -201,6 +201,9 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        handleresults(){
+            this.getList()
         }
     },
     mounted() {

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

@@ -4,7 +4,7 @@
         <el-dialog :title='`${major}${tabName}记录事项`' width='70%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
             <div class='bottom-table' style='height:520px'>
                 <el-table :data='tableData' height='500' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
-                    <el-table-column label='位置' prop width='140' show-overflow-tooltip resizable>
+                    <el-table-column label='位置' prop width='120' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.smswz || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='system' label='设备' width='200' show-overflow-tooltip resizable>

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

@@ -20,7 +20,16 @@
                 v-model='keyword'
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' style='margin-right:12px;' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select
+                @change='getList'
+                @cancel='getList'
+                v-model='floor'
+                style='margin-right:12px;'
+                width='120'
+                tipPlace='top'
+                caption='楼层 :'
+                :selectdata='floorSelect'
+            ></Select>
             <el-input
                 clearable
                 placeholder='搜索生产厂商'
@@ -32,15 +41,15 @@
             ></el-input>
         </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 width='150'>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop label='设备名称' show-overflow-tooltip resizable width='300'>
                 <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
             <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='品牌' width='120'>
+            <el-table-column prop='brand' label='品牌' width='200'>
                 <template slot-scope='{row}'>{{row.brand || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable width='150'>
@@ -73,9 +82,9 @@
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import EqDetail from './eqDetaileDialog'
-import Select from '@/components/Select/Select.vue'
-import { mapGetters } from 'vuex'
 
+import { mapGetters } from 'vuex'
+import { Select } from 'meri-design'
 export default {
     data() {
         return {
@@ -159,6 +168,10 @@ export default {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        floor(newV, oldV) {
+            console.log(newV, oldV)
+            this.getList()
         }
     },
     mounted() {

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

@@ -14,7 +14,7 @@
             <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%' :border='true'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
             <el-table-column prop='category' label='类别'  show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.category || '--'}}</template>
             </el-table-column>

+ 19 - 16
src/views/equipment/table/wbTable.vue

@@ -24,7 +24,7 @@
                 @change='getList'
                 v-model='ischange'
                 style='margin-right:12px'
-                width='190'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -63,48 +63,48 @@
             <input-dialog :type='2' @confirm='confirm'></input-dialog>
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
                     <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='100' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)'>
+                <el-table-column prop='cost' label='费用(万元)' width='80'>
                     <template slot-scope='{row}'>{{row.cost || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
+                <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{number_format(row.source,2) || '--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='brand' label='现场照片'>
+            <el-table-column prop='brand' label='现场照片' width='70'>
                 <template slot-scope='{row}'>
                     <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
+            <el-table-column prop='reportdate' label='填报时间' width='130'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
+            <el-table-column prop='sjjssj' label='验收时间' width='130'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable>
+            <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.wb_gzglid || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -125,7 +125,7 @@
 <script>
 import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
@@ -135,7 +135,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 12,
+            size: 11,
             sjjssj: '',
             reportdate: '',
             ischange: '',
@@ -241,6 +241,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 18 - 24
src/views/equipment/table/wxTable.vue

@@ -24,7 +24,7 @@
                 @change='getList'
                 style='margin-right:12px;'
                 v-model='ischange'
-                width='180'
+                width='200'
                 tipPlace='top'
                 caption='是否更换配件信息 :'
                 :selectdata='changeOption'
@@ -60,59 +60,50 @@
                     end-placeholder
                 ></el-date-picker>
             </div>
-            <input-dialog :type='3' @confirm='confirm'></input-dialog>
-            <!-- <el-input
-                placeholder='搜索工单编号'
-                size='small'
-                @blur='getList'
-                prefix-icon='el-icon-search'
-                v-model='wonum'
-                style='width:192px;margin-right:12px'
-            ></el-input>-->
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable>
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable>
+            <el-table-column prop='assetnum' label='设备编码' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='matters' label='重要事项记录' width='130' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.matters || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable>
+            <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.description || '--'}}</template>
             </el-table-column>
             <el-table-column label='更换配件信息' align='center'>
-                <el-table-column prop='ischangepj' label='是/否更换'>
+                <el-table-column prop='ischangepj' label='是/否更换' width='80'>
                     <template slot-scope='{row}'>{{row.ismodel==1?'是':(row.ismodel==0?"否" :'--')}}</template>
                 </el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop='model' label='配件名称型号' width='100' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.model || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='sl' label='数量'>
+                <el-table-column prop='sl' label='数量' width='80'>
                     <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='cost' label='费用(万元)'>
+                <el-table-column prop='cost' label='费用(万元)' width='80'>
                     <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.source || '--'}}</template>
                 </el-table-column>
             </el-table-column>
-            <el-table-column prop='brand' label='现场照片'>
+            <el-table-column prop='brand' label='现场照片' width='80'>
                 <template slot-scope='{row}'>
                     <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='140'>
+            <el-table-column prop='reportdate' label='填报时间' width='130'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='140'>
+            <el-table-column prop='sjjssj' label='验收时间' width='130'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable>
+            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.wonum || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -134,7 +125,7 @@
 import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
-import Select from '@/components/Select/Select.vue'
+import { Select } from 'meri-design'
 import { formatter, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
@@ -143,7 +134,7 @@ export default {
             tableData: [],
             total: 0,
             currentPage: 1,
-            size: 12,
+            size: 11,
             reportdate: '',
             sjjssj: '',
             ischange: '',
@@ -248,6 +239,9 @@ export default {
                 // this.tabFind()
                 this.getList()
             }
+        },
+        ischange() {
+            this.getList()
         }
     },
     mounted() {

+ 21 - 12
src/views/equipment/table/zwTable.vue

@@ -61,26 +61,26 @@
             <input-dialog v-if='statusOption.length>0' :statusOption='statusOption' :type='4' @confirm='confirm'></input-dialog>
         </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 width="80">
+            <el-table-column type='index' label='序号' width='60'></el-table-column>
+            <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 width="80">
+            <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>
+            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.lb || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable>
+            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.xm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width="100">
+            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
             </el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable>
+            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable min-width="150">
                 <template slot-scope='{row}'>{{row.ssfasm || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable>
+            <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
             </el-table-column>
             <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
@@ -89,13 +89,13 @@
             <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
                 <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable>
+            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable width='90'>
                 <template slot-scope='{row}'>{{row.status || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{number_format(row.zfje,2)|| '--'}}</template>
             </el-table-column>
-            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable>
+            <el-table-column prop='xlcfwz' label='资料存放位置' show-overflow-tooltip resizable width="100">
                 <template slot-scope='{row}'>{{row.xlcfwz || '--'}}</template>
             </el-table-column>
         </el-table>
@@ -129,7 +129,7 @@ export default {
             yssjwcsj: '',
             lxsjwcsj: '',
             ssfasm: '',
-            size: 12,
+            size: 11,
             keyword: '',
             nd: '',
             lb: '',
@@ -289,6 +289,15 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        sxjd(){
+            this.getList()
+        },
+        xm(){
+            this.getList()
+        },
+        lb(){
+            this.getList()
         }
     },
     mounted() {

+ 2 - 2
src/views/other/gcfz1.vue

@@ -9,8 +9,8 @@
         show-summary
         border
     >
-        <el-table-column label='序号' type='index'></el-table-column>
-        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
+        <el-table-column label='序号' type='index' width="60"></el-table-column>
+        <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable >
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
         <el-table-column prop='beforekf' label='总间数'>

+ 3 - 3
src/views/other/zhsxOtherTable1.vue

@@ -37,7 +37,7 @@
             :data='zhjlTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='50'></el-table-column>
+            <el-table-column label='序号' type='index' width='60'></el-table-column>
             <el-table-column prop sortable label='日期' width='90' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
@@ -47,10 +47,10 @@
             <el-table-column prop label='记录事项' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='工作要求'>
+            <el-table-column prop label='工作要求' width="160">
                 <template slot-scope='{row}'>{{row.workyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='整改要求'>
+            <el-table-column prop label='整改要求' width="160">
                 <template slot-scope='{row}'>{{row.zgyq||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='附件' width='80'>

+ 1 - 1
src/views/other/zhsxOtherTable2.vue

@@ -55,7 +55,7 @@
             :data='dsfTable'
             style='width: 100%;margin-top:12px'
         >
-            <el-table-column label='序号' type='index' width='50'></el-table-column>
+            <el-table-column label='序号' type='index' width='60'></el-table-column>
             <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>

+ 5 - 5
src/views/room/room3.vue

@@ -9,20 +9,20 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='设备简称' resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.classqc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='70'>
+                <el-table-column prop label='数量' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.sl||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='品牌' :show-overflow-tooltip='true'>
+                <el-table-column prop label='品牌' :show-overflow-tooltip='true' width="120">
                     <template slot-scope='{row}'>{{row.brand||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='型号' :show-overflow-tooltip='true'>
+                <el-table-column prop label='型号' :show-overflow-tooltip='true' width="150">
                     <template slot-scope='{row}'>{{row.sbxh||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='70'>
+                <el-table-column prop label='楼层' :show-overflow-tooltip='true' width='100'>
                     <template slot-scope='{row}'>{{row.floorcode||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop :show-overflow-tooltip='true' label='生产厂商' min-width='150'>

+ 10 - 10
src/views/room/room4.vue

@@ -8,41 +8,41 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备编号' show-overflow-tooltip resizable>
+                <el-table-column prop label='设备编号' show-overflow-tooltip resizable width="80"> 
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='重要事项记录' width='130' show-overflow-tooltip resizable>
+                <el-table-column prop label='重要事项记录'  show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
-                    <el-table-column prop label='是/否更换' show-overflow-tooltip resizable>
+                    <el-table-column prop label='是/否更换' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>
                             <div v-if='row.ismodel==0'>否</div>
                             <div v-else-if='row.ismodel==1'>是</div>
                             <div v-else>'--'</div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop label='配件名称型号' width='130' min-width='110' show-overflow-tooltip resizable>
+                    <el-table-column prop label='配件名称型号'  min-width='100' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.model||'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='数量' show-overflow-tooltip resizable>
+                    <el-table-column prop label='数量' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='费用(万元)' min-width='100' show-overflow-tooltip resizable>
+                    <el-table-column prop label='费用(万元)' min-width='80' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.cost?number_format(row.cost):'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable>
+                    <el-table-column prop label='费用出处' show-overflow-tooltip resizable width="80">
                         <template slot-scope='{row}'>{{row.source||'--'}}</template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column prop label='现场照片' show-overflow-tooltip resizable>
+                <el-table-column prop label='现场照片' show-overflow-tooltip resizable width="80">
                     <template slot-scope='{row}'>{{row.pics || '--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='填报时间' show-overflow-tooltip resizable width='130'>
@@ -51,7 +51,7 @@
                 <el-table-column prop label='验收时间' show-overflow-tooltip width='130' resizable>
                     <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj):'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='工单编号' show-overflow-tooltip resizable>
+                <el-table-column prop label='工单编号' show-overflow-tooltip resizable width="80">
                     <template slot-scope='{row}'>{{row.wonum||'--'}}</template>
                 </el-table-column>
             </el-table>

+ 3 - 3
src/views/room/room5.vue

@@ -8,17 +8,17 @@
                 style='width: 100%'
                 :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
             >
-                <el-table-column type='index' label='序号' width='50'></el-table-column>
+                <el-table-column type='index' label='序号' width='60'></el-table-column>
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备编号' :show-overflow-tooltip='true'>
+                <el-table-column prop label='设备编号' :show-overflow-tooltip='true' width="80">
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='150'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='现场照片' :show-overflow-tooltip='true'>
+                <el-table-column prop label='现场照片' :show-overflow-tooltip='true' width="80">
                     <template slot-scope='{row}'>
                         <div
                             style='cursor:pointer;color: #0091ff;'