位置调整

src/utils/request.js

@@ -64,11 +64,7 @@ service.interceptors.response.use(
     if ([50008, 50012, 50014, 50015, 402000, 401].includes(res.code)) {
       // Vue.prototype.$message.error('登陆过期，请重新登陆')
       const str = '登陆过期，请重新登陆'
-      try {
-        checkToken()
-      } catch (error) {
-        Vue.prototype.$message.error(error)
-      }
+      checkToken().catch(error => Vue.prototype.$message.error(error))
       return Promise.reject(str)
     }
     if (res.code === 302) {

src/views/salary/sandbox/index.vue → src/views/sandbox/index.vue

@@ -8,7 +8,7 @@
           @history="onHistory"
         >
           <template #actions="{ row }">
-            <m-button text type="success" size="small" @click="onCalculate(row)">计算</m-button>
+            <m-button text type="success" size="small" @click="onCalculate(row)">开始测算</m-button>
             <m-button text type="success" size="small" @click="onSend(row)">发布</m-button>
           </template>
         </Solution>
@@ -20,7 +20,7 @@
         <History label="历史记录" ref="History" @history="onHistory"></History>
       </el-tab-pane>
     </el-tabs>
-    <!-- <el-drawer
+    <el-drawer
       :title="itemData.title"
       :visible.sync="show"
       direction="rtl"
@@ -28,19 +28,19 @@
       <div class="pa-3" v-loading="loading">
         <SolutionDetails :item-data="itemData"></SolutionDetails>
       </div>
-    </el-drawer> -->
+    </el-drawer>
     <!-- <SalarySolutionEdit ref="salarySolutionEditRefs" @refresh="$refs.Solution.onInit()"></SalarySolutionEdit>
     <SalarySandboxRules ref="salarySandboxRulesRefs" @refresh="$refs.Solution.onInit()"></SalarySandboxRules> -->
   </div>
 </template>
 
 <script>
-import Solution from '../solution/salarySolution'
+import Solution from '../salary/solution/salarySolution'
 // import SalarySolutionEdit from './salarySandboxEdit.vue'
 // import SalarySandboxRules from './salarySandboxRules.vue'
-import Coefficient from '../solution/salaryCoefficient'
-import History from '../solution/salarySolutionHistory'
-// import SolutionDetails from '../solution/components/solutionDetails.vue'
+import Coefficient from '../salary/solution/salaryCoefficient'
+import History from '../salary/solution/salarySolutionHistory'
+import SolutionDetails from '../salary/solution/components/solutionDetails.vue'
 
 import {
   sendSalaryRelease,
@@ -58,8 +58,8 @@ export default {
     // SalarySandboxRules,
     Solution,
     Coefficient,
-    History
-    // SolutionDetails
+    History,
+    SolutionDetails
   },
   data () {
     return {

src/views/system/menu/index.vue

@@ -20,7 +20,7 @@
           :type="row.hidden ? 'success' : 'danger'"
           text-color="white"
         >
-          {{ row.hidden ? '已开启' : '已关闭' }}
+          {{ row.hidden ? '显示' : '隐藏' }}
         </el-tag>
       </template>
       <template #icon="scope">
@@ -46,9 +46,9 @@ export default {
     return {
       headers: [
         { label: '菜单名称', prop: 'label', width: 300 },
-        { label: '图标', prop: 'icon', width: 50 },
-        { label: '排序', prop: 'sort', width: 50 },
-        { label: '状态', prop: 'hidden', width: 100, align: 'center' },
+        { label: '图标', prop: 'icon', width: 50, align: 'center' },
+        { label: '排序', prop: 'sort', width: 50, align: 'center' },
+        { label: '显示状态', prop: 'hidden', width: 100, align: 'center' },
         { label: '组件路径', prop: 'component', width: 300 },
         { label: '权限标识', prop: 'code', width: 300 },
         { label: '备注', prop: 'remark' },