考评系统首页开发，新增考评指标对标页面（无服务联调）；配合后台修改问题；

src/api/permission.js

@@ -9,27 +9,24 @@ router.beforeEach((to, from, next) => {
     // from  从哪个路径跳转过来的
     // next 是一个函数,代表放行
     document.title = `${to.meta.title} | 全业务域对标考评系统`
-    // if (to.query.markKey === "YXSSO") {
+
+    // let token = window.localStorage.getItem('token')
+
+    // if(to.path==='/login'){
     //     return next()
-    // } else {
-    // let token = getToken('token')
-        let token = window.localStorage.getItem('token')
-    
-        if(to.path==='/login'){
-            return next()
-        }else{
-            if(!token){
-                ElMessage.error('登录已失效，请重新登录');
-                store.commit('clearAxiosArr')
-                return next('/login')
-            } else if (to.path==='/') {
-                store.commit('clearAxiosArr')
-                return next('/login')
-            } else{
-                store.commit('clearAxiosArr')
-                next()
-            }
-        }
+    // }else{
+    //     if(!token){
+    //         ElMessage.error('登录已失效，请重新登录');
+    //         store.commit('clearAxiosArr')
+    //         return next('/login')
+    //     } else if (to.path==='/') {
+    //         store.commit('clearAxiosArr')
+    //         return next('/login')
+    //     } else{
+    //         store.commit('clearAxiosArr')
+    //         next()
+    //     }
     // }
-    // return next()
+    
+    return next()
 })

src/assets/css/main.css

@@ -259,7 +259,7 @@ right: 0;
     color: #3B7AD1; 
 }
 .el-dialog{   
-    border-radius: 10px;
+    border-radius: 10px !important;
 }
 .el-dialog .el-dialog__body{
     padding: 20px 0;

src/components/assessment/evaluationBenchmarkingIndicPage.vue

@@ -108,7 +108,7 @@
                      :class="item.showClick? 'seachTypeCha':''" @click="changType(item)">
                         <img :src="item.img" alt="" v-if="!item.showClick">
                         <img :src="item.clickImg" alt="" v-else>
-                        <p>{{item.isName}}</p>
+                        <p :style="item.showClick? 'color: #3B7AD1' : ''">{{item.isName}}</p>
                     </div>
                 </div>
             </div>

src/components/assessment/monthQuarterFrom.vue

@@ -61,11 +61,13 @@
                         <el-icon :size="20" color="#3B7AD1" @click="seachDeptAEval"><Search /></el-icon>
                         <el-icon :size="20" color="#3B7AD1" @click="clearDeptAEval"><CircleClose /></el-icon>
                     </div>
-                    <div class="detaTableBtns">
+                    <div class="dateTableBtns">
+                         <!--  -->
                         <div class="tableBtn add" @click="addTableDetail" v-if="activeName === 'second'">
                             <img :src="addIcon" alt="">
                             <span>新增</span>
                         </div>
+                         <!-- v-if="$utils.havePurview('monthQuarter:twoLevel:save')" -->
                         <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('monthQuarter:twoLevel:save')">
                             <img :src="saveIcon" alt="">
                             <span>保存</span>
@@ -575,7 +577,7 @@ export default {
             })
         },
         handleImport() {
-            this.$refs.importPage.upload.title = "月/季度单位信息导入"
+            this.$refs.importPage.upload.title = "单位信息导入"
             this.$refs.importPage.upload.open = true
             this.$refs.importPage.upload.url = '/organization-evaluation-info/import'
         },
@@ -707,7 +709,7 @@ export default {
                                 cursor: pointer;
                             }
                         }
-                        .detaTableBtns{
+                        .dateTableBtns{
                             display: flex;
                             width: 360px;
                             margin-top: 5px;

src/utils/baseUrl.js

@@ -16,7 +16,7 @@ switch (process.env.NODE_ENV) {
         break
  
     case 'production': 
-        // baseUrl.ROOT = "http://123.60.219.66:28800/" 
+        // baseUrl.ROOT = "http://123.60.219.66:28800/"
         // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
         baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break