YaolongHan 4 rokov pred
rodič
commit
fbcce8692e

+ 3 - 3
src/api/equipmentList.js

@@ -21,12 +21,12 @@ export function queryWbsms({ data, getParams }) {
 
 // 设备设施-维修事项
 export function queryWx({ data, getParams }) {
-    return httputils.getJson(`/api/data/glsms_wx/query`, data, getParams)
+    return httputils.getJson(`/api/data/v_glsms_wx/query`, data, getParams)
 }
 
 // 设备设施-专维
-export function queryZw({ getParams }) {
-    return httputils.getJson(`/api/data/glsms_zw/query`, getParams)
+export function queryZw({ data, getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_zw/query`, data, getParams)
 }
 
 // 设备设施-其他事项

+ 1 - 1
src/views/equipment/eqDialog.vue

@@ -43,7 +43,7 @@
                         <!-- 维修的表格 -->
                         <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' major='维修'></wx-table>
                         <!-- 专维 -->
-                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' param major='专维'></zw-table>
+                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' major='专维'></zw-table>
                         <!-- 其他 -->
                         <other-table v-else-if='value.id.slice(2,4)=="QT"' param major='其他'></other-table>
                         <!-- 建筑立面图 -->

+ 8 - 8
src/views/equipment/table/eqDetaileDialog.vue

@@ -17,17 +17,17 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='sbjc' label='设备简称' width='140'></el-table-column>
-            <el-table-column prop='sbbh' label='设备编号'></el-table-column>
+            <el-table-column prop='sbjc' label='设备简称' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbbh' label='设备编号' show-overflow-tooltip resizable></el-table-column>
             <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='glgs' label='管理归属'></el-table-column>
+            <el-table-column prop='glgs' label='管理归属' show-overflow-tooltip resizable></el-table-column>
             <el-table-column prop='sbbh' label='设备状态'></el-table-column>
-            <el-table-column prop='brand' label='品牌'></el-table-column>
-            <el-table-column prop='sbxh' label='型号'></el-table-column>
+            <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable></el-table-column>
             <el-table-column prop='floor' label='楼层'></el-table-column>
-            <el-table-column prop='azwz' label='安装位置' resizable></el-table-column>
-            <el-table-column prop='manufacturer' label='生产厂商' width='240'></el-table-column>
-            <el-table-column prop='fws' label='服务商' width='240'></el-table-column>
+            <el-table-column prop='azwz' label='安装位置' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination

+ 13 - 11
src/views/equipment/table/wbTable.vue

@@ -14,21 +14,21 @@
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称'></el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码'></el-table-column>
-            <el-table-column prop='matters' label='重要事项记录' width='160'></el-table-column>
-            <el-table-column prop='description' label='描述'></el-table-column>
-            <el-table-column label='更换配件信息' align='center'>
+            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column label='更换配件信息'>
                 <el-table-column prop='ischangepj' label='是/否更换' width='120'></el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120'></el-table-column>
-                <el-table-column prop='address' label='数量' width='300'></el-table-column>
+                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable></el-table-column>
+                <el-table-column prop='address' label='数量'></el-table-column>
                 <el-table-column prop='cost' label='费用(万元)' width='120'></el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120'></el-table-column>
+                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable></el-table-column>
             </el-table-column>
             <el-table-column prop='brand' label='现场照片'></el-table-column>
             <el-table-column prop='startDate' label='填报时间'></el-table-column>
             <el-table-column prop='enddate' label='验收时间'></el-table-column>
-            <el-table-column prop='wonum' label='任务编号'></el-table-column>
+            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -74,9 +74,9 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    tab: this.major,
+                    // tab: this.major,
                     // plazaId: this.$store.state.plazaId,
-                    plazaId: '1000303',
+                    plazaId: '1000287',
                     page: this.currentPage,
                     size: this.size
                 }
@@ -107,6 +107,7 @@ export default {
         }
     },
     mounted() {
+        console.log(this.smsxt)
         this.init()
         this.getList()
     }
@@ -116,6 +117,7 @@ export default {
 .wb-list {
     .eq-list-top {
         display: flex;
+        margin-bottom: 20px;
     }
     .foot {
         position: absolute;

+ 12 - 11
src/views/equipment/table/wxTable.vue

@@ -12,23 +12,23 @@
             <Select @change='getList' width='120' tipPlace='top' caption='是否更换配件信息 :' :selectdata='floorSelect'></Select>
             <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' :border='true' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' width='160'></el-table-column>
-            <el-table-column prop='sbjbm' label='设备编码'></el-table-column>
-            <el-table-column prop='matters' label='重要事项记录'></el-table-column>
-            <el-table-column prop='description' label='描述'></el-table-column>
+            <el-table-column prop='sbjc' label='设备名称' width='160' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbjbm' label='设备编码' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='matters' label='重要事项记录' width='240' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='description' label='描述' width='200' show-overflow-tooltip resizable></el-table-column>
             <el-table-column label='更换配件信息'>
                 <el-table-column prop='ischangepj' label='是/否更换' width='120'></el-table-column>
-                <el-table-column prop='model' label='配件名称型号' width='120'></el-table-column>
-                <el-table-column prop='address' label='数量' width='300'></el-table-column>
+                <el-table-column prop='model' label='配件名称型号' width='120' show-overflow-tooltip resizable></el-table-column>
+                <el-table-column prop='address' label='数量'></el-table-column>
                 <el-table-column prop='cost' label='费用(万元)' width='120'></el-table-column>
-                <el-table-column prop='source' label='费用出处' width='120'></el-table-column>
+                <el-table-column prop='source' label='费用出处' width='120' show-overflow-tooltip resizable></el-table-column>
             </el-table-column>
             <el-table-column prop='brand' label='现场照片'></el-table-column>
             <el-table-column prop='startDate' label='填报时间'></el-table-column>
             <el-table-column prop='enddate' label='验收时间'></el-table-column>
-            <el-table-column prop='wonum' label='工单编号'></el-table-column>
+            <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -74,9 +74,9 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    tab: this.major,
+                    // tab: this.major,
                     // plazaId: this.$store.state.plazaId,
-                    plazaId: '1000303',
+                    plazaId: '1000388',
                     page: this.currentPage,
                     size: this.size
                 }
@@ -117,6 +117,7 @@ export default {
 .wb-list {
     .eq-list-top {
         display: flex;
+        margin-bottom: 20px;
     }
     .foot {
         position: absolute;

+ 33 - 24
src/views/equipment/table/zwTable.vue

@@ -13,18 +13,18 @@
         </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='sbjbm' label='年度' width='160'></el-table-column>
-            <el-table-column prop='sbjbm' label='期数' width='160'></el-table-column>
-            <el-table-column prop='lb' label='类别'></el-table-column>
-            <el-table-column prop='xm' label='项目'></el-table-column>
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='ssfasm' label='实施方案说明'></el-table-column>
+            <el-table-column prop='sbjbm' label='年度' width='160' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sbjbm' label='期数' width='160' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='lb' label='类别' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='xm' label='项目' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='sl' label='数量' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='ssfasm' label='实施方案说明' show-overflow-tooltip resizable width='200'></el-table-column>
             <el-table-column prop='wzjc' label='当前阶段' show-overflow-tooltip resizable width='140'></el-table-column>
-            <el-table-column prop='startDate' label='立项日期'></el-table-column>
-            <el-table-column prop='endDate' label='验收日期'></el-table-column>
-            <el-table-column prop='status' label='验收结果'></el-table-column>
-            <el-table-column prop='zfje' label='结算金额'></el-table-column>
-            <el-table-column prop='zlwfwz' label='资料存放位置'></el-table-column>
+            <el-table-column prop='startDate' label='立项日期' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='endDate' label='验收日期' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='zfje' label='结算金额' show-overflow-tooltip resizable></el-table-column>
+            <el-table-column prop='zlwfwz' label='资料存放位置' show-overflow-tooltip resizable></el-table-column>
         </el-table>
         <div class='foot'>
             <el-pagination
@@ -63,7 +63,7 @@ export default {
     computed: {
         ...mapGetters(['floorsArr'])
     },
-    props: ['param', 'major'],
+    props: ['smsxt'],
     methods: {
         pageChanged(page, size) {
             this.currentPage = page
@@ -71,19 +71,19 @@ export default {
             this.getList()
         },
         getList() {
-            let postParams = {
-                CLASSSTRUCTUREID: this.param
+            let getParams = {
+                data: {
+                    smsxt: this.smsxt,
+                    // tab: this.major,
+                    // plazaId: this.$store.state.plazaId,
+                    plazaId: '1000287',
+                    page: this.currentPage,
+                    size: this.size
+                }
             }
-            let data = {
-                page: this.currentPage,
-                size: this.size,
-                plazaId: this.$store.state.plazaId,
-                major: this.major
-            }
-            queryZw({ data, postParams }).then(res => {
-                console.log(res)
-                this.tableData = res.data.data
-                this.total = res.data.count
+            queryZw(getParams).then(res => {
+                this.tableData = res.data || []
+                this.total = res.count
             })
         }
         // init() {
@@ -99,6 +99,14 @@ export default {
         //     }
         // }
     },
+    watch: {
+        smsxt(newV, oldV) {
+            if (newV !== oldV) {
+                // this.init()
+                this.getList()
+            }
+        }
+    },
     mounted() {
         // this.init()
         this.getList()
@@ -109,6 +117,7 @@ export default {
 .zw-list {
     .eq-list-top {
         display: flex;
+        margin-bottom: 20px;
     }
     .foot {
         position: absolute;

+ 2 - 2
vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
                 },
             },
             "/serve": {
-                target: "http://192.168.200.83:8085/",
+                target: "http://192.168.200.87:8088/topology-wanda",
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {
@@ -43,4 +43,4 @@ module.exports = {
     },
     lintOnSave: false,
     publicPath: '/dist',
-}
+}