Răsfoiți Sursa

名称修改

lucw 9 luni în urmă
părinte
comite
056a7e68d6

+ 1 - 2
src/components/common/seekPage.vue

@@ -196,8 +196,7 @@
       seekList: {
         type: Array,
         default: () => []
-      },
-      keyValue: ''
+      }
     },
 
     components: {},

+ 1 - 1
src/components/selectReleaseRules/search.vue

@@ -31,7 +31,7 @@
             placeholder: '规则名称'
           },
           {
-            label: '记录表分类:',
+            label: '记录规则分类',
             value: 'classify',
             type: 'select',
             placeholder: '记录表分类',

+ 1 - 1
src/components/selectReleaseRules/select-release-rules.vue

@@ -117,7 +117,7 @@
             formatter: (row) => {
               return (
                 row.frequencyValue +
-                this.getDictValue('记录规则频率', row.frequencyUnit)
+                this.getDictValue('记录规则频率', row.frequencyUnit + '')
               );
             }
           },

+ 4 - 4
src/store/modules/user.js

@@ -5,7 +5,7 @@ import { formatMenus, toTreeData, formatTreeData } from 'ele-admin';
 import { USER_MENUS } from '@/config/setting';
 import { getResourcesTree } from '@/api/layout';
 import { getCurrentUserAuthorityDeptAPI } from '@/api/system/organization';
-import { getCurrentUser,setCurrentUser } from '@/utils/token-util';
+import { getCurrentUser, setCurrentUser } from '@/utils/token-util';
 
 const formatRouter = (list) => {
   let menuList = []; // menuType
@@ -90,7 +90,7 @@ export default {
   },
   actions: {
     async getCurrentUserAuthorityDept({ commit }) {
-      return []
+      return [];
       const info = await getCurrentUserAuthorityDeptAPI();
       commit('setAuthorityDept', info);
     },
@@ -129,7 +129,7 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit, state }) {
-      let currentUser = getCurrentUser()
+      let currentUser = getCurrentUser();
       const result = await getResourcesTree({
         groupId: currentUser.currentGroupId,
         roleId: currentUser.currentRoleId
@@ -169,7 +169,7 @@ export default {
             parentIdField: 'parentId'
           })
       );
-      console.log('menus--', menus);
+      console.log('menus--', homePath, menus);
       commit('setMenus', menus);
       commit('setAuthoritiesRouter', authoritiesRouter);
       // const menus = result;

+ 1 - 1
src/views/rulesManagement/releaseRules/components/search.vue

@@ -31,7 +31,7 @@
             placeholder: '规则名称'
           },
           {
-            label: '记录表分类:',
+            label: '记录规则分类',
             value: 'classify',
             type: 'select',
             placeholder: '记录表分类',

+ 3 - 3
vue.config.js

@@ -37,14 +37,14 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
 
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
 
-        // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {