Browse Source

添加数据同步日志

zhangyu 4 years ago
parent
commit
3e3330db4c

+ 343 - 0
config/conf.js

@@ -0,0 +1,343 @@
+module.exports =  {
+  "18": {
+    "/admin": {
+      target: "http://mbi.sagacloud.cn:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/admin": "/"
+      }
+    },
+    "/api": {
+      target: "http://192.168.64.17:28888/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/api": "/"
+      }
+    },
+    "/data-platform-3": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/rwd": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:9970/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/business-space": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/pointconfig": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders-dp": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/ScanBuilding": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding-2": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding": {
+      // 目标 API 地址
+      target: "http://192.168.64./17:28888",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/image-service": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:8891",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false,
+      pathRewrite: {
+        "^/image-service": "/image-service/"
+      }
+    },
+    "/modelapi": {
+      target: "http://192.168.64.17:28890/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/modelapi": "/revit-algorithm/"
+      }
+    },
+    "/schedulerapi": {
+      target: "http://60.205.177.43:28888/",
+      // target: 'http://mbi.sagacloud.cn:8080',
+      changeOrigin: true,
+      pathRewrite: {
+        "^/schedulerapi": "/scheduler/"
+      }
+    }
+  },
+  "14": {
+    // 新版数据字典
+    "/admin": {
+      target: "http://mbi.sagacloud.cn:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/admin": "/"
+      }
+    },
+    "/api": {
+      target: "http://192.168.64.14:28888/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/api": "/"
+      }
+    },
+    "/data-platform-3": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/rwd": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:9970/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/business-space": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/pointconfig": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders-dp": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/ScanBuilding": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding-2": {
+      // 目标 API 地址
+      target: "http://mbi.sagacloud.cn:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding": {
+      // 目标 API 地址
+      target: "http://192.168.64.14:28888",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/image-service": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:8891",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false,
+      pathRewrite: {
+        "^/image-service": "/image-service/"
+      }
+    },
+    "/modelapi": {
+      target: "http://192.168.64.14:28888/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/modelapi": "/revit-algorithm/"
+      }
+    },
+    "/schedulerapi": {
+      target: "http://60.205.177.43:28888/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/schedulerapi": "/scheduler/"
+      }
+    }
+  },
+  "39": {
+    "/admin": {
+      target: "http://39.102.40.239:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/admin": "/"
+      }
+    },
+    "/api": {
+      target: "http://39.102.40.239:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/api": "/"
+      }
+    },
+    "/data-platform-3": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/rwd": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:9970/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/business-space": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/pointconfig": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders-dp": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/venders": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:9909",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/ScanBuilding": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding-2": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/scanbuilding": {
+      // 目标 API 地址
+      target: "http://39.102.40.239:8080/",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false
+    },
+    "/image-service": {
+      // 目标 API 地址
+      target: "http://39.97.179.199:8891",
+      // 如果要代理 websockets
+      ws: true,
+      // 将主机标头的原点更改为目标URL
+      changeOrigin: false,
+      pathRewrite: {
+        "^/image-service": "/image-service/"
+      }
+    },
+    "/modelapi": {
+      target: "http://39.102.40.239:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/modelapi": "/revit-algorithm/"
+      }
+    },
+    "/schedulerapi": {
+      target: "http://39.102.40.239:8080/",
+      changeOrigin: true,
+      pathRewrite: {
+        "^/schedulerapi": "/scheduler/"
+      }
+    }
+  }
+};

+ 6 - 251
config/index.js

@@ -3,6 +3,7 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 
 const path = require('path')
