Переглянути джерело

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

YaolongHan 4 роки тому
батько
коміт
725ccaa332

+ 11 - 4
src/views/analysis/CoreDeviceReport.vue

@@ -56,7 +56,7 @@
                 <el-table-column prop='photos_num' label='照片'>
                     <template slot-scope='scope'>
                         <span
-                            style='color: #025BAA'
+                            style='color: #025BAA;cursor: pointer;'
                             @click='showPicturesDetail(scope.row, "equip")'
                         >{{ scope.row.photos_num?(scope.row.photos_num + '张') : '—' }}</span>
                         <!-- <span style="color: #025BAA" @click="showPicturesDetail(scope.row)">1张</span> -->
@@ -65,7 +65,7 @@
                 <el-table-column prop='attachments_num' label='报告'>
                     <template slot-scope='scope'>
                         <span
-                            style='color: #025BAA'
+                            style='color: #025BAAp;cursor: pointer;'
                             @click='(e) => showReportDetail(scope.row, "equip", e)'
                         >{{ scope.row.attachments_num?(scope.row.attachments_num+ '张') : '—'}}</span>
                         <!-- <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'equip', e)">1张</span> -->
@@ -99,7 +99,7 @@
                     <el-table-column width='100' property='photosNum' label='照片'>
                         <template slot-scope='scope'>
                             <span
-                                style='color: #025BAA'
+                                style='color: #025BAA;cursor: pointer;'
                                 @click='showPicturesDetail(scope.row, "his")'
                             >{{ scope.row.photosNum || scope.row.photosNum === 0?(scope.row.photosNum + '张') : '—' }}</span>
                             <!-- <span style="color: #025BAA" @click="showPicturesDetail(scope.row)">1张</span> -->
@@ -108,7 +108,7 @@
                     <el-table-column width='100' property='attachmentsNum' label='报告'>
                         <template slot-scope='scope'>
                             <span
-                                style='color: #025BAA'
+                                style='color: #025BAA;cursor: pointer;'
                                 @click='(e) => showReportDetail(scope.row, "his", e)'
                             >{{ scope.row.attachmentsNum?(scope.row.attachmentsNum+ '张') : '—'}}</span>
                             <!-- <span style="color: #025BAA" @click="(e) => showReportDetail(scope.row, 'his', e)">1张</span> -->
@@ -748,4 +748,11 @@ export default {
         }
     }
 }
+</style>
+<style lang="less">
+.core-device-report {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 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'>

+ 2 - 1
src/views/room/index.vue

@@ -874,10 +874,11 @@ export default {
             querySystem(params).then(res => {
                 this.smsxtArr = res.data ? res.data[0] : {}
                 // 5201 设备间   5204设备间  5209设备间
+                this.showLocationflid = false
                 if (this.smsxtArr.length > 0) {
                     let locationflid = this.smsxtArr.locationflid
                     if (locationflid == '5201' || locationflid == '5204' || locationflid == '5209') {
-                        this.showLocationflid = false
+                        this.showLocationflid = true
                     }
                 }
                 this.Index(this.smsxtArr.smsxt)

+ 1 - 1
src/views/statistics/index.vue

@@ -374,7 +374,7 @@ export default {
                 let routeData = this.$router.resolve({  
                     name:'/home/homePage',
                 })
-                window.open(routeData.href, '_blank');
+                window.open(routeData.href, true);
                 window.__fromGroupPage = {
                     level: 0,
                     plazaName: data.cname,