提交

.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

public/config.js

@@ -1,7 +1,7 @@
 // 本地开发环境
 const local = {
   oss: 'https://openapi.dev.bozedu.net',
-  api: 'https://hdpb.dev.bozedu.net/',
+  api: 'http://jnjymf_api.bozedu.top/',
   login: 'https://qqyxt.dev.bozedu.net/app/activityRating/home/login.html',
   origin: window.location.origin,
 }
@@ -9,7 +9,7 @@ const local = {
 // 测试服环境
 const development = {
   oss: 'https://openapi.dev.bozedu.net',
-  api: 'https://hdpb.dev.bozedu.net/',
+  api: 'http://jnjymf_api.bozedu.top/',
   login: 'https://qqyxt.dev.bozedu.net/app/activityRating/home/login.html',
   origin: window.location.origin + '/app/activityRating/manage/',
 }
@@ -17,7 +17,7 @@ const development = {
 // 正式服环境
 const production = {
   oss: 'https://openapi.bozedu.net',
-  api: 'https://hdpb.bozedu.net/',
+  api: 'http://jnjymf_api.bozedu.top/',
   login: 'https://qqyxt.bozedu.net/app/activityRating/home/login.html',
   origin: window.location.origin + '/app/activityRating/manage/',
 }

src/router/index.js

@@ -522,58 +522,58 @@ function handleFilterRoutes(routes, role) {
     return res;
 }
 
-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);
-}
-
+// 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 = handleFilterRoutes(allRoutes, user.roleName);
-
-function filterNewRoutes(allRoutes, ifPower) {
-    var temp_routesArr = [];
-    allRoutes.forEach((item) => {
-        const tmp = {...item};
-        if (item.name == "mhgl") {
-            delete item.meta.roles;
-            if (item.children) {
-                item.children.forEach((itemSec) => {
-                    //将活动公告，通知公告的roles去除
-                    if (itemSec.path == "hdgg" || itemSec.path == "tzgg") {
-                        delete itemSec.meta.roles;
-                    }
-                });
-            }
-        }
-        temp_routesArr.push(tmp);
-    });
-    return temp_routesArr;
-}
-
+//
+// function filterNewRoutes(allRoutes, ifPower) {
+//     var temp_routesArr = [];
+//     allRoutes.forEach((item) => {
+//         const tmp = {...item};
+//         if (item.name == "mhgl") {
+//             delete item.meta.roles;
+//             if (item.children) {
+//                 item.children.forEach((itemSec) => {
+//                     //将活动公告，通知公告的roles去除
+//                     if (itemSec.path == "hdgg" || itemSec.path == "tzgg") {
+//                         delete itemSec.meta.roles;
+//                     }
+//                 });
+//             }
+//         }
+//         temp_routesArr.push(tmp);
+//     });
+//     return temp_routesArr;
+// }
+//
 const createRouter = () =>
     new Router({
         // mode: 'history', // require service support
         scrollBehavior: () => ({y: 0}),
-        routes: filterRoutes,
+        routes: allRoutes,
     });
 
 const router = createRouter();
-
-// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
-export function resetRouter() {
-    const newRouter = createRouter();
-    router.matcher = newRouter.matcher; // reset router
-}
+//
+// // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
+// export function resetRouter() {
+//     const newRouter = createRouter();
+//     router.matcher = newRouter.matcher; // reset router
+// }
 
 export default router;
 

src/stores/user.js

@@ -3,36 +3,74 @@ 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: '教育和体育局' }],
+      "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"
+      ]
     },
   )
 )
@@ -48,13 +86,13 @@ const { token, org_info, user_realname, user_avatar, power} = userInfo
 export const user = {
   userInfo,
   token,
-  role: org_info.dept_role.role_id * 1,
+  // 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',
+  avatar: user_avatar,
+  // roleName:
+  //   Object.keys(RoleMap).find((k) =>
+  //     RoleMap[k].includes(org_info.dept_role.role_id * 1)
+  //   ) || 'None',
   power:power,
 
 }

src/views/wjsj/wfqd/api.js

@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+export const wfqd_list = (data = {}) =>
+    request({
+        url: '/jdbg/wjsj_wjgzt/index',
+        data,
+    })

src/views/wjsj/wfqd/index.vue

@@ -35,32 +35,33 @@
         width="auto"
     >
       <template slot-scope="scope">
-        <a href="javascript:;" @click="toDetail(scope.row.id)" class="text-normal">{{scope.row.title}}</a>
+        <a href="javascript:;" @click="toDetail(scope.row.wwj_id)" class="text-normal">{{scope.row.wwj_title}}</a>
       </template>
     </el-table-column>
     <el-table-column
         label="发起人"
         width="100"
-        prop="fqr"
+        prop="wwj_fqr"
     ></el-table-column>
     <el-table-column
         label="截止日期"
         width="150"
-        prop="jzrq"
+        prop="www_jzsj"
     ></el-table-column>
     <el-table-column
         label="状态"
         width="100">
       <template slot-scope="scope">
