guoxiaohuan 4 years ago
parent
commit
4ff4deb6b0

+ 2 - 2
src/components/404.vue

@@ -29,7 +29,7 @@ export default {
     methods: {
         goLogin() {
             this.$store.commit('SETSSOTOKEN', null)
-            localStorage.removeItem('beforeunload')
+            sessionStorage.setItem('SSOTOKEN', '')
             let ssoServer = ''
             if (window.location.host == 'http://glsms.wanda-dev.cn') {
                 ssoServer = 'http://oauth.wanda-dev.cn'
@@ -40,7 +40,7 @@ export default {
                 signal = new Date().getTime(),
                 version = '1.0.0'
             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-            window.open(`${window.location.href}`, true)
+            // window.open(`${window.location.href}`, true)
         }
     }
 }

+ 4 - 0
src/components/menuList.vue

@@ -252,7 +252,11 @@ export default {
             margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
+            &:first-child {
+                display: none;
+            }
         }
+
         .is-active {
             color: #025baa;
             font-weight: bolder;

+ 2 - 2
src/store/index.js

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

+ 3 - 3
src/views/other/zhsxOtherTable2.vue

@@ -4,7 +4,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索任务名称'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -38,7 +38,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索部门'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -48,7 +48,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索检测结论'
                 size='small'
                 prefix-icon='el-icon-search'

+ 5 - 3
src/views/overview/index.vue

@@ -11,9 +11,11 @@
                 <span>项目基本信息</span>
             </nav>
             <!-- <el-button type='info' plain disabled> -->
-            <div class='view-button' :disabled='true' @click='findxmzl' title='数字化移交系统上线后可用'>
-                <img src='../../assets/imgs/wd.png' alt />
-                项目资料
+            <div title='数字化移交系统上线后可用'>
+                <div class='view-button' :disabled='true' @click='findxmzl'>
+                    <img src='../../assets/imgs/wd.png' alt />
+                    项目资料
+                </div>
             </div>
             <!-- </el-button> -->
         </div>

+ 3 - 3
src/views/room/detail.vue

@@ -112,7 +112,7 @@
             style='width:100%;margin-top:12px'
             :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
         >
-            <el-table-column type='index' label='序号' width='50' :index='indexMethod'></el-table-column>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
             </el-table-column>
@@ -168,7 +168,7 @@ import { mapGetters } from 'vuex'
 import { queryHxsbDetail } from '@/api/room.js'
 
 export default {
-    props: ['row'],
+    props: ['row', 'location'],
     data() {
         return {
             dialogFormVisible: false,
@@ -248,7 +248,7 @@ export default {
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
                 brand: this.row.brand || '--',
-                location: this.row.classstructureid,
+                location: this.location,
                 classstructureid: this.row.classstructureid
                 // type_code: this.row.type_code
             }

+ 1 - 0
src/views/room/index.vue

@@ -135,6 +135,7 @@
                             :page='page2'
                             :total='total2'
                             :size='size2'
+                            :location='location'
                             @Index2Emit='Index2Emit'
                         ></room-table3>
                     </el-tab-pane>

+ 2 - 2
src/views/room/room3.vue

@@ -42,7 +42,7 @@
             ></el-pagination>
         </div>
         <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :visible.sync='innerVisible' append-to-body>
-            <detail v-if='row' :row='row' :floorChange='floorChange'></detail>
+            <detail v-if='row' :row='row' :location='location' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
 </template>
@@ -53,7 +53,7 @@ import { Select } from 'meri-design'
 import Detail from './detail'
 
 export default {
-    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName'],
+    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName', 'location'],
     data() {
         return {
             innerVisible: false,