解决冲突

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+dist.zip
 
 /tests/e2e/videos/
 /tests/e2e/screenshots/

src/page/index/index.vue

@@ -63,10 +63,11 @@ export default {
       // 刷新token的时间
       refreshTime: '',
       // 计时器
-      timer: ''
+      timer: '',
     }
   },
   created() {
+    this.loading = true
     // 实时检测刷新token
     this.refreshToken()
   },

src/page/index/top/top-menu.vue

@@ -35,6 +35,7 @@ export default {
     this.getTopMenu()
     // 用户权限加载
     this.getUserInfo()
+    console.log('this.getUserInfo()')
   },
   computed: {
     ...mapGetters(['menu'])

src/page/wel.vue

@@ -434,7 +434,8 @@
       </div>
     </div>
 
-    <div v-if="role != 3 && info.userRoleType != 6">
+
+    <div v-if="isSystem">
       <!-- 系统后台 -->
       <div style="margin-bottom: 10px; cursor: pointer" v-if="role != 2">
         <span style="font-weight: bold; font-size: 18px">待处理</span>
@@ -1069,12 +1070,7 @@
         </div>
       </div>
     </div>
-    <div
-      v-if="info.userRoleType == 6"
-      style="text-align: center; font-size: 30px; margin: 300px auto"
-    >
-      欢迎光临
-    </div>
+
   </div>
 </template>
 
@@ -1128,14 +1124,12 @@ export default {
     info() {
       return this.$store.state.user.userInfo
     }
-    
   },
 
   mounted() {
     this.role = localStorage.getItem("orgType");
     if (this.role == 3) {
       this.houseId = localStorage.getItem("houseId");
-
       this.getgicd();
       // 获取维度占比
       this.getindexZxllist();
@@ -1150,6 +1144,7 @@ export default {
       this.waitingForOperation();
     }
   },
+
   methods: {
     // 跳转详情
     toDetail(path, params2 = "", name) {

src/views/Receive/index.vue

@@ -1796,8 +1796,8 @@ export default {
         .findText({ corpusId: this.arr[this.aplayerId].id })
         .then((res) => {
           console.log(res, "获取文本");
-            this.optimizeobj = res.data;
-            this.optimizetext = JSON.parse(res.data.textContent);
+          this.optimizeobj = res.data;
+          this.optimizetext = JSON.parse(res.data.textContent);
           this.dialogFormtext = true;
         });
     },

src/views/ReceivingRecords/index.vue

@@ -336,6 +336,7 @@
             {{ row.zfal == 0 ? "已加精" : "未加精" }}
           </template>
         </el-table-column>
+        <!-- <el-table-column prop="validInvalidName" label="是否有效" align="center"></el-table-column> -->
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="{ row }">
             <el-button

vue.config.js

@@ -9,7 +9,6 @@
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://62.234.122.43:9999' //正式
 const url = 'https://zanyong.hfju.com' // 正式域名
-
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {