维修维保专维 提交

src/utils/plugins/components.js

@@ -4,8 +4,9 @@
  * @date 2020年09月01日
  * @description 八大系统下,主要设备维保事项,主要设备维修事项,专维及其他事项 param属性下,新增 wznw,apply字段,
  *              供 src/views/equipment/eqDialog.vue 页面 title右侧icon跳转使用
- * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外)
+ * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外) wznw为0,-1时,不上传改字段
  * @param { string } apply  事项类型, 含: 维修维保,专维及其他
+ * @param { string } difference 区分给排水 取值范围：给水；排水 给排水专用字段
  *
  */
 var system = [
@@ -42,17 +43,17 @@ var system = [
                         {
                             label: '配电室内重要维保',
                             id: 'GDWB1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '配电室外重要维保',
                             id: 'GDWB2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', diff: 'ourct2', wznw: '-1', apply: 'wb' },
+                            param: { tab_code: 'rb', diff: 'ourct2', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -63,17 +64,17 @@ var system = [
                         {
                             label: '配电室内重要维修',
                             id: 'GDWX1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '配电室外重要维修',
                             id: 'GDWX2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', diff: 'rc', wznw: '-1', apply: 'wx' },
+                            param: { tab_code: 'rx', diff: 'rc', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -84,12 +85,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'GDZW',
-                            param: { tab_code: '1592', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'GDQT',
-                            param: { tab_code: '1593', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1593', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -157,17 +158,17 @@ var system = [
                         {
                             label: '冷源机房内重要维保',
                             id: 'NTWB1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '冷源机房外重要维保',
                             id: 'NTWB2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: 'wb' },
+                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                     id: 'NTWB',
@@ -178,17 +179,17 @@ var system = [
                         {
                             label: '冷源机房内重要维修',
                             id: 'NTWX1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '冷源机房外重要维修',
                             id: 'NTWX2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: 'wx' },
+                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                     id: 'NTWX',
@@ -199,12 +200,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'NTZW',
-                            param: { tab_code: '1592', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'NTQT',
-                            param: { tab_code: '1593', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1593', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                     id: 'NTZW',
@@ -269,17 +270,17 @@ var system = [
                         {
                             label: '中控室/消防泵房内重要维保',
                             id: 'XFWB1',
-                            param: { tab_code: '1573', diff: 'in', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1573', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '中控室/消防泵房外重要维保',
                             id: 'XFWB2',
-                            param: { tab_code: '1572', diff: 'out', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: '1572', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: 'wb' },
+                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -290,17 +291,17 @@ var system = [
                         {
                             label: '中控室/消防泵房内重要维修',
                             id: 'XFWX1',
-                            param: { tab_code: '1573', diff: 'in', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1573', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '中控室/消防泵房外重要维修',
                             id: 'XFWX2',
-                            param: { tab_code: '1572', diff: 'out', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: '1572', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: 'wx' },
+                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -311,12 +312,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'XFZW',
-                            param: { tab_code: '1576', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1576', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'XFQT',
-                            param: { tab_code: '1572', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1572', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -385,17 +386,17 @@ var system = [
                         {
                             label: '慧云机房内重要维保',
                             id: 'RDWB1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '慧云机房外重要维保',
                             id: 'RDWB2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: 'wb' },
+                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -406,17 +407,17 @@ var system = [
                         {
                             label: '慧云机房内重要维修',
                             id: 'RDWX1',
-                            param: { tab_code: '1592', diff: 'in', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', diff: 'in', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '慧云机房外重要维修',
                             id: 'RDWX2',
-                            param: { tab_code: '1593', diff: 'out', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: '1593', diff: 'out', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: 'wx' },
+                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -427,12 +428,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'RDZW',
-                            param: { tab_code: '1592', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'RDQT',
-                            param: { tab_code: '1593', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1593', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -481,17 +482,17 @@ var system = [
                         {
                             label: '给水系统重要维保',
                             id: 'GSWB1',
-                            param: { tab_code: 'gps01', diff: 'gs', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: 'gps01', diff: 'gs', difference: '给水', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '排水系统重要维保',
                             id: 'GSWB2',
-                            param: { tab_code: 'gps02', diff: 'ps', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: 'gps02', diff: 'ps', difference: '排水', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: 'wb' },
+                            param: { tab_code: 'rb', diff: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -502,17 +503,17 @@ var system = [
                         {
                             label: '给水系统重要维修',
                             id: 'GSWX1',
-                            param: { tab_code: '1592', diff: 'gs', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', diff: 'gs', difference: '给水', wznw: '内', apply: '维修维保' },
                         },
                         {
                             label: '排水系统重要维修',
                             id: 'GSWX2',
-                            param: { tab_code: '1593', diff: 'ps', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: '1593', diff: 'ps', difference: '排水', wznw: '外', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: 'wx' },
+                            param: { tab_code: 'rx', diff: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -523,17 +524,17 @@ var system = [
                         {
                             label: '给水系统专项维修',
                             id: 'GSZW1',
-                            param: { tab_code: '1592', difference: '给水', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', difference: '给水', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '排水系统专项维修',
                             id: 'GSZW2',
-                            param: { tab_code: '1593', difference: '排水', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1593', difference: '排水', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'GSQT',
-                            param: { tab_code: '1594', difference: '', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1594', difference: '', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -582,12 +583,12 @@ var system = [
                         {
                             label: '重要维保事项',
                             id: 'DTWB1',
-                            param: { tab_code: 'dt01', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: 'dt01', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -598,12 +599,12 @@ var system = [
                         {
                             label: '重要维修事项',
                             id: 'DTWX1',
-                            param: { tab_code: 'dt01', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: 'dt01', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -614,12 +615,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'DTZW',
-                            param: { tab_code: 'dt01', wznw: '0', apply: 'zw' },
+                            param: { tab_code: 'dt01', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'DTQT',
-                            param: { tab_code: 'dt02', wznw: '0', apply: 'zw' },
+                            param: { tab_code: 'dt02', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -658,12 +659,12 @@ var system = [
                         {
                             label: '重要维保事项',
                             id: 'RQWB1',
-                            param: { tab_code: '1592', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1592', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -674,12 +675,12 @@ var system = [
                         {
                             label: '重要维修事项',
                             id: 'RQWX1',
-                            param: { tab_code: '1592', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -690,12 +691,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'RQZW',
-                            param: { tab_code: '1592', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'RQQT',
-                            param: { tab_code: '1593', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1593', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },
@@ -748,12 +749,12 @@ var system = [
                         {
                             label: '重要维保事项',
                             id: 'TJWB1',
-                            param: { tab_code: '1592', wznw: 'in', apply: 'wb' },
+                            param: { tab_code: '1592', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维保事项',
                             id: 'RB',
-                            param: { tab_code: 'rb', wznw: 'out', apply: 'wb' },
+                            param: { tab_code: 'rb', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -764,12 +765,12 @@ var system = [
                         {
                             label: '重要维修事项',
                             id: 'TJWX1',
-                            param: { tab_code: '1592', wznw: 'in', apply: 'wx' },
+                            param: { tab_code: '1592', wznw: '0', apply: '维修维保' },
                         },
                         {
                             label: '日常维修事项',
                             id: 'RX',
-                            param: { tab_code: 'rx', wznw: 'out', apply: 'wx' },
+                            param: { tab_code: 'rx', wznw: '-1', apply: '维修维保' },
                         },
                     ],
                 },
@@ -780,12 +781,12 @@ var system = [
                         {
                             label: '专项维修',
                             id: 'TJZW',
-                            param: { tab_code: '1592', wznw: '0', apply: 'zw' },
+                            param: { tab_code: '1592', wznw: '0', apply: '专维及其它' },
                         },
                         {
                             label: '其他事项',
                             id: 'TJQT',
-                            param: { tab_code: '1593', wznw: '0', apply: 'wx' },
+                            param: { tab_code: '1593', wznw: '0', apply: '专维及其它' },
                         },
                     ],
                 },

src/views/equipment/eqDialog.vue

@@ -393,16 +393,15 @@ export default {
     computed: {
         showImg: function () {
             let arr = ['QD', 'YL', 'GJSP']
-            //  供电,暖通,消防,弱电,给排水系统的 记录表格中的 日常维保/维修事项 tab页,  不显示icon
+            //  日常维保/维修事项 tab页,  不显示icon
             let flag = true
-            let system = ['1001', '1002', '1003', '1004', '1005']
             let labelArr = ['日常维保事项', '日常维修事项']
-            if (system.indexOf(this.smsxt) !== -1 && labelArr.indexOf(this.tabLabel) !== -1) {
+            if (labelArr.indexOf(this.tabLabel) !== -1) {
                 flag = false
             } else {
                 flag = true
             }
-            // TODO: title右侧 icon入口
+            // title右侧 icon入口
             return arr.indexOf(this.dialogInfo.id.slice(2, 4)) === -1 && this.dialogInfo.label !== '查看图纸' && flag
         },
     },
@@ -510,14 +509,14 @@ export default {
             let param = tabData.children.filter((v) => v.label === this.tabLabel)[0].param
             console.log(`%c${JSON.stringify(param, null, 2)}`, 'color:blue')
             // 获取到 wznw,apply
-            const { wznw, apply } = param
+            const { wznw, apply, difference } = param
             // 打开记录表格
             /**
              * @param { string } system_code 八大系统code
              * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外)
              * @param { string } apply  事项类型, 含: 维修维保,专维及其他
              */
-            this.$refs.Dialog.open({ system_code, wznw, apply })
+            this.$refs.Dialog.open({ system_code, wznw, apply, difference })
         },
         //系统原理图接口
         initImage(typecode) {

src/views/equipment/table/recordDialog.vue

@@ -56,9 +56,9 @@ export default {
         },
     },
     methods: {
-        open({ system_code, wznw, apply }) {
+        open({ system_code, wznw, apply, difference }) {
             this.visible = true
-            this.getRecordList({ system_code, wznw, apply })
+            this.getRecordList({ system_code, wznw, apply, difference })
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
             if (columnIndex === 0) {
@@ -77,15 +77,21 @@ export default {
         /**
          * @param { string } system_code 八大系统code
          * @param { string } wznw   区分各系统内外(如: 慧云机房内,慧云机房外)
-         * @param { string } apply  事项类型, 含: 维修维保,专维及其他
+         * @param { string } apply  事项类型, 含: 维修维保,专维及其它
+         * @param { string } difference 区分给排水 取值范围：给水；排水
          */
-        getRecordList({ system_code, wznw, apply }) {
+        getRecordList({ system_code, wznw, apply, difference }) {
             let getParams = {
                 system_code,
-                // TODO: 添加 wznw, apply 字段
-                //  wznw, apply,
+                apply,
                 plazaId: this.$store.state.plazaId,
             }
+            wznw !== '0' && wznw !== '-1' && wznw && (getParams.wznw = wznw) //专维及其它,不上传该字段
+            // 处理给排水
+            if (difference) {
+                apply !== '专维及其它' && (getParams.difference = difference) //维修维保上传 difference
+                delete getParams.wznw //不上传内外
+            }
             queryRecord({ getParams }).then((res) => {
                 this.tableData = []
                 res.data.forEach((i) => {