Explorar el Código

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

YaolongHan hace 4 años
padre
commit
dac6ac8b2a

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 708 - 726
src/views/analysis/CoreDeviceReport.vue


+ 1 - 1
src/views/analysis/GanttChart.vue

@@ -106,7 +106,7 @@
             </div>
             <el-table :data="tableData" max-height="300">
               <el-table-column property="sbjc" label="设备简称"></el-table-column>
-              <el-table-column property="sbjbm" label="设备号"></el-table-column>
+              <el-table-column property="sbjbm" label="设备号"></el-table-column>
               <el-table-column property="cnt" label="设备数"></el-table-column>
               <el-table-column property="wzjc" width="300" label="空间位置"></el-table-column>
             </el-table>

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

@@ -63,7 +63,7 @@
             <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备号' show-overflow-tooltip resizable width='80'>
+            <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='80'>

+ 7 - 7
src/views/other/index.vue

@@ -29,12 +29,10 @@
                 <img src='@/assets/imgs/wtp.png' alt />
                 <p class='fjt'>暂无附加数据图片</p>
             </div>
-            <div class='fzyfImg' v-else-if='floorData.length==1'>
-                <img :src='picFloorImg' alt />
-            </div>
-            <div class='fzyfImg' v-else>
-                <rotation :key='2' type='2' :rotationImg='picFloorImg'></rotation>
+            <div class='fzyfImg' v-else-if='picFloorImg.length==1'>
+                <img :src='picFloorImg[0].url' alt />
             </div>
+            <rotation v-else :key='2' type='2' :rotationImg='picFloorImg'></rotation>
         </div>
         <gcfz-dialog ref='gcfzDialog' :systemName='systemName'></gcfz-dialog>
     </div>
@@ -61,6 +59,7 @@ export default {
             },
             picFloor: '',
             picFloorImg: [],
+            picFloorArr: [],
             dialogInfo: {},
             floorData: [],
             module: ''
@@ -89,8 +88,8 @@ export default {
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
-                //console.log('库房管理图', res)
-                this.picFloorImg = res.data[0].url ? res.data[0].url : ''
+                // console.log('库房管理图', res)
+                this.picFloorImg = res.data || []
             })
         },
         // 查询哪几个楼层有库房图
@@ -164,6 +163,7 @@ export default {
                         }
                         this.floorData.push(obj)
                     }
+                    console.log(this.floorData)
                 })
             })
         }

+ 3 - 0
src/views/other/zhsxOtherTable2.vue

@@ -231,5 +231,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 1 - 1
src/views/room/detail.vue

@@ -115,7 +115,7 @@
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备号' :show-overflow-tooltip='true'>
+            <el-table-column prop='assetnum' label='设备号' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='70' :show-overflow-tooltip='true'>

+ 0 - 1
src/views/room/room3.vue

@@ -75,7 +75,6 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
-            console.log(row)
             this.row = row
             this.innerVisible = true
         },

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

@@ -14,7 +14,7 @@
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='360'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备号' show-overflow-tooltip resizable width='80'>
+                <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='事项类型' show-overflow-tooltip resizable min-width='120'>

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

@@ -14,7 +14,7 @@
                 <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' width='80'>
+                <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'>