Bladeren bron

修改取消设备和系统关联

zhangyu 5 jaren geleden
bovenliggende
commit
09ebd876d8

+ 2 - 2
config/dev.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
     NODE_ENV: '"development"',
     BASE_URL: '"http://192.168.20.215"', //测试iframe地址
-    SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
-    // SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
+    SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
+    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
     // BASE_URL: '"http://mbi.sagacloud.cn"' //线上iframe地址
 })

+ 1 - 1
config/prod.env.js

@@ -2,8 +2,8 @@
 module.exports = {
     NODE_ENV: '"production"',
     // BASE_URL: '"http://192.168.20.215"', //测试iframe地址
-    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     // SSO_SERVER: '"http://192.168.20.102:8080"' //(新)测试环境
+    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
     BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
     SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 }

+ 6 - 0
src/api/scan/request.js

@@ -919,6 +919,12 @@ export function sysLinkEquip(param, success) {
     http.postJson(url, param, success)
 } 
 
+//设备清单 - 根据对象删除系统和设备的关系
+export function sysUnlinkEquip(param, success) {
+    let url = `${baseUrl}/datacenter/sy-in-eq/unlinks-sy-eq`;
+    http.postJson(url, param, success)
+} 
+
 //设备清单 - 统计项目下所有设备数量
 export function countEquip(param, success) {
     let url = `${baseUrl}/datacenter/equip/count`;

+ 11 - 10
src/components/ledger/tableTransfers.vue

@@ -75,7 +75,8 @@ import {
   getEquipNotInSys,
   getEquipInSys,
   getEquipBelongs,
-  sysLinkEquip
+  sysLinkEquip,
+  sysUnlinkEquip
 } from "@/api/scan/request"
 import {
   mapGetters,
@@ -213,7 +214,7 @@ export default {
         sysId: this.id
       }
       if (this.search1 != '') {
-        param.data.Filters = `EquipLocalName contain "${this.search1}";`
+        param.data.Filters = `EquipLocalName contain '${this.search1}' || EquipName contain '${this.search1}';`
       }
       //建筑id
       if (this.buildingId == "noKnow") {
@@ -252,7 +253,7 @@ export default {
         PageSize: this.pages2.size
       }
       if (this.search2 != '') {
-        param.Filters += `;EquipLocalName contain "${this.search2}"`
+        param.Filters += `;EquipLocalName contain '${this.search2}' || EquipName contain '${this.search2}'`
       }
       getEquipInSys(param, res => {
         this.table2Data = res.Content
@@ -278,16 +279,16 @@ export default {
     },
     //取消关联
     rightToLeft() {
-      let relationList = [];
       let tempIDs = this.SelectionList.map(t => {
-        return t.EquipId
-      })
-      this.table2Data.map(t => {
-        if (tempIDs.indexOf(t.EquipId) < 0) {
-          relationList.push(t.EquipId)
+        return {
+          EquipID: t.EquipId,
+          SysID: t.SysID
         }
       })
-      this.relationChange(relationList)
+      sysUnlinkEquip(tempIDs, res => {
+        this.$message.success('修改关联关系成功')
+        this.getAllTable()
+      })
     },
     //更新设备 系统关系
     relationChange(arr) {

+ 34 - 13
src/framework/layout/layout-store.js

@@ -79,24 +79,45 @@ export default {
             return new Promise((resolve, reject) => {
                 frameworkApi.loadUserInfo().then(resp => {
                     console.log(resp)
-                    if (resp.result == 'success') {
-                        state.userInfo = { username: resp.username }
-                        storage.set('user_name', resp.username)
+                    // if (resp.result == 'success') {
+                    //     state.userInfo = { username: resp.username }
+                    //     storage.set('user_name', resp.username)
+                    //     state.permissions = {}
+                    //     if (resp.permissions) {
+                    //         resp.permissions.forEach(p => (state.permissions[p] = true))
+                    //     }
+                    //     state.projects = []
+                    //     if (resp.projects) {
+                    //         if(resp.projects[0] && resp.projects[0].projId) {
+                    //             state.projectId = resp.projects[0].projId
+                    //             state.secret = resp.projects[0].secret?resp.projects[0].secret:""
+                    //         }
+                    //         resp.projects.forEach(proj =>
+                    //             state.projects.push({
+                    //                 id: proj.projId,
+                    //                 name: proj.projLocalName,
+                    //                 pwd: proj.secret?proj.secret:""
+                    //             })
+                    //         )
+                    //     }
+                    // } else {
+                    if (resp.Result == 'success') {
+                        state.userInfo = { username: resp.Username }
                         state.permissions = {}
-                        if (resp.permissions) {
-                            resp.permissions.forEach(p => (state.permissions[p] = true))
+                        if (resp.Permissions) {
+                            resp.Permissions.forEach(p => (state.permissions[p] = true))
                         }
                         state.projects = []
-                        if (resp.projects) {
-                            if(resp.projects[0] && resp.projects[0].projId) {
-                                state.projectId = resp.projects[0].projId
-                                state.secret = resp.projects[0].secret?resp.projects[0].secret:""
+                        if (resp.Projects) {
+                            if(resp.Projects[0] && resp.Projects[0].ProjId) {
+                                state.projectId = resp.Projects[0].ProjId
+                                state.secret = resp.Projects[0].Secret?resp.Projects[0].Secret:""
                             }
-                            resp.projects.forEach(proj =>
+                            resp.Projects.forEach(proj =>
                                 state.projects.push({
-                                    id: proj.projId,
-                                    name: proj.projLocalName,
-                                    pwd: proj.secret?proj.secret:""
+                                    id: proj.ProjId,
+                                    name: proj.ProjLocalName,
+                                    pwd: proj.Secret?proj.Secret:""
                                 })
                             )
                         }

+ 2 - 1
src/views/system/auth/index.vue

@@ -20,7 +20,8 @@ export default {
         console.log(this.$store.state.ssoToken)         
         this.$store.dispatch('layout/loadUserInfo').then(resp => {
             console.log('store dispatch result ', resp)
-            if (resp.result == 'success') {
+            // if (resp.result  == 'success') {
+            if (resp.Result  == 'success') {
                 let lastRoute = this.$store.getters['lastRoute']
                 console.log('last route ', lastRoute)
                 if (lastRoute) {