+const proxyTable = require('./conf')
 
 module.exports = {
   dev: {
@@ -200,255 +201,9 @@ module.exports = {
     //     }
     //   },
     // },
-    proxyTable: { // 新版数据字典
-      '/admin': {
-        // target: 'http://192.168.12.238:8080/',
-        target: 'http://mbi.sagacloud.cn:8080/',
-        changeOrigin: true,
-        pathRewrite: {
-          "^/admin": "/"
-        }
-      },
-      '/api': {
-        // target: 'http://192.168.64.17:28888/',
-        // target: 'http://192.168.64.14:28888/',
-        target: 'http://39.102.40.239:8080/',
-        changeOrigin: true,
-        pathRewrite: {
-          "^/api": "/"
-        }
-      },
-      '/data-platform-3': {
-        // 目标 API 地址
-        // target: 'http://172.16.42.210:8080/',
-        target: 'http://39.97.179.199:9909/',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/rwd': {
-        // 目标 API 地址
-        // target: 'http://172.16.42.210:8080/',
-        target: 'http://39.102.40.239:9970/',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/business-space': {
-        // 目标 API 地址
-        // target: 'http://172.16.42.210:8080/',
-        target: 'http://39.97.179.199:9909',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/pointconfig': {
-        // 目标 API 地址
-        // target: 'http://192.168.12.238:8080/',
-        target: 'http://mbi.sagacloud.cn:8080/',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/venders-dp': {
-        // 目标 API 地址
-        // target: 'http://172.16.42.210:8080/',
-        target: 'http://39.97.179.199:9909',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/venders': {
-        // 目标 API 地址
-        // target: 'http://172.16.42.210:8080/',
-        target: 'http://39.97.179.199:9909',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false,
-      },
-      '/ScanBuilding': {
-        // 目标 API 地址
-        // target: 'http://192.168.12.238:8080/',
-        target: 'http://mbi.sagacloud.cn:8080/',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/scanbuilding-2': {
-        // 目标 API 地址
-        // target: 'http://192.168.12.238:8080/',
-        target: 'http://mbi.sagacloud.cn:8080/',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/scanbuilding': {
-        // 目标 API 地址
-        // target: 'http://192.168.12.238:8080/',
-        // target: 'http://60.205.177.43:28888',
-        // target: 'http://192.168.64.14:28888',
-        target: 'http://192.168.64./17:28888',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false
-      },
-      '/image-service': {
-        // 目标 API 地址
-        target: 'http://39.97.179.199:8891',
-        // target: 'http://api.sagacloud.cn',
-        // 如果要代理 websockets
-        ws: true,
-        // 将主机标头的原点更改为目标URL
-        changeOrigin: false,
-        // pathRewrite: {
-        //   "^/image-service": "/dp-auxiliary/image-service/"
-        // }
-        pathRewrite: {
-          "^/image-service": "/image-service/"
-        }
-      },
-      '/modelapi': {
-        // target: 'http://172.16.42.210:8082',
-        target: 'http://192.168.64.14:28888/',
-        // target: 'http://192.168.20.218:8082',//景灏
-        changeOrigin: true,
-        pathRewrite: {
-          "^/modelapi": "/revit-algorithm/"
-        }
-      },
-      '/schedulerapi': {
-        target: 'http://60.205.177.43:28888/',
-        // target: 'http://mbi.sagacloud.cn:8080',
-        changeOrigin: true,
-        pathRewrite: {
-          "^/schedulerapi": "/scheduler/"
-        }
-      },
-    },
-    // proxyTable: { // 39环境
-    //     '/admin': {
-    //       target: 'http://39.102.40.239:8080/',
-    //       changeOrigin: true,
-    //       pathRewrite: {
-    //         "^/admin": "/"
-    //       }
-    //     },
-    //     '/api': {
-    //       target: 'http://39.102.40.239:8080/',
-    //       changeOrigin: true,
-    //       pathRewrite: {
-    //         "^/api": "/"
-    //       }
-    //     },
-    //     '/data-platform-3': {
-    //       // 目标 API 地址
-    //       target: 'http://39.97.179.199:9909/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/rwd': {
-    //       // 目标 API 地址
-    //       target: 'http://39.102.40.239:9970/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/business-space': {
-    //       // 目标 API 地址
-    //       target: 'http://39.97.179.199:9909',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/pointconfig': {
-    //       // 目标 API 地址
-    //       target: 'http://39.102.40.239:8080/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/venders-dp': {
-    //       // 目标 API 地址
-    //       // target: 'http://172.16.42.210:8080/',
-    //       target: 'http://39.97.179.199:9909',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/venders': {
-    //       // 目标 API 地址
-    //       // target: 'http://172.16.42.210:8080/',
-    //       target: 'http://39.97.179.199:9909',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false,
-    //     },
-    //     '/ScanBuilding': {
-    //       // 目标 API 地址
-    //       target: 'http://39.102.40.239:8080/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/scanbuilding-2': {
-    //       // 目标 API 地址
-    //       target: 'http://39.102.40.239:8080/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/scanbuilding': {
-    //       // 目标 API 地址
-    //       target: 'http://39.102.40.239:8080/',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false
-    //     },
-    //     '/image-service': {
-    //       // 目标 API 地址
-    //       target: 'http://39.97.179.199:8891',
-    //       // 如果要代理 websockets
-    //       ws: true,
-    //       // 将主机标头的原点更改为目标URL
-    //       changeOrigin: false,
-    //       pathRewrite: {
-    //         "^/image-service": "/image-service/"
-    //       }
-    //     },
-    //     '/modelapi': {
-    //       target: 'http://39.102.40.239:8080/',
-    //       changeOrigin: true,
-    //       pathRewrite: {
-    //         "^/modelapi": "/revit-algorithm/"
-    //       }
-    //     },
-    //     '/schedulerapi': {
-    //       target: 'http://39.102.40.239:8080/',
-    //       changeOrigin: true,
-    //       pathRewrite: {
-    //         "^/schedulerapi": "/scheduler/"
-    //       }
-    //     },
-    //   },
+
+    proxyTable: proxyTable["39"],
+    
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 28080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
@@ -479,8 +234,8 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/adm/',// 39 配置
-    // assetsPublicPath: '/',
+    // assetsPublicPath: '/adm/',// 39 配置
+    assetsPublicPath: '/',
 
 
     /**

+ 2 - 2
config/prod.env.js

@@ -1,9 +1,9 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_URL: '"http://192.168.64.14"', //测试iframe地址
+  BASE_URL: '"http://192.168.64.14"', //测试iframe地址
   // BASE_URL: '"http://192.168.64.18"', //测试iframe地址
-  BASE_URL: '"http://39.102.40.239"', //测试iframe地址
+//   BASE_URL: '"http://39.102.40.239"', //测试iframe地址
   SSO_SERVER: '"http://mbi.sagacloud.cn"', //测试环境
   // MQTT_SERVICE: '"ws://39.102.40.239:61614/stomp/"' //MQ测试环境地址
   MQTT_SERVICE: '"ws://192.168.64.14:61614/stomp/"' //MQ测试环境地址

+ 5 - 0
src/views/ledger/report/index.vue

@@ -221,6 +221,11 @@ export default {
           "name": '功能分区',
           'Rel_type': '11',
           "code": 'FunctionZone'
+        },
+        {
+          "name": '其他分区',
+          'Rel_type': '11',
+          "code": 'OtherZone'
         }
       ],
       partProtion: [],// 业务空间-各分区占比数据

+ 34 - 52
src/views/model/report/deleted.vue

@@ -6,42 +6,42 @@
         <div class="details">
           <h4>{{index | numTransformation(4)}}<el-badge value="待删除" class="item"></el-badge>
           </h4>
-          <h4>{{`${item.BuildingName}建筑模型`}}-{{`${item.FloorName}层`}}-{{`${item.EquipLocalName?item.EquipLocalName:item.EquipName}`}}</h4>
+          <h4>{{`${item.buildingName || '**'}`}}-{{`${item.floorName || '**'}`}}-{{`${item.localName?item.localName:item.name}`}}</h4>
           <b>BIM ID:<span @dblclick="copyContent"
-              id="copy">{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].BIMID:'' | bimIdTransformation}}</span></b><span class="copy"
+              id="copy">{{item.bimId | bimIdTransformation}}</span></b><span class="copy"
             @click="clickCopy">点击复制</span>
           <input id="copyContent" type="text" @dblclick="copyContent" style="border:none;opacity:0;position:absolute;top:0;left:0;">
-          <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p>
-          <p>设计图纸中编码:{{item.CADID}}</p>
-          <p><span>设备类型:{{item.Category}}</span></p>
-          <p>设备ID:{{item.EquipID}}</p>
-          <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
-              v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p>
-          <p>现场任务ID:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].TaskId:""}}</p>
+          <!-- <p style="margin-top:30px;">Revit族:{{item.BIMFamilyName}}</p> -->
+          <p>设计图纸中编码:{{item.cadId || '--'}}</p>
+          <p><span>设备类型:{{item.codeName || '--'}}</span></p>
+          <p>设备ID:{{item.id}}</p>
+          <!-- <p><span v-if="item.Property && item.Property.FamilyName">资产族:{{item.Property.FamilyName.Name}}</span><span
+              v-if="item.PropertyId">关联的资产ID:{{item.PropertyId}}</span></p> -->
+          <p>现场任务ID:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].TaskId:""}}</p>
           <p>
-            <span>执行人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].WorkerName:''}}</span><span>确认人:{{item.ScanTaskBase && item.ScanTaskBase[0]?item.ScanTaskBase[0].ConfirmingPersonName:''}}</span>
+            <span>执行人:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].WorkerName:''}}</span><span>确认人:{{item.scanTaskBase && item.scanTaskBase[0]?item.scanTaskBase[0].ConfirmingPersonName:''}}</span>
           </p>
         </div>
         <div class="plan">
           <p>平面图上的位置:<span>{{item.local | localTransformation}}</span></p>
           <div class="img-box">
-            <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.ModelId"
-              :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
+            <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0" :data-modelid="item.modelId"
+              :data-equipid='item.id' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
           </div>
         </div>
       </div>
       <div class="content-bottom">
-        <div class="explain" v-if="item.ScanTaskBase && item.ScanTaskBase[0] && item.ScanTaskBase[0].Note">
+        <div class="explain" v-if="item.scanTaskBase && item.scanTaskBase[0] && item.scanTaskBase[0].Note">
           <p>现场问题说明:</p>
           <el-scrollbar>
             <p class="explain-content">
               <el-scrollbar>
-                {{item.ScanTaskBase?item.ScanTaskBase[0].Note:""}}
+                {{item.scanTaskBase?item.scanTaskBase[0].Note:""}}
               </el-scrollbar>
             </p>
           </el-scrollbar>
         </div>
-        <div class="photo" v-for="(it,ind) in item.ScanTaskBase[0].TaskPicList" :key='ind' v-else-if="item.ScanTaskBase && item.ScanTaskBase[0]">
+        <div class="photo" v-for="(it,ind) in item.scanTaskBase[0].TaskPicList" :key='ind' v-else-if="item.scanTaskBase && item.scanTaskBase[0]">
           <div class="img-box">
             <p>{{it.Name}}<span>拍摄时间:{{it.CreateTime | timeTransformation}}</span></p>
             <div class="img-content">
@@ -160,70 +160,51 @@ export default {
     },
     queryToBelDelEquip() {// 请求待删除数据
       let params = {
-        ProjectId: this.projectId,
-        Cascade: [
-          {
-            Name: "scanTaskBase",// 级联-任务
-            Filters: 'TaskState = 0',
-            Orders: "CreateTime desc ,EquipName asc",
-          },
-          {
-            Name: "property",// 级联-资产
-            Cascade: [
-              {
-                Name: "familyName"
-              }
-            ]
-          },
-          {
-            Name: "equipCategory"// 级联-设备类型
-          }
-        ],
-        Orders: "CreateTime desc ,EquipName asc",
-        Filters: `ModelId in ${this.equipComDelList}`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
+        orders: "createTime desc ,id asc",
+        filters: `modelId in ${this.equipComDelList}`,
+        pageNumber: this.page.pageNumber,
+        pageSize: this.page.pageSize
       }
       toBeDelEquipPage(params, res => {
-        this.page.total = res.PageSize < 20 ? res.PageSize : res.Total;
-        res.Content.forEach(item => {
-          if (item.BIMLocation) {
+        this.page.total = res.pageSize < 20 ? res.pageSize : res.total;
+        res.content.forEach(item => {
+          if (item.bimLocation) {
             let local = {};
-            let ary = item.BIMLocation.split(',');
+            let ary = item.bimLocation.split(',');
             let localAry = ['X', 'Y', 'Z'];
             ary.forEach((item, index) => {
               local[localAry[index]] = ary[index];
             })
             item.local = local;
           }
-          if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
-            item.ScanTaskBase = item.ScanTaskBase.shift();
+          if (item.scanTaskBase && item.scanTaskBase.length > 1) {
+            item.scanTaskBase = item.scanTaskBase.shift();
           }
         });
         if (this.page.pageNumber == 1) {
-          this.pageData = res.Content;
+          this.pageData = res.content;
           this.$nextTick(() => {
             this.getGraphy();
           })
         } else {
-          this.pageData = this.pageData.concat(res.Content);
+          this.pageData = this.pageData.concat(res.content);
           console.log(this.pageData.length, 19)
           this.$nextTick(() => {
             this.getGraphy();
           })
         }
         this.pageData.forEach(item => {
-          if (item.BIMLocation) {
+          if (item.bimLocation) {
             let local = {};
-            let ary = item.BIMLocation.split(',');
+            let ary = item.bimLocation.split(',');
             let localAry = ['X', 'Y', 'Z'];
             ary.forEach((item, index) => {
               local[localAry[index]] = ary[index];
             })
             item.local = local;
           }
-          if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
-            item.ScanTaskBase = item.ScanTaskBase.shift();
+          if (item.scanTaskBase && item.scanTaskBase.length > 1) {
+            item.scanTaskBase = item.scanTaskBase.shift();
           }
         });
       })
@@ -231,18 +212,18 @@ export default {
     getGraphy() {// 绘制空间位置图片
       console.log(this.i);
       let can = this.$refs.canvas;
+      let modelId = can[this.i].dataset.modelid
       let that = this;
       that.clearGraphy(this.i)
       that.scene = new LocationPointScene();
       this.canvasLoading = true;
-      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: can[this.i].dataset.modelid }).then(res => {
+      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
         that.canvasLoading = false;
         if (res == 'error') {
           this.FloorMap = '';
           console.log('数据解析异常');
           return;
         }
-        let modelID = can[this.i].dataset.modelid
         let EquipID = can[this.i].dataset.equipid;
         let X = Number(can[this.i].dataset.x);
         let Y = can[this.i].dataset.y * -1;
@@ -253,6 +234,7 @@ export default {
           Y: Y
         })
         that.view.fitSceneToView();
+        that.view.scalable = false;
         this.scene.isSpaceSelectable = false;
         this.i++;
         if (this.i !== this.pageData.length) {

+ 4 - 2
src/views/model/report/index.vue

@@ -315,6 +315,7 @@ export default {
         let equipComDelList = [],
           toBeAdded = []
         this.equipComDelList = [];
+        this.equipComAddList = [];
         this.LostFloorName.forEach(item => {
           if (item.CurrentModelId) {
             equipComDelList.push({
@@ -329,6 +330,7 @@ export default {
             toBeAdded.push({
               modelId: item.Id
             })
+            this.equipComAddList.push(item.Id)
           }
         })
         let params = {
@@ -397,8 +399,8 @@ export default {
         window.open(jumpRouter.href, '_blank')
       },
       supplement() {// 点击模型待补充的设备
-        let equipComDelList = encodeURIComponent(JSON.stringify(this.equipComDelList));
-        let jumpRouter = this.$router.resolve({ path: '/model/report/supplement', query: { equipComDelList: equipComDelList } })
+        let equipComAddList = encodeURIComponent(JSON.stringify(this.equipComAddList));
+        let jumpRouter = this.$router.resolve({ path: '/model/report/supplement', query: { equipComDelList: equipComAddList } })
         window.open(jumpRouter.href, '_blank')
       },
       getExportReport() {// 导出模型问题报告

+ 35 - 45
src/views/model/report/supplement.vue

@@ -8,30 +8,29 @@
             <el-badge value="待补充" class="item" type="success"></el-badge>
           </h4>
           <h4>
-            {{ `${item.BuildingName}建筑模型` }}-{{
-              `${item.FloorName}层`
-            }}-{{ `${item.EquipLocalName ? item.EquipLocalName : item.EquipName}` }}</h4>
-          <b>标记码:<span @dblclick="copyContent" id="copy">{{ item.EquipID }}</span></b><span class="copy"
-                                                                                            @click="clickCopy">点击复制</span>
+            {{ `${item.buildingName?item.buildingName:'xx'}` }}-{{
+              `${item.floorName?item.floorName:'xx'}`
+            }}-{{ `${item.localName ? item.localName : item.name}` }}</h4>
+          <b>标记码:<span @dblclick="copyContent" id="copy">{{ item.id }}</span></b><span class="copy" @click="clickCopy">点击复制</span>
           <input id="copyContent" type="text" @dblclick="copyContent"
                  style="border:none;opacity:0;position:absolute;top:0;left:0;">
-          <p style="margin-top:30px;">建议使用的Revit族:{{ item.Res }}</p>
-          <p>设计图纸中编码:{{ item.CADID }}</p>
-          <p><span>资产族:{{ item.FamilyName.Name }}</span></p>
-          <p><span style="width:500px;">资产ID:{{ item.EquipID }}</span></p>
-          <p>现场发现人:{{ item.FindPeople }}</p>
+          <!-- <p style="margin-top:30px;">建议使用的Revit族:{{ item.Res }}</p> -->
+          <p>设计图纸中编码:{{ item.cadId || '--' }}</p>
+          <p><span>设备类型:{{ item.codeName || '--' }}</span></p>
+          <p><span style="width:500px;">设备ID:{{ item.id }}</span></p>
+          <p>现场发现人:{{ item.findPeople || '--' }}</p>
         </div>
         <div class="plan">
           <p>平面图上的位置:<span>{{ item.local | localTransformation }}</span></p>
           <div class="img-box">
             <canvas :id="'canvas'+index" :width="canvasWidth" :height="canvasHeight" ref="canvas" tabindex="0"
-                    :data-modelid="item.ModelId"
-                    :data-EquipID='item.EquipID' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
+                    :data-modelid="item.modelId"
+                    :data-equipid='item.id' :data-x="item.local.X" :data-y="item.local.Y"></canvas>
           </div>
         </div>
       </div>
       <div class="content-bottom">
-        <div class="photo" v-for="(it,ind) in item.LedgerParam.PhotoDoc.Nameplate" :key="ind">
+        <div class="photo" v-for="(it,ind) in item.infos.nameplate" :key="ind">
           <p>{{ it.name }}<span>拍摄时间:{{ it.createTime | timeTransformation }}</span></p>
           <div class="img-box">
             <div class="img-content">
@@ -39,9 +38,9 @@
             </div>
           </div>
         </div>
-        <div class="photo" v-for="(photo,num) in item.LedgerParam.PhotoDoc.Pic" :key="num+photo">
-          <div class="img-box" v-if="item.LedgerParam.PhotoDoc.Pic">
-            <p v-if="item.LedgerParam.PhotoDoc.Pic && photo.type !== 'video'">
+        <div class="photo" v-for="(photo,num) in item.infos.pic" :key="num+photo">
+          <div class="img-box" v-if="item.infos.pic">
+            <p v-if="item.infos.pic && photo.type !== 'video'">
               {{ photo.name }}<span>拍摄时间:{{ photo.createTime | timeTransformation }}</span>
             </p>
             <div class="img-content" v-if="photo.type !=='video'">
@@ -94,7 +93,7 @@ export default {
       return str;
     },
     timeTransformation(time) {// 时间转换
-      return time ? time.substring(0, 16) : ''
+      return time ? time.substring(0, 16) : '--'
     }
   },
   mounted() {
@@ -152,15 +151,6 @@ export default {
     },
     getToBeSuppement() {
       let params = {
-        projectId: this.projectId,
-        cascade: [
-          {
-            "name": "equipFamily"
-          },
-          {
-            "name": "familyName"
-          }
-        ],
         filters: `modelId in ${this.equipComDelList}`,
         pageNumber: this.page.pageNumber,
         pageSize: this.page.pageSize
@@ -180,51 +170,51 @@ export default {
         }
         // this.pageData = res.Content;
         this.pageData.forEach(item => {
-          if (item.BIMLocation) {
+          if (item.bimLocation) {
             let local = {};
-            let ary = item.BIMLocation.split(',');
+            let ary = item.bimLocation.split(',');
             let localAry = ['X', 'Y', 'Z'];
             ary.forEach((item, index) => {
               local[localAry[index]] = ary[index];
             })
             item.local = local;
           }
-          if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
-            item.ScanTaskBase = item.ScanTaskBase.shift();
-          }
-          if (item.EquipFamily && item.EquipFamily.length) {
-            item.Res = '';
-            item.EquipFamily.forEach((it, index) => {
-              if (index !== item.EquipFamily.length - 1) {
-                item.Res += `${it.EquipCode + it.EquipName + ","}`;
-              } else {
-                item.Res += `${it.EquipCode + it.EquipName}`;
-              }
-            })
-          }
+        //   if (item.ScanTaskBase && item.ScanTaskBase.length > 1) {
+        //     item.ScanTaskBase = item.ScanTaskBase.shift();
+        //   }
+        //   if (item.EquipFamily && item.EquipFamily.length) {
+        //     item.Res = '';
+        //     item.EquipFamily.forEach((it, index) => {
+        //       if (index !== item.EquipFamily.length - 1) {
+        //         item.Res += `${it.EquipCode + it.EquipName + ","}`;
+        //       } else {
+        //         item.Res += `${it.EquipCode + it.EquipName}`;
+        //       }
+        //     })
+        //   }
         });
       })
     },
     getGraphy() {// 绘制空间位置图片
       let can = this.$refs.canvas;
       let that = this;
+      let modelId = can[this.i].dataset.modelid;
       that.clearGraphy(this.i)
       that.scene = new LocationPointScene();
       this.canvasLoading = true;
-      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: can[this.i].dataset.modelid }).then(res => {
+      that.scene.getFloorData('/modelapi/base-graph/query', { ModelId: modelId }).then(res => {
         that.canvasLoading = false;
         if (res == 'error') {
           this.FloorMap = '';
           console.log('数据解析异常');
           return;
         }
-        let modelID = can[this.i].dataset.modelid
-        let EquipID = can[this.i].dataset.equipid;
+        let equipId = can[this.i].dataset.equipid;
         let X = Number(can[this.i].dataset.x);
         let Y = can[this.i].dataset.y * -1;
         that.view.scene = that.scene;
         this.scene.addMarker({
-          Id: EquipID,
+          Id: equipId,
           X: X,
           Y: Y
         })

+ 70 - 99
src/views/synclog/index.vue

@@ -46,11 +46,65 @@
                     :data="data"
                     :stripe="true"
                     :maxHeight="620"
-                    @sort="handleSort"
+                    @sort-change="handleSort"
                 >
-                    <el-table-column v-for="(item, key) in columns" :key="key" :label="item.label" :width="item.width">
+                    <el-table-column label="对象id" :width="370">
                         <template slot-scope="scope">
-                            <span style="margin-left: 10px">{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
+                            <span style="margin-left: 10px">{{ scope.row.objId ? scope.row.objId : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="时间" sortable="custom">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.createTime ? scope.row.createTime : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="名称" :width="120">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.name ? scope.row.name : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="本地名称" :width="120">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.localName ? scope.row.localName : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="本地编码" :width="120">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.localId ? scope.row.localId : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="对象类型">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.objName ? scope.row.objName : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作类型">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ typeObj[scope.row.type] ? typeObj[scope.row.type] : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="对象分类">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">
+                                {{
+                                    scope.row.classCode && scope.row.classCodeName
+                                        ? `${scope.row.classCodeName} - ${scope.row.classCode}`
+                                        : scope.row.classCode
+                                        ? scope.row.classCode
+                                        : "--"
+                                }}
+                            </span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报错信息">
+                        <template slot-scope="scope">
+                            <span style="margin-left: 10px">{{ scope.row.error ? scope.row.error : "--" }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column fixed="right" label="操作" width="180">
+                        <template slot-scope="scope">
+                            <el-button @click.native.prevent="queryRecordSyn(scope.row)"> 重新同步 </el-button>
+                            <el-button @click.native.prevent="hideMsg(scope.row)"> 忽略 </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -84,100 +138,11 @@ import {
     queryRecordSyn,
     queryRecordUpdata,
 } from "@/api/synclog";
-// 操作符类型
-const tyleObj = {
-    create: "创建",
-    update: "修改",
-    delete: "删除",
-};
 export default {
     data() {
         return {
             groupCode: "", //集团id
             isShowTable: false, //是否显示table
-            columns: [
-                {
-                    label: "对象id",
-                    prop: "objId",
-                    width: 370,
-                },
-                {
-                    label: "时间",
-                    prop: "createTime",
-                    sortable: "custom",
-                },
-                {
-                    label: "名称",
-                    prop: "name",
-                    width: 120,
-                },
-                {
-                    label: "本地名称",
-                    prop: "localName",
-                    width: 120,
-                },
-
-                {
-                    label: "本地编码",
-                    prop: "localId",
-                    width: 120,
-                },
-                {
-                    label: "对象类型",
-                    prop: "objName",
-                },
-                {
-                    label: "操作类型",
-                    prop: "type",
-                    // render: (obj, a) => {
-                    //   return tyleObj[obj.type];
-                    // },
-                },
-                {
-                    label: "对象分类",
-                    prop: "classCode",
-                    // render: (obj) => {
-                    //   return obj.classCode && obj.classCodeName
-                    //     ? obj.classCodeName + "-" + obj.classCode
-                    //     : obj.classCode
-                    //     ? obj.classCode
-                    //     : "--";
-                    // },
-                },
-                {
-                    label: "报错信息",
-                    prop: "error",
-                    // render: (obj) => {
-                    //   return obj.error ? obj.error : "--";
-                    // },
-                },
-                // {
-                //   label: "操作",
-                //   prop: "zip",
-                //   fixed: "right",
-                //   width: 160,
-                //   render: (obj) => {
-                //     return (
-                //       <span>
-                //         <Button
-                //           type="text"
-                //           @click="queryRecordSyn"
-                //           size="small"
-                //         >
-                //           重新同步
-                //         </Button>
-                //         <Button
-                //           type="text"
-                //           size="small"
-                //           @click="hideMsg"
-                //         >
-                //           隐藏
-                //         </Button>
-                //       </span>
-                //     );
-                //   },
-                // },
-            ],
             data: [],
             objClassify: [],
             //对象类型
@@ -211,6 +176,11 @@ export default {
                     label: "竖井",
                 },
             ],
+            typeObj: { // 操作符类型
+                create: "创建",
+                update: "修改",
+                delete: "删除",
+            },
             //操作下拉框
             operation: [
                 {
@@ -329,7 +299,8 @@ export default {
         // 对象类型发生变化
         objTypeChange(val) {
             this.objTypeValue = val;
-            if (val == "equipment" || val == "space" || val == "system") {
+            this.objClassifyValue = "";
+            if (val == "equipment" || val == "space" || val == "system" || val == "component") {
                 this.getObjTypeList();
             } else {
                 this.objClassify = [];
@@ -394,7 +365,7 @@ export default {
             this[key] = value;
             // this.forceUpdate();
         },
-        // 隐藏该条信息
+        // 忽略该条信息
         hideMsg(res) {
             const data = {
                 content: [
@@ -410,7 +381,7 @@ export default {
                 if (res.result == "success")
                     this.$message({
                         showClose: true,
-                        message: "隐藏完成",
+                        message: "忽略完成",
                         type: "success",
                         duration: 3000,
                     });
@@ -418,7 +389,7 @@ export default {
             }, () => {
                 this.$message({
                     showClose: true,
-                    message: "隐藏失败,请重新同步或联系管理人员!",
+                    message: "忽略失败,请重新同步或联系管理人员!",
                     type: "error",
                     duration: 3000,
                 });
@@ -470,10 +441,10 @@ export default {
         },
         // 时间排序
         handleSort(data) {
-            if (data.order == "ascending") {
-                this.order = "lastUpdate asc, objId asc";
-            } else {
+            if (data.order == "descending") {
                 this.order = "lastUpdate desc, objId desc";
+            } else {
+                this.order = "lastUpdate asc, objId asc";
             }
             this.getTable();
         },