Procházet zdrojové kódy

修改图例展示

shaun-sheep před 4 roky
rodič
revize
c68610a7d1

+ 31 - 30
src/router/index.js

@@ -71,35 +71,36 @@ const router = new VueRouter({
 })
 const ignore = ["/404"]
 router.beforeEach(async (to, from, next) => {
-    if (!ignore.includes(to.path)) {
-        const token = query().token
-        const ssoToken = store.getters["ssoToken"]
-        if (ssoToken) {
-            store.commit("SETSSOTOKEN", ssoToken)
-            await store.dispatch("getUserInfo", router)
-            await store.dispatch("getFloors")
-            await store.dispatch("getBrand")
-            next()
-        } else if (token) {
-            store.commit("SETSSOTOKEN", token)
-            await store.dispatch("getUserInfo", router)
-            next()
-        } else {
-            let lastRoute = {
-                path: to.path,
-                params: to.params,
-                query: to.query,
-            }
-            store.commit("SETLASTROUTER", lastRoute)
-            let ssoServer = "http://oauth.wanda-dev.cn"
-            let systemcode = "CAD156",
-                signal = new Date().getTime(),
-                version = "1.0.0"
-            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-        }
-    } else {
-        next()
-        return
-    }
+    next()
+    // if (!ignore.includes(to.path)) {
+    //     const token = query().token
+    //     const ssoToken = store.getters["ssoToken"]
+    //     if (ssoToken) {
+    //         store.commit("SETSSOTOKEN", ssoToken)
+    //         await store.dispatch("getUserInfo", router)
+    //         await store.dispatch("getFloors")
+    //         await store.dispatch("getBrand")
+    //         next()
+    //     } else if (token) {
+    //         store.commit("SETSSOTOKEN", token)
+    //         await store.dispatch("getUserInfo", router)
+    //         next()
+    //     } else {
+    //         let lastRoute = {
+    //             path: to.path,
+    //             params: to.params,
+    //             query: to.query,
+    //         }
+    //         store.commit("SETLASTROUTER", lastRoute)
+    //         let ssoServer = "http://oauth.wanda-dev.cn"
+    //         let systemcode = "CAD156",
+    //             signal = new Date().getTime(),
+    //             version = "1.0.0"
+    //         window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+    //     }
+    // } else {
+    //     next()
+    //     return
+    // }
 })
 export default router

+ 23 - 38
src/store/index.js

@@ -14,8 +14,8 @@ import router from "../router"
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:lengqiang',
-        ssoToken: null,
+        ssoToken: 'admin:lengqiang',
+        // ssoToken: null,
         isPreview: false,
         lastRoute: "",
         isrequestAuth: true, // 是否请求登录校验接口
@@ -121,42 +121,27 @@ export default new Vuex.Store({
             commit
         }, palyload) {
             await login({}).then((res) => {
-                if (res.result == "success") {
-                    // token校验成功 拿到权限
-                    //commit("SETISREQUESTtAUTH", true)
-                    console.log("-----", palyload)
-                    if (res.permissions.length == 0) {
-                        //权限不足
-                        console.log("权限不足!!")
-                        router.push({
-                            path: "/404",
-                            query: {
-                                result: "权限不足"
-                            }
-                        })
-                    }
-                    commit("SETAUTHMSG", res)
-                } else if (res.result == "no_auth") {
-                    //登录失败
-                    console.log("登录失败!!")
-                    commit("SETISREQUESTtAUTH", false)
-                    router.push({
-                        path: "/404",
-                        query: {
-                            result: "登录失败"
-                        }
-                    })
-                } else {
-                    //访问出错 500
-                    console.log("访问出错!!")
-                    commit("SETISREQUESTtAUTH", false)
-                    router.push({
-                        path: "/404",
-                        query: {
-                            result: "访问出错"
-                        }
-                    })
-                }
+                // if (res.result == "success") {
+                //     // token校验成功 拿到权限
+                //     //commit("SETISREQUESTtAUTH", true)
+                //     console.log("-----", palyload)
+                //     if (res.permissions.length == 0) {
+                //         //权限不足
+                //         console.log("权限不足!!")
+                //         router.push({ path: "/404", query: { result: "权限不足" } })
+                //     }
+                //     commit("SETAUTHMSG", res)
+                // } else if (res.result == "no_auth") {
+                //     //登录失败
+                //     console.log("登录失败!!")
+                //     commit("SETISREQUESTtAUTH", false)
+                //     router.push({ path: "/404", query: { result: "登录失败" } })
+                // } else {
+                //     //访问出错 500
+                //     console.log("访问出错!!")
+                //     commit("SETISREQUESTtAUTH", false)
+                //     router.push({ path: "/404", query: { result: "访问出错" } })
+                // }
             })
         },
         getFloors(context) {

+ 6 - 3
src/views/legendLibrary/addLegend.vue

@@ -69,8 +69,11 @@ export default {
             this.title = title
             this.GraphCategoryId = GraphCategoryId
             //console.log(title)
+            let getParams = {
+                categoryId: String(this.GraphCategoryId)
+            }
             if (GraphCategoryId) {
-                groupByCategory({}).then(res => {
+                groupByCategory({ getParams }).then(res => {
                     this.treeData = []
                     this.treeData = res.Data.map(i => this.getTree(i))
                 })
@@ -156,7 +159,7 @@ export default {
             this.$emit('addSuccess')
             this.cancal()
         },
-        isCreateOrUpdate(){
+        isCreateOrUpdate() {
             if (this.title == '添加图例库') {
                 this.$refs.add.create()
                 this.$emit('addSuccess')
@@ -173,7 +176,7 @@ export default {
             } else {
                 if (this.info.Type != 'None') {
                     this.$refs.add.saveImg()
-                }else{
+                } else {
                     this.isCreateOrUpdate()
                 }
                 this.dialogVisible = false

+ 1 - 1
src/views/legendLibrary/index.vue

@@ -140,7 +140,7 @@
 
                 <el-table-column prop='typeId' resizable label='铺位可视化typeid' width='140' show-overflow-tooltip>
                     <template slot-scope='{row}'>
-                        <span>{{row.InfoTypes.length ?row.InfoTypes.map(item => item.Name).join(' ,'):'' }}</span>
+                        <span>{{row.InfoTypes.length ?row.InfoTypes.map(item => `${item.Id}-${item.Name}`).join(' ,'):'' }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label='操作' width='100' v-if='state==1'>

+ 2 - 2
src/views/legendRules/index.vue

@@ -347,8 +347,8 @@ export default {
         background: transparent !important;
         color: #0091ff !important;
     }
-    /deep/ .ant-tree li .ant-tree-node-content-wrapper:hover {
-        background: transparent !important;
+    /deep/ .ant-tree li .ant-tree-node-content-wrapper:hover{
+           background: transparent !important;
     }
     .is-current {
         background: #e1f2ff !important;