guoxiaohuan 4 năm trước cách đây
mục cha
commit
ebe990376e

+ 4 - 1
src/components/editLengend.vue

@@ -24,7 +24,7 @@
                         <el-table-column prop label='数量'>
                             <template slot-scope='{row}'>
                                 <div v-if='row.IsModify'>
-                                    <div v-if='row.Num!=row.RealNum ' class='redData'>
+                                    <div v-if='row.Num!=row.RealNum && (rowNum!=null && RealNum!=null)' class='redData'>
                                         <el-tooltip
                                             class='item'
                                             effect='dark'
@@ -34,6 +34,9 @@
                                             <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
                                         </el-tooltip>
                                     </div>
+                                    <div v-else-if='row.Num==null||row.RealNum==null'>
+                                        <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
+                                    </div>
                                     <div v-else-if='!row.Num' class='nullData'>
                                         <el-input @change='changeTable(row)' v-model='row.Num' size='mini'></el-input>
                                     </div>

+ 2 - 2
src/components/floorMap/index.vue

@@ -106,9 +106,9 @@ export default {
                             this.scene.addItem(t)
                             t.nameSize = 16
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
-                                t.name = this.bunkObj[t.data.Name].detailtype
+                                t.name = this.bunkObj[t.data.Name].brandname
                             } else {
-                                t.name = ''
+                                t.name = t.data.Name
                             }
                         })
                         this.fParser.wallList.forEach(t => this.scene.addItem(t))

+ 9 - 1
src/components/viewLengend.vue

@@ -35,7 +35,7 @@
                 @selection-change='handleSelectionChange'
                 :header-cell-style='{background:"rgba(2,91,170,0.1)",fontFamily:"PingFangSC-Medium,PingFang SC;",color:"rgba(0,0,0,0.85);",fontSize:"12px"}'
             >
-                <el-table-column type='selection' width='45' align='center'></el-table-column>
+                <el-table-column type='selection' :selectable='checkSelectable' width='45' align='center'></el-table-column>
                 <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
                     <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                 </el-table-column>
@@ -82,6 +82,14 @@ export default {
         }
     },
     methods: {
+        // 所属分类 非图例 默认不能勾选
+        checkSelectable(row, index) {
+            let flag = false
+            if (row.Type != 'None') {
+                flag = true
+            }
+            return flag
+        },
         handleSelectionChange(val) {
             this.multipleSelection = val
             const tempArr = val.map(t => {

+ 1 - 1
src/router/index.js

@@ -73,7 +73,7 @@ const router = new VueRouter({
     routes,
 })
 //不需要token的路由
-const ignore = ['/404', '/home/legendLibrary', '/home/legendRules']
+const ignore = ['/404']
 router.beforeEach(async (to, from, next) => {
     if (!ignore.includes(to.path)) {
         const token = store.getters['ssoToken'] || query().token

+ 2 - 2
src/store/index.js

@@ -9,8 +9,8 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:lengqiang',
-        // ssoToken: null,
+        // ssoToken: 'admin:lengqiang',
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',