提交

.env.development

@@ -1,4 +1,4 @@
 # .env.development
 VITE_APP_TITLE=校端德育
-VITE_APP_BASE_API=https://hdpb.dev.bozedu.net/
+VITE_APP_BASE_API=http://jnjymf_api.bozedu.top/
 

.env.production

@@ -1,3 +1,3 @@
 # .env.production
 VITE_APP_TITLE=校端德育
-VITE_APP_BASE_API=https://hdpb.bozedu.net/
+VITE_APP_BASE_API=http://jnjymf_api.bozedu.top/

src/router/index.js

@@ -130,19 +130,19 @@ function handleFilterRoutes(routes, role) {
 
 import {user} from "@/stores/user";
 
-var filterRoutes;
-const ifPower = user.power;
-var announceMark = ifPower.announce;
-if (announceMark == 1) {
-    //设定了权限;
-    var aa = filterNewRoutes(allRoutes, ifPower);
-
-    filterRoutes = handleFilterRoutes(aa, user.roleName)
-    console.log(filterRoutes, "9999")
-} else {
-    //没有设定权限
-    filterRoutes = handleFilterRoutes(allRoutes, user.roleName);
-}
+// var filterRoutes;
+// const ifPower = user.power;
+// var announceMark = ifPower.announce;
+// if (announceMark == 1) {
+//     //设定了权限;
+//     var aa = filterNewRoutes(allRoutes, ifPower);
+//
+//     filterRoutes = handleFilterRoutes(aa, user.roleName)
+//     console.log(filterRoutes, "9999")
+// } else {
+//     //没有设定权限
+//     filterRoutes = handleFilterRoutes(allRoutes, user.roleName);
+// }
 
 // var filterRoutes = handleFilterRoutes(allRoutes, user.roleName);
 
@@ -170,7 +170,7 @@ const createRouter = () =>
     new Router({
         // mode: 'history', // require service support
         scrollBehavior: () => ({y: 0}),
-        routes: filterRoutes,
+        routes: allRoutes,
     });
 
 const router = createRouter();

src/stores/user.js

@@ -1,69 +1,107 @@
 import { defineStore } from 'pinia'
 
 localStorage.setItem(
-  'userInfo',
-  JSON.stringify({
-      user_id: '1',
-      user_name: 'admin',
-      user_realname: '系统管理员',
-      lastlogintime: '',
-      user_role_id: '3',
-      user_level: '1',
-      user_role_name: '系统管理员',
-      user_avatar: {
-        big: 'https://hdpb.dev.bozedu.net/template/default/static/img/user_avatar.png',
-        middle:
-          'https://hdpb.dev.bozedu.net/template/default/static/img/user_avatar.png',
-        small:
-          'https://hdpb.dev.bozedu.net/template/default/static/img/user_avatar.png',
-      },
-      token:
-        'a5eamfPamj16NLM4Kd9i5W7Z0ekenlStx_arb_aOsQj_aLo2_bwgBogMdII7MGXil4eDb2_bBt9lSebUKW7aprtxcazHXnVdBGdA',
-      user_phone: '13966661115',
-      power: {
-        announce: 0,
-        readonly: 0
-      },
-      idcard: '',
-      org_info: {
-        dept_id: '1',
-        dept_name: '教育和体育局',
-        dept_pid: '0',
-        is_matser: '0',
-        dept_role: { role_id: '1', role_name: '教育和体育局成员' },
-        dept_full: [{ dept_id: '1', dept_name: '教育和体育局' }],
-      },
-    },
-  )
+    'userInfo',
+    JSON.stringify({
+            "user_id": "1",
+            "user_name": "admin",
+            "user_realname": "管理员",
+            "user_password": "10470c3b4b1fed12c3baac014be15fac67c6e815",
+            "user_group_id": "1",
+            "user_role_id": "3",
+            "user_level_id": "8",
+            "user_detail_id": "0",
+            "user_score": "0",
+            "create_dateline": "1583718659",
+            "modify_dateline": "1651745948",
+            "isdelete": "0",
+            "area_id1": "0",
+            "area_id2": "0",
+            "area_id3": "0",
+            "area_id4": "0",
+            "user_phone": "",
+            "user_cardno": "320581888888888888",
+            "phone_validation": "0",
+            "parent_user_id": "0",
+            "user_nickname": "",
+            "user_avatar": "http://jnjymf_api.bozedu.top///template/default/static/img/user_avatar.png",
+            "user_email": "huming17@126.com",
+            "email_validation": "0",
+            "email_token": "",
+            "email_token_exptime": "1446220800",
+            "ischeck": "1",
+            "address": "江苏省苏州市",
+            "gender": "1",
+            "about": "",
+            "qq": "",
+            "openid": "",
+            "user_birthday": "0000-00-00",
+            "webchatopenid": "",
+            "user_level": "3",
+            "user_abalance": "0.00",
+            "user_dcash": "0.00",
+            "user_dqsj": "",
+            "user_alipay_account": "huming17@126.com",
+            "token": "cbc9BFbEoXqhbD_a_brgcJGr3iV5OAT4I_ast3cXeM6bcJbS2gRpajuQtysTD27eqr1zCrqI5ZFWWJWQim2w_bcAlvw_bJNXWZks",
+            "setting": {
+                "sitename": "景宁教育魔方",
+                "sitedomain": "http://jnjymf_api.bozedu.top/",
+                "site_icp": "浙ICP备05048509号-1",
+                "sitelogo": "http://jnjymf_api.bozedu.top/src/assets/image/public/logo3.png",
+                "siteqrcode": "http://jnjymf_api.bozedu.top/dev.qr.png",
+                "sitefavicon": "",
+                "user_failedlogin_max": "5"
+            },
+            "user_org": [
+                {
+                    "uo_id": "1",
+                    "uo_name": "景宁教育魔方"
+                },
+                {
+                    "uo_id": "2",
+                    "uo_name": "教育局"
+                },
+                {
+                    "uo_id": "3",
+                    "uo_name": "第一实验学校"
+                }
+            ],
+            "dept_ids": [
+                "1",
+                "2",
+                "3"
+            ]
+        },
+    )
 )
 
 const RoleMap = {
-  JLD: [1, 2, 3],
-  ZJ: [4, 5, 6],
-  JYZ: [7, 8],
+    JLD: [1, 2, 3],
+    ZJ: [4, 5, 6],
+    JYZ: [7, 8],
 }
 const userInfo = JSON.parse(localStorage.getItem('userInfo'))
 const { token, org_info, user_realname, user_avatar, power} = userInfo
 
 export const user = {
-  userInfo,
-  token,
-  role: org_info.dept_role.role_id * 1,
-  real_name: user_realname,
-  avatar: user_avatar.small,
-  roleName:
-    Object.keys(RoleMap).find((k) =>
-      RoleMap[k].includes(org_info.dept_role.role_id * 1)
-    ) || 'None',
-  power:power,
+    userInfo,
+    token,
+    // role: org_info.dept_role.role_id * 1,
+    real_name: user_realname,
+    avatar: user_avatar,
+    // roleName:
+    //   Object.keys(RoleMap).find((k) =>
+    //     RoleMap[k].includes(org_info.dept_role.role_id * 1)
+    //   ) || 'None',
+    power:power,
 
 }
 export const useUserStore = defineStore('user', {
-  state: () => user,
-  actions: {
-    logout() {
-      localStorage.removeItem('userInfo')
-      window.open(window.globalVariables.login, '_self')
+    state: () => user,
+    actions: {
+        logout() {
+            localStorage.removeItem('userInfo')
+            window.open(window.globalVariables.login, '_self')
+        },
     },
-  },
 })

src/views/dygl/bjhd/index.vue

@@ -488,7 +488,7 @@ export default {
         shr:'封副',
         hdzt:'1',
         hddd:'操场1001',
-        score:'3'
+        score:3
       },{
         id:1,
         bj:'六年级一班',
@@ -499,7 +499,7 @@ export default {
         shr:'封副',
         hdzt:'2',
         hddd:'操场1001',
-        score:'4'
+        score:4
       },{
         id:3,
         bj:'六年级一班',
@@ -510,7 +510,7 @@ export default {
         shr:'封副',
         hdzt:'3',
         hddd:'多媒体1031室',
-        score:'2'
+        score:2
       },{
         id:4,
         bj:'六年级一班',
@@ -521,7 +521,7 @@ export default {
         shr:'封副',
         hdzt:'2',
         hddd:'操场1001',
-        score:'3'
+        score:3
       },{
         bj:'六年级一班',
         hdmc:'足球联赛',
@@ -531,7 +531,7 @@ export default {
         shr:'封副',
         hdzt:'1',
         hddd:'操场1001',
-        score:'5'
+        score:5
       }],
       fourthForm:{
         xsxm:'',
@@ -545,34 +545,34 @@ export default {
         xsxm:'田静',
         xsxh:'27645464556',
         sjhm:'13605998421',
-        score:'3'
+        score:3
       },{
         id:1,
         hdmc:'足球联赛',
         xsxm:'田静',
         xsxh:'27645464556',
         sjhm:'13605998421',
-        score:'5'
+        score:5
       },{
         id:3,
         hdmc:'足球联赛',
         xsxm:'田静',
         xsxh:'27645464556',
         sjhm:'13605998421',
-        score:'2'
+        score:2
       },{
         id:4,
         hdmc:'足球联赛',
         xsxm:'田静',
         xsxh:'27645464556',
         sjhm:'13605998421',
-        score:'3'
+        score:3
       },{
         hdmc:'足球联赛',
         xsxm:'田静',
         xsxh:'27645464556',
         sjhm:'13605998421',
-        score:'4'
+        score:4
       }],
     }
   },