页面优化修改

config/prod.env.js

@@ -2,9 +2,9 @@ module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
 	// 阿里云环境
-  // BASE_API: '"http://47.103.79.143:9085/admin"',
-  // OS_API: '"http://47.103.79.143:9085/admin"'
+  BASE_API: '"http://47.103.79.143:9085/admin"',
+  OS_API: '"http://47.103.79.143:9085/admin"'
   //正式环境
-  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
-  OS_API: '"https://xiaoyou.dgtis.com/admin"'
+  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  // OS_API: '"https://xiaoyou.dgtis.com/admin"'
 }

src/permission.js

@@ -138,8 +138,8 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => {
           store.dispatch('GetUserMenus').then(res => { // 拉取user_info
-            // const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
-            const roles = myRoles;
+            const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
+            // const roles = myRoles;
             store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
               router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record

src/views/yeZhanManage/likeList.vue

@@ -24,7 +24,11 @@
       highlight-current-row>
       <el-table-column type="index" label="序号" header-align="center" align="center">
       </el-table-column>
-      <el-table-column align="center" min-width="150px" label="平台" prop="platformName">
+      <el-table-column align="center" min-width="100px" label="员工号" prop="employeNo">
+      </el-table-column>
+      <el-table-column align="center" min-width="100px" label="员工姓名" prop="userName">
+      </el-table-column>
+      <el-table-column align="center" min-width="100px" label="平台" prop="platformName">
       </el-table-column>
       <el-table-column align="center" min-width="100" label="账号" prop="accountName">
       </el-table-column>
@@ -68,8 +72,8 @@
         <el-form-item label="积分" prop="integral" v-if="flag == 0">
           <el-input-number :min="0" :step="1" v-model="dataForm.integral" style="width: 100%"></el-input-number>
         </el-form-item>
-        <el-form-item label="审批内容" prop="content" v-else>
-          <el-input type="textarea" :rows="2" placeholder="请输入审批内容" v-model="dataForm.content" style="width: 100%"></el-input>
+        <el-form-item label="驳回原因" prop="content" v-else>
+          <el-input type="textarea" :rows="2" placeholder="请输入驳回原因" v-model="dataForm.content" style="width: 100%"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -101,7 +105,7 @@ export default {
       },
       rules: {
         integral: [{ required: true, message: "积分不能为空", trigger: "blur" }],
-        content: [{ required: true, message: "审批内容不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "驳回原因不能为空", trigger: "blur" }],
       },
       statusTypeList: [
         {