浏览代码

修改需采集信息点入口位置

zhangyu 4 年之前
父节点
当前提交
f7c9bf1598

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

@@ -480,20 +480,20 @@
         this.setEndOptions = device && device.filter(i => !this.setValue.includes(i.value))
       },
       downloadProject(str) {
-        let relType = this.ManualMaintenance.RelationType ? `?relType=${this.ManualMaintenance.RelationType}` : ''
+        let relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
         let zoneType = this.ManualMaintenance.ZoneType ? `&zoneType=${this.ManualMaintenance.ZoneType}` : null
         let url;
         if (str === 'excel') {
           relType = this.ManualMaintenance.RelationType ? `&relType=${this.ManualMaintenance.RelationType}` : ''
           // url = `/api/datacenter/graphic/export?code=对象ID${relType}${zoneType}`
           if (zoneType) {
-            url = `/api/datacenter/graphic/export${relType}${zoneType}&projectId=${this.projectId}&code=对象ID`
+            url = `/api/datacenter/graphic/export?projectId=${this.projectId}${relType}${zoneType}&code=对象ID`
 
           } else {
-            url = `/api/datacenter/graphic/export${relType}&projectId=${this.projectId}&code=对象ID`
+            url = `/api/datacenter/graphic/export?projectId=${this.projectId}${relType}&code=对象ID`
           }
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}&projectId=${this.projectId}`
+          url = `/api/datacenter/graphic/report-downloads?projectId=${this.projectId}${relType}${zoneType}`
         }
         return url
       },

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

@@ -135,14 +135,14 @@ export default {
   },
   methods: {
       downloadProject(str) {
-        let relType = localStorage.getItem('RelationType') != '' ? `?relType=${localStorage.getItem('RelationType')}` : '';
+        let relType = localStorage.getItem('RelationType') != '' ? `&relType=${localStorage.getItem('RelationType')}` : '';
         let zoneType = localStorage.getItem('ZoneType') != '' ? `&zoneType=${localStorage.getItem('ZoneType')}` : '';
         let url;
         if (str === 'excel') {
           relType = localStorage.getItem('RelationType') ? `&relType=${localStorage.getItem('RelationType')}` : '';
-          url = `/api/datacenter/graphic/export${relType}${zoneType}&projectId=${this.projectId}&code=对象ID`
+          url = `/api/datacenter/graphic/export?projectId=${this.projectId}${relType}${zoneType}&code=对象ID`;
         } else {
-          url = `/api/datacenter/graphic/report-downloads${relType}${zoneType}&projectId=${this.projectId}`
+          url = `/api/datacenter/graphic/report-downloads?projectId=${this.projectId}${relType}${zoneType}`;
         }
         return url
       },

+ 3 - 0
src/framework/layout/PageHeader.vue

@@ -34,6 +34,9 @@
 <!--      </el-dropdown>-->
       <ul class="header-nav">
         <li class="header-nav-Splitscreen">
+					<router-link to="/ready/collectsetting"><i class="el-icon-s-tools"></i></router-link>
+				</li>
+        <li class="header-nav-Splitscreen">
           <a href="/splitScreen" target="_blank"><i class="el-icon-s-platform"></i></a>
         </li>
         <li class="header-nav-notification">