YaolongHan 4 年 前
コミット
38a7138f2f
3 ファイル変更27 行追加19 行削除
  1. 17 9
      src/store/index.js
  2. 4 4
      src/views/legendLibrary/index.vue
  3. 6 6
      src/views/legendRules/index.vue

+ 17 - 9
src/store/index.js

@@ -1,16 +1,22 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { login, queryFloor, queryfmapID } from '@/api/login.js'
-import { queryBrand } from '@/api/public.js'
+import {
+    login,
+    queryFloor,
+    queryfmapID
+} from '@/api/login.js'
+import {
+    queryBrand
+} from '@/api/public.js'
 import axios from 'axios'
 import router from '../router'
 
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:lengqiang',
-        ssoToken: 'admin:chuyushu',
-        // ssoToken: null,
+        // ssoToken: 'admin:chuyushu',
+        // ssoToken: '',
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',
@@ -148,10 +154,12 @@ export default new Vuex.Store({
     },
     actions: {
         // 获取项目列表、userId
-        async getUserInfo({ commit },) {
+        async getUserInfo({
+            commit
+        }, palyload) {
             await login({
-                returnTree: true,
-            })
+                    returnTree: true,
+                })
                 .then((res) => {
                     // 获取用户当前权限
                     console.log(res.result)
@@ -234,4 +242,4 @@ export default new Vuex.Store({
         },
     },
     modules: {},
-})
+})

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

@@ -98,7 +98,7 @@
                 ></Select>
                 <el-input
                     size='small'
-                    @keyup.enter.native='getTableList'
+                    @change='getTableList'
                     prefix-icon='el-icon-search'
                     v-model='keyword'
                     clearable
@@ -121,13 +121,13 @@
                 <el-table-column prop='Unit' label='单位' width='60'>
                     <template slot-scope='{row}'>{{row.Unit}}</template>
                 </el-table-column>
-                <el-table-column prop='position' label='对应广场说明书的位置' show-overflow-tooltip>
+                <el-table-column prop='position' label='对应广场说明书的位置' show-overflow-tooltip width='560'>
                     <template slot-scope='{row}'>
                         <span>{{ row.GraphCategorys.length?row.GraphCategorys.map(item => item.Name).join(' ,'):'' }}</span>
                     </template>
                 </el-table-column>
 
-                <el-table-column label='对应工程信息化中的专业/位置、设备分类' show-overflow-tooltip>
+                <el-table-column label='对应工程信息化中的专业/位置、设备分类' show-overflow-tooltip width='462'>
                     <template slot-scope='{row}'>
                         <span>{{row.InfoLocal.length?row.InfoLocal.map(item => item.name).join(' ,') :''}}</span>
                     </template>
@@ -138,7 +138,7 @@
                         </template>
                 </el-table-column>-->
 
-                <el-table-column prop='typeId' resizable label='铺位可视化typeid' show-overflow-tooltip>
+                <el-table-column prop='typeId' resizable label='铺位可视化typeid' width='364' show-overflow-tooltip>
                     <template slot-scope='{row}'>
                         <span>{{row.InfoTypes.length ?row.InfoTypes.map(item => `${item.Id }-${item.Name}`).join(' ,'):'' }}</span>
                     </template>

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

@@ -61,7 +61,7 @@
                     @tool-button-click='buttonClickHandle'
                 >
                     <img slot-scope='{col, row}' v-if='col.key==="Url"' class='img' :src='`/serve/topology-wanda/Picture/query/${row.Url}`' alt />
-                    <span slot-scope='{col}' v-else-if='col.key==="caozuo"' style='color:#0091FF'>删除</span>
+                    <!-- <span slot-scope='{col}' v-else-if='col.key==="caozuo"' style='color:#0091FF'>删除</span> -->
                 </Table>
             </div>
         </div>
@@ -99,12 +99,12 @@ export default {
                     title: '单位',
                     key: 'Unit',
                     show: true
-                },
-                {
-                    title: '操作',
-                    key: 'caozuo',
-                    show: true
                 }
+                // {
+                //     title: '操作',
+                //     key: 'caozuo',
+                //     show: true
+                // }
             ],
             // 操作按钮组 (非必填)
             toolBtns: [