Browse Source

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

YaolongHan 4 years ago
parent
commit
cac5341970

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

@@ -322,9 +322,9 @@ export default {
 }
 </style>
 <style lang="less" >
-.el-dialog__wrapper {
-    z-index: 20001 !important;
-}
+// .el-dialog__wrapper {
+//     z-index: 20001 !important;
+// }
 .dialog-container {
     .el-dialog__header {
         padding: 16px 24px;

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

@@ -72,7 +72,7 @@
             <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='设备状态' width='80'>
+            <el-table-column prop='sb_status' label='设备状态' width='80' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sb_status || '--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌' show-overflow-tooltip resizable width='80'>
@@ -81,7 +81,7 @@
             <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='80'>
+            <el-table-column prop='floor' sortable label='楼层' width='80' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable min-width='150'>

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

@@ -86,10 +86,10 @@
                     <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.model || '--'}}</template>
                     </el-table-column>
-                    <el-table-column prop='sl' label='数量' width='80'>
+                    <el-table-column prop='sl' label='数量' width='80' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
+                    <el-table-column prop='cost' label='费用(万元)' show-overflow-tooltip resizable width='80' align='right'>
                         <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>

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

@@ -86,10 +86,10 @@
                     <el-table-column prop='model' label='配件名称型号' width='140' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.model || '--'}}</template>
                     </el-table-column>
-                    <el-table-column prop='sl' label='数量' width='80'>
+                    <el-table-column prop='sl' label='数量' width='80' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
                     </el-table-column>
-                    <el-table-column prop='cost' label='费用(万元)' width='80' align='right'>
+                    <el-table-column prop='cost' label='费用(万元)' width='80' align='right' show-overflow-tooltip resizable>
                         <template slot-scope='{row}'>{{number_format(row.cost,2) || '--'}}</template>
                     </el-table-column>
                     <el-table-column prop='source' label='费用出处' show-overflow-tooltip resizable width='100'>

+ 9 - 9
src/views/other/gcfz2.vue

@@ -52,10 +52,10 @@
                 </el-table-column>
                 <el-table-column prop label='库存变化' align='center'>
                     <el-table-column prop label='新增(间)'>
-                        <template slot-scope='{row}'>{{row.xzkf||'--'}}</template>
+                        <template slot-scope='{row}'>{{row.xzkf||row.xzkf=='0'?row.xzkf:'--'}}</template>
                     </el-table-column>
                     <el-table-column prop label='减少(间)'>
-                        <template slot-scope='{row}'>{{row.jskf||'--'}}</template>
+                        <template slot-scope='{row}'>{{row.jskf||row.jskf=='0'?row.jskf:'--'}}</template>
                     </el-table-column>
                 </el-table-column>
                 <el-table-column prop label='区域(㎡)'>
@@ -100,19 +100,19 @@ export default {
             cg: {
                 dateVal: '',
                 floors: '全部',
-                searVal: ''
+                searVal: '',
             },
             allArr: [
                 {
                     id: '全部',
-                    name: '全部'
-                }
+                    name: '全部',
+                },
             ],
-            floorSelect2: []
+            floorSelect2: [],
         }
     },
     computed: {
-        ...mapGetters(['floorSelect'])
+        ...mapGetters(['floorSelect']),
     },
     props: ['bgjlTable', 'total', 'page', 'size', 'loading'],
     components: { Select },
@@ -129,13 +129,13 @@ export default {
         },
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
-        }
+        },
     },
     mounted() {
         if (this.floorSelect.length > 0) {
             this.floorSelect2 = this.allArr.concat(this.floorSelect)
         }
-    }
+    },
 }
 </script>
 <style lang="less" scoped>

+ 6 - 4
src/views/room/index.vue

@@ -302,9 +302,9 @@
                                 tipPlace='top'
                                 v-model='statuSelect5'
                                 caption='任务状态:'
-                                v-if='status.length>0'
+                                v-if='status.length>=0'
                                 :selectdata='status'
-                                :placeholder='"请选择"'
+                                :placeholder='""'
                                 style='margin-right:12px'
                             ></Select>
                             <Select
@@ -312,9 +312,9 @@
                                 tipPlace='top'
                                 v-model='iszcSelect5'
                                 caption='是否正常:'
-                                v-if='zt.length>0'
+                                v-if='zt.length>=0'
                                 :selectdata='zt'
-                                :placeholder='"请选择"'
+                                :placeholder='""'
                                 style='margin-right:12px'
                             ></Select>
                         </div>
@@ -861,6 +861,7 @@ export default {
                         arr.push(obj)
                     })
                     this.status = this.allArr.concat(arr)
+                    console.log(this.status)
                 }
                 if (zt.length > 0) {
                     zt.forEach((el) => {
@@ -871,6 +872,7 @@ export default {
                         arr1.push(obj)
                     })
                     this.zt = this.allArr.concat(arr1)
+                    console.log(this.zt)
                 }
             })
         },