Просмотр исходного кода

隐藏需采集信息点,bug修改

zhangyu 4 лет назад
Родитель
Сommit
d2c3e85eee

+ 4 - 4
config/index.js

@@ -210,8 +210,8 @@ module.exports = {
         }
       },
       '/api': {
-        target: 'http://192.168.64.17:28888/',
-        // target: 'http://192.168.64.14:28888/',
+        // target: 'http://192.168.64.17:28888/',
+        target: 'http://192.168.64.14:28888/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -293,8 +293,8 @@ module.exports = {
         // 目标 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',
+        target: 'http://192.168.64.14:28888',
+        // target: 'http://192.168.64.17:28888',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL

+ 2 - 0
src/components/ledger/handsontables/device.vue

@@ -614,6 +614,7 @@ export default {
         this.showType,
         true
       );
+      console.log(JSON.stringify(data))
       if (this.showParts) {
         data.unshift("操作", "当前关联的资产", "所属系统实例", "包含的部件");
       } else {
@@ -636,6 +637,7 @@ export default {
         this.showType,
         true
       );
+      console.log(JSON.stringify(data))
       if (this.showParts) {
         data.unshift(
           {

+ 3 - 3
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -487,13 +487,13 @@
           relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
           // url = `/api/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
           if (zoneType) {
-            url = '/api/datacenter/graphic/export?code=对象ID' + relType + zoneType
+            url = `/api/datacenter/graphic/export${relType}${zoneType}&projectId=${this.projectId}&code=对象ID`
 
           } else {
-            url = '/api/datacenter/graphic/export?code=对象ID' + relType
+            url = `/api/datacenter/graphic/export${relType}&projectId=${this.projectId}&code=对象ID`
           }
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}&projectId=${this.projectId}`
         }
         return url
       },

+ 6 - 3
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -68,7 +68,10 @@
         </el-timeline>
       </div>
       <!--            下载报告-->
-      <a :href="downloadProject('report')">
+      <!-- <a :href="downloadProject('report')">
+        <el-button>{{values.downloadFile}}</el-button>
+      </a> -->
+      <a @click="downloadProject('report')">
         <el-button>{{values.downloadFile}}</el-button>
       </a>
       <footer
@@ -137,9 +140,9 @@ export default {
         let url;
         if (str === 'excel') {
           relType = localStorage.getItem('RelationType') ? `&relType=${localStorage.getItem('RelationType')}` : '';
-          url = `/api/datacenter/graphic/export?projectId=${this.projectId}&code=对象ID${relType}${zoneType}`
+          url = `/api/datacenter/graphic/export${relType}${zoneType}&projectId=${this.projectId}&code=对象ID`
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}`
+          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}&projectId=${this.projectId}`
         }
         return url
       },

+ 5 - 5
src/data/menus.js

@@ -46,11 +46,11 @@ export default [
     icon: 'icon-jianzhu'
   },
 // 需采集的信息点
-  {
-    path: '/ready/collectsetting',
-    name: '需采集的信息点',
-    icon: 'icon-xinxi'
-  },
+//   {
+//     path: '/ready/collectsetting',
+//     name: '需采集的信息点',
+//     icon: 'icon-xinxi'
+//   },
 // 扫楼App用户管理
   {
     path: '/ready/appuser',