guoxiaohuan 4 years ago
parent
commit
8c049b4582

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

@@ -499,7 +499,7 @@ export default {
          */
          */
         getDetailData(val, type) {
         getDetailData(val, type) {
             let param = {
             let param = {
-                assetnum: this.assetnum,
+                // assetnum: this.assetnum,
                 plazaId: this.plazaId,
                 plazaId: this.plazaId,
                 file_type: type === 'equip' ? val.file_type : val.type,
                 file_type: type === 'equip' ? val.file_type : val.type,
                 // file_type: 0,
                 // file_type: 0,

+ 16 - 4
src/views/other/zhsxOtherTable1.vue

@@ -64,7 +64,11 @@
             </el-table-column>
             </el-table-column>
             <el-table-column prop label='附件' width='80'>
             <el-table-column prop label='附件' width='80'>
                 <template slot-scope='{row}'>
                 <template slot-scope='{row}'>
-                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div
+                        v-if='row.glsmsZhsxfj'
+                        style='cursor:pointer;color: #0091ff;'
+                        @click='clickPic(row.glsmsZhsxfj)'
+                    >{{row.glsmsZhsxfj.length+'张'}}</div>
                     <!-- <div style='cursor:pointer;color: #0091ff;' @click='clickPic'>{{5+'张'}}</div> -->
                     <!-- <div style='cursor:pointer;color: #0091ff;' @click='clickPic'>{{5+'张'}}</div> -->
                     <div v-else>{{'--'}}</div>
                     <div v-else>{{'--'}}</div>
                 </template>
                 </template>
@@ -142,10 +146,18 @@ export default {
     },
     },
     components: { Select },
     components: { Select },
     methods: {
     methods: {
-        clickPic() {
-            if (this.imgUrls.length > 0) {
-                this.$refs.picLargeOpen.open(this.imgUrls)
+        clickPic(row) {
+            this.imgUrl = []
+            if (row) {
+                row.forEach(el => {
+                    let obj = {
+                        name: el.description,
+                        url: el.urlname
+                    }
+                    this.imgUrl.push(obj)
+                })
             }
             }
+            this.$refs.picLargeOpen.open(this.imgUrl)
             /* this.imgUrl = []
             /* this.imgUrl = []
             this.imgUrl2 = []
             this.imgUrl2 = []
             var patternFileExtension = /\.([0-9a-z]+)(?:[\?#]|$)/i
             var patternFileExtension = /\.([0-9a-z]+)(?:[\?#]|$)/i

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

@@ -136,7 +136,7 @@ export default {
         },
         },
         pageChanged(page) {
         pageChanged(page) {
             this.page = page
             this.page = page
-            this.$emit('Index4Emit', page)
+            this.$emit('Index4Emit', this.page)
         },
         },
         formatter(date) {
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
             return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')

+ 2 - 1
vue.config.js

@@ -3,7 +3,8 @@ module.exports = {
         port: 8090,
         port: 8090,
         proxy: {
         proxy: {
             '/data': {
             '/data': {
-                target: 'http://60.205.177.43',
+                // target: 'http://60.205.177.43',
+                target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,
                 changeOrigin: true,