-        <span v-if="scope.row.zt == 3" class="text-orange">{{scope.row.ztmc}}</span>
-        <span v-else>{{scope.row.ztmc}}</span>
+        <span v-if="scope.row.wwj_zt == 0">正常</span>
+        <span v-if="scope.row.wwj_zt == 1" class="text-orange">即将超期</span>
+        <span v-if="scope.row.wwj_zt == 2" class="text-red">已过期</span>
       </template>
     </el-table-column>
     <el-table-column
         label="进度"
         width="200">
       <template slot-scope="scope">
-        <el-progress :percentage="scope.row.jd" color="#4351FF"></el-progress>
+        <el-progress :percentage="Number(scope.row.wwj_jd)" color="#4351FF"></el-progress>
       </template>
     </el-table-column>
     <el-table-column label="操作" width="80">
@@ -89,6 +90,7 @@
 </template>
 
 <script>
+import {wfqd_list} from "./api";
 export default {
   name: "index",
   data() {
@@ -111,99 +113,30 @@ export default {
         value: '4'
       }],
       time:'',
-      tableData:[{
-        id:'1',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'3',
-        ztmc:'即将超期',
-        jd:65
-      },{
-        id:'2',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'3',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'4',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'3',
-        ztmc:'即将超期',
-        jd:65
-      },{
-        id:'5',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'6',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'7',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'3',
-        ztmc:'即将超期',
-        jd:65
-      },{
-        id:'8',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'9',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'正常',
-        jd:65
-      },{
-        id:'10',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'3',
-        ztmc:'即将超期',
-        jd:65
-      }],
+      tableData:[],
       limit:10,
-      total:12,
+      total:0,
       cur_page: 1
     }
   },
   methods:{
+    getListData() {
+      let data = {}
+      wfqd_list(data).then(res => {
+         this.tableData = res.data.page_data;
+         this.cur_page = Number(res.data.page_now);
+         this.total = Number(res.data.total_rows);
+      })
+    },
     handleCurrentChange(val) {
       this.cur_page = val;
     },
     toDetail(id) {
       this.$router.push({ name: 'wjsj_wfqd_wjxq', params: { id: id } })
     }
+  },
+  mounted() {
+    this.getListData();
   }
 }
 </script>

src/views/wjsj/wtjd/api.js

@@ -0,0 +1,6 @@
+import request from '@/utils/request'
+export const wfqd_list = (data = {}) =>
+    request({
+        url: '/jdbg/wjsj_wjgzt/index',
+        data,
+    })

src/views/wjsj/wtjd/index.vue

@@ -35,32 +35,35 @@
           width="auto"
       >
         <template slot-scope="scope">
-          <a href="javascript:;" @click="toDetail(scope.row.id)" class="text-normal">{{scope.row.title}}</a>
+          <a href="javascript:;" @click="toDetail(scope.row.wwj_id)" class="text-normal">{{scope.row.wwj_title}}</a>
         </template>
       </el-table-column>
       <el-table-column
           label="发起人"
           width="100"
-          prop="fqr"
+          prop="wwj_fqr"
       ></el-table-column>
       <el-table-column
           label="截止日期"
           width="150"
-          prop="jzrq"
+          prop="www_jzsj"
       ></el-table-column>
       <el-table-column
           label="状态"
           width="100">
         <template slot-scope="scope">
-          <span>{{scope.row.ztmc}}</span>
+          <span v-if="scope.row.wwj_zt == 0">进行中</span>
+          <span v-if="scope.row.wwj_zt == 1" class="text-orange">即将超期</span>
+          <span v-if="scope.row.wwj_zt == 2" class="text-red">已过期</span>
         </template>
       </el-table-column>
       <el-table-column
           label="进度"
           width="100">
         <template slot-scope="scope">
-         <span v-if="scope.row.zt == 2" class="color-2">{{scope.row.jd}}</span>
-          <span v-else>{{scope.row.jd}}</span>
+          <span v-if="scope.row.wwj_zt == 0">待提交</span>
+          <span v-if="scope.row.wwj_zt == 1" class="text-orange">已提交</span>
+          <span v-if="scope.row.wwj_zt == 2" class="text-red">已过期</span>
         </template>
       </el-table-column>
     </el-table>
@@ -81,6 +84,7 @@
 </template>
 
 <script>
+import {wfqd_list} from "./api";
 export default {
   name: "index",
   data() {
@@ -100,99 +104,30 @@ export default {
         value: '3'
       }],
       time:'',
-      tableData:[{
-        id:'1',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'2',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'3',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'4',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'5',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'6',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'7',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'8',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'9',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      },{
-        id:'10',
-        title:'其好长从革调清王参通比报实才下在之月王',
-        fqr:'周桂英',
-        jzrq:'2021/07/22',
-        zt:'2',
-        ztmc:'进行中',
-        jd:'待提交'
-      }],
+      tableData:[],
       limit:10,
-      total:12,
+      total:0,
       cur_page: 1
     }
   },
   methods:{
+    getListData() {
+      let data = {}
+      wfqd_list(data).then(res => {
+        this.tableData = res.data.page_data;
+        this.cur_page = Number(res.data.page_now);
+        this.total = Number(res.data.total_rows);
+      })
+    },
     handleCurrentChange(val) {
       this.cur_page = val;
     },
     toDetail(id) {
       this.$router.push({ name: 'wjsj_wtjd_wjxq', params: { id: id } })
     }
+  },
+  mounted() {
+    this.getListData();
   }
 }
 </script>