initial commit

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/supervision-ui.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/layout/components/Sidebar/index.vue

@@ -91,36 +91,48 @@ export default {
   methods: {
     a(route, index) {},
     sidebarRoutersfun() {
+      console.log("this.$route.query.name", this.$route.query.name);
       this.sidebarRouters.map(item => {
-        // console.log(this.$route.query.name);
+
         if (item.path == this.$route.query.name) {
+          console.log("item.path", item.path)
+          // console.log("this.routs1", this.routs)
+          // console.log("this.routs1", this.routs)
           // console.log(item);
+          console.log("this.routs1", this.routs)
           this.routs.push(item);
+          console.log("this.routs2", this.routs)
           if (this.$route.name == "Notice") {
             //  this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
             this.$router.push({ path: "/system/notice" });
           } else {
-            if (this.routs[0].children[0].children) {
+            console.log("this.routs[0]", this.routs[0])
+            if (this.routs[0].children && this.routs[0].children[0].children) {
               this.defaultpath = [this.routs[0].children[0].path];
               this.p =
-                this.routs[0].path +
-                "/" +
-                this.routs[0].children[0].path +
-                "/" +
-                this.routs[0].children[0].children[0].path;
-              this.$router.push({ path: this.p });
+                this.routs[0].path
+                + "/" + this.routs[0].children[0].path
+                + "/" + this.routs[0].children[0].children[0].path;
+            } else if (this.routs[0].children) {
+              this.defaultpath = [this.routs[0].path];
+              this.p =
+                this.routs[0].path
+                + "/" + this.routs[0].children[0].path;
             } else {
               this.defaultpath = [this.routs[0].path];
               this.p =
-                this.routs[0].path + "/" + this.routs[0].children[0].path;
-              this.$router.push({ path: this.p });
+                this.routs[0].path
             }
+            console.log("this.p", this.p)
+            this.$router.push({ path: this.p });
           }
         }
         // console.log(this.routs.length)
       });
+      console.log("this.routs", this.routs)
+      console.log(" this.$router",  this.$router)
       if (this.routs.length <= 0) {
-        // window.open(`/pt`, "_self");
+        // window.open(`/phone`, "_self");
         this.$router
           .push({
             name: "pt",

src/permission.js

@@ -10,23 +10,37 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
+  console.log('beforeEach to', to)
+  console.log('beforeEach from', from)
+  // console.log('beforeEach next', next)
   NProgress.start()
-  if (getToken()) {
+  let getTOken = getToken()
+  console.log('beforeEach getTOken', getTOken)
+  if (getTOken) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done()
     } else {
+      console.log('beforeEach store.getters.roles', store.getters.roles)
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
+        store.dispatch('GetInfo').then((res) => {
+          console.log('beforeEach res', res)
           store.dispatch('GenerateRoutes').then(accessRoutes => {
+            console.log('GenerateRoutes accessRoutes', accessRoutes)
             // 根据roles权限生成可访问的路由表
+            // accessRoutes = [{
+            //   // hidden: true,
+            //   path:"/grassrootsregistration"
+            // }]
+            // console.log('GenerateRoutes accessRoutes2', accessRoutes)
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
+          console.log('beforeEach err', err)
             store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
@@ -37,6 +51,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
+    console.log('whiteList', whiteList)
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入

src/router/index.js

@@ -38,42 +38,8 @@ export const constantRoutes = [
   //     }
   //   ]
   // },
-  // 登录页
-  {
-    path: '/login',
-    component: (resolve) => require(['@/views/login'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi',
-    component: (resolve) => require(['@/views/taishi/index'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi1',
-    component: (resolve) => require(['@/views/taishi/tanshi11'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi11',
-    component: (resolve) => require(['@/views/taishi/taishi1'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi2',
-    component: (resolve) => require(['@/views/taishi/taishi2'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi3',
-    component: (resolve) => require(['@/views/taishi/taishi3'], resolve),
-    hidden: true
-  },
-  {
-    path: '/taishi4',
-    component: (resolve) => require(['@/views/taishi/taishi4'], resolve),
-    hidden: true
-  },
+
+
   // 首页区域
   {
     path: '/pt',
@@ -89,11 +55,304 @@ export const constantRoutes = [
       }
     ]
   },
+
+  // 登录页
+  {
+    path: '/login',
+    component: (resolve) => require(['@/views/login'], resolve),
+    hidden: true
+  },
+
+  // 注册页
+  {
+    path: '/register',
+    component: (resolve) => require(['@/views/register'], resolve),
+    hidden: true
+  },
+  //
+  // // 基层登记
+  // {
+  //   path: 'grassrootsregistration',
+  //   // component: (resolve) => require(['@/views/PrintsLog/gerenlog/index'], resolve),
+  //   // component: (resolve) => require(['@/views/PrintsLog/printlog/index'], resolve),
+  //   // component: (resolve) => require(['@/views/PrintsManage/manage/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 集中文印
+  // {
+  //   path: '/print',
+  //   // component: (resolve) => require(['@/views/PrintsLog/gerenlog/index'], resolve),
+  //   // component: (resolve) => require(['@/views/PrintsLog/printlog/index'], resolve),
+  //   component: (resolve) => require(['@/views/PrintsManage/manage/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 工作安排
+  // {
+  //   path: '/workingArrangements',
+  //   // component: (resolve) => require(['@/views/workingArrangements/planTask/index'], resolve),
+  //   // component: (resolve) => require(['@/views/workingArrangements/workCalendar/index'], resolve),
+  //   // component: (resolve) => require(['@/views/workingArrangements/workTask/index'], resolve),
+  //   component: (resolve) => require(['@/views/workingArrangements/worktaskplan/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 规章制度
+  // {
+  //   path: '/regulations',
+  //   component: (resolve) => require(['@/views/regulations/fileinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/regulations/directoryinfo/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 态势分析
+  // {
+  //   path: '/taishi',
+  //   component: (resolve) => require(['@/views/taishi/index'], resolve),
+  //   hidden: true
+  // },
+  // {
+  //   path: '/taishi1',
+  //   component: (resolve) => require(['@/views/taishi/tanshi11'], resolve),
+  //   hidden: true
+  // },
+  // {
+  //   path: '/taishi11',
+  //   component: (resolve) => require(['@/views/taishi/taishi1'], resolve),
+  //   hidden: true
+  // },
   // {
-  //   path: '/register',
-  //   component: (resolve) => require(['@/views/register'], resolve),
+  //   path: '/taishi2',
+  //   component: (resolve) => require(['@/views/taishi/taishi2'], resolve),
   //   hidden: true
   // },
+  // {
+  //   path: '/taishi3',
+  //   component: (resolve) => require(['@/views/taishi/taishi3'], resolve),
+  //   hidden: true
+  // },
+  // {
+  //   path: '/taishi4',
+  //   component: (resolve) => require(['@/views/taishi/taishi4'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 战备值班
+  // {
+  //   path: '/combatduty',
+  //   // component: (resolve) => require(['@/views/combatduty/basedutyinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/grassdutyinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/info/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/militarydutyinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/PeopleStatistics/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/Quantitative/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/RateOfTen/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/regisdutyinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/combatduty/taskdutyinfo/index'], resolve),
+  //   component: (resolve) => require(['@/views/combatduty/teamdutyinfo/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 检查督导
+  // {
+  //   path: '/bdglregular',
+  //   // component: (resolve) => require(['@/views/bdglregular/regularcountinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/bdglregular/regularinfo/index'], resolve),
+  //   // component: (resolve) => require(['@/views/bdglregular/specialcountinfo/index'], resolve),
+  //   component: (resolve) => require(['@/views/bdglregular/specialinfo/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 人员出入
+  // {
+  //   path: '/peopleChuRu',
+  //   // component: (resolve) => require(['@/views/peopleChuRu/bdglLeave/index'], resolve),
+  //   // component: (resolve) => require(['@/views/peopleChuRu/leaveOne/index'], resolve),
+  //   component: (resolve) => require(['@/views/peopleChuRu/peopleBorrow/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 安防监控
+  // {
+  //   path: '/monitoring',
+  //   component: (resolve) => require(['@/views/monitoring/brigadecamera/index'], resolve), // 添加监控信息
+  //   // component: (resolve) => require(['@/views/monitoring/camera/index'], resolve), // 监控大屏预览
+  //   // component: (resolve) => require(['@/views/monitoring/cameracp/index'], resolve), // 添加监控信息
+  //   hidden: true
+  // },
+  //
+  // // 门岗管理
+  // {
+  //   path: '/doormanManage',
+  //   component: (resolve) => require(['@/views/doormanManage/bdglVisit/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 门禁管理
+  // {
+  //   path: '/access',
+  //   // component: (resolve) => require(['@/views/access/accessControl/index'], resolve),
+  //   // component: (resolve) => require(['@/views/access/Renaccess/index'], resolve),
+  //   component: (resolve) => require(['@/views/access/renInformation/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 手机管理
+  // {
+  //   path: '/phone',
+  //   component: (resolve) => require(['@/views/phone/grid/index'], resolve),
+  //   // component: (resolve) => require(['@/views/regulations/directoryinfo/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 思想政治教育
+  // {
+  //   path: '/thought',
+  //   // component: (resolve) => require(['@/views/thought/getready/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/parliament/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/planFujian/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/responsefu/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/responses/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/talk/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/teacher/index'], resolve), // 创建目录
+  //   // component: (resolve) => require(['@/views/thought/teacherFile/index'], resolve),
+  //   component: (resolve) => require(['@/views/thought/thoughtPlan/index'], resolve),
+  //   // component: (resolve) => require(['@/views/thought/weekjob/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 人力资源
+  // {
+  //   path: '/peopleManage',
+  //   // component: (resolve) => require(['@/views/peopleManage/examination/index'], resolve),
+  //   // component: (resolve) => require(['@/views/peopleManage/people/index'], resolve), // 添加用户基本信息
+  //   // component: (resolve) => require(['@/views/peopleManage/PersonnelStatistics/index'], resolve),
+  //   // component: (resolve) => require(['@/views/peopleManage/seconded/index'], resolve),
+  //   // component: (resolve) => require(['@/views/peopleManage/transfer/index'], resolve),
+  //   component: (resolve) => require(['@/views/peopleManage/typestatistics/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 人力资源
+  // {
+  //   path: '/tool',
+  //   // component: (resolve) => require(['@/views/tool/build/index'], resolve),
+  //   component: (resolve) => require(['@/views/tool/gen/index'], resolve),
+  //   // component: (resolve) => require(['@/views/tool/swagger/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 车辆管理
+  // {
+  //   path: '/militaryvehicleManagement',
+  //   component: (resolve) => require(['@/views/militaryvehicleManagement/driver/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/privateAccessLog/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/privateCar/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebus/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/privateAccessLog/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebusApply/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebusConfig/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebusList/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebusSi/index'], resolve),
+  //   // component: (resolve) => require(['@/views/militaryvehicleManagement/thebusThemplate/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 营房管理
+  // {
+  //   path: '/barracksManagement',
+  //   component: (resolve) => require(['@/views/barracksManagement/barracks/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/checkin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/flat/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/flats/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/maintenanceRecord/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/repair/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/scadred/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 营房管理
+  // {
+  //   path: '/barracksManagement',
+  //   component: (resolve) => require(['@/views/barracksManagement/barracks/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/checkin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/flat/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/flats/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/maintenanceRecord/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/repair/index'], resolve),
+  //   // component: (resolve) => require(['@/views/barracksManagement/scadred/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 营房管理
+  // {
+  //   path: '/materialManagement',
+  //   component: (resolve) => require(['@/views/materialManagement/archives/index'], resolve),
+  //   // component: (resolve) => require(['@/views/materialManagement/distribution/index'], resolve),
+  //   // component: (resolve) => require(['@/views/materialManagement/equipmentReceiving/index'], resolve),
+  //   // component: (resolve) => require(['@/views/materialManagement/materialRegistration/index'], resolve),
+  //   // component: (resolve) => require(['@/views/materialManagement/propertyChange/index'], resolve),
+  //   // component: (resolve) => require(['@/views/materialManagement/WarehouseStatistics/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 医疗卫生管理
+  // {
+  //   path: '/medicalhealth',
+  //   component: (resolve) => require(['@/views/medicalhealth/announcement/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicamount/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicarchives/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicguoqi/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemiclingyong/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicputin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicputout/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicruin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/archives/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurgarchives/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurgguoqi/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurglingyong/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurgputin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurgputout/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/bdgldurgruin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/consumeguoqi/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/consumelingyong/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicputin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicputout/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/antiepidemicruin/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/diagnose/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/examine/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/examine2/index'], resolve),
+  //   // component: (resolve) => require(['@/views/medicalhealth/recuperate/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 涉密载体外借
+  // {
+  //   path: '/bdglSecret',
+  //   component: (resolve) => require(['@/views/bdglSecret/secret/index'], resolve),
+  //   // component: (resolve) => require(['@/views/bdglSecret/secretaccount/index'], resolve),
+  //   hidden: true
+  // },
+  //
+  // // 系统管理
+  // {
+  //   path: '/system',
+  //   component: (resolve) => require(['@/views/system/config/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/cookcategory/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/dept/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/diary/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/dict/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/menu/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/notice/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/post/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/role/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/time/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/training/index'], resolve),
+  //   // component: (resolve) => require(['@/views/system/user/index'], resolve),
+  //   hidden: true
+  // },
+
   // 报错区域
   {
     path: '/404',

src/store/modules/permission.js

@@ -29,6 +29,7 @@ const permission = {
       state.topbarRouters = routes.concat(index);
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
+      console.log('SET_SIDEBAR_ROUTERS', routes)
       state.sidebarRouters = routes
     },
   },
@@ -38,10 +39,15 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {
+          console.log('GenerateRoutes res', res)
           const sdata = JSON.parse(JSON.stringify(res.data))
+          console.log('GenerateRoutes sdata', sdata)
           const rdata = JSON.parse(JSON.stringify(res.data))
+          console.log('GenerateRoutes rdata', rdata)
           const sidebarRoutes = filterAsyncRouter(sdata)
+          console.log('GenerateRoutes sidebarRoutes', sidebarRoutes)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+          console.log('GenerateRoutes rewriteRoutes', rewriteRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))

src/views/bdglSecret/secret/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
       <el-form-item label="" prop="unitId">
         <treeselect
           v-model="queryParams.unitId"
@@ -41,9 +36,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -99,90 +92,33 @@
 
     <div class="hezi">
       <div class="tji">涉密物品统计</div>
-      <div
-        style="display: flex; justify-content: space-evenly; padding: 41px 20px"
-      >
-        <div
-          style="
-            width: 173px;
-            display: flex;
-            justify-content: space-evenly;
-            align-items: center;
-          "
-        >
+      <div style="display: flex; justify-content: space-evenly; padding: 41px 20px">
+        <div style="width: 173px; display: flex; justify-content: space-evenly; align-items: center; ">
           <span>移动载体</span>
-          <span
-            ><span style="font-size: 25px; margin-right: 18px">{{
-              tongJiList[3]
-            }}</span
-            >台</span
-          >
+          <span><span style="font-size: 25px; margin-right: 18px">{{ tongJiList[3] }}</span>台</span>
         </div>
-        <div
-          style="
-            width: 173px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-          "
-        >
+        <div style="width: 173px; display: flex; justify-content: space-between; align-items: center;">
           <span>军用手机</span>
-          <span
-            ><span style="font-size: 25px; margin-right: 18px">{{
-              tongJiList[0]
-            }}</span
-            >台</span
-          >
+          <span><span style="font-size: 25px; margin-right: 18px">{{ tongJiList[0] }}</span>台</span>
         </div>
-        <div
-          style="
-            width: 173px;
-            display: flex;
-            justify-content: space-evenly;
-            align-items: center;
-          "
-        >
+        <div style="width: 173px; display: flex; justify-content: space-evenly; align-items: center;">
           <span>电脑</span>
-          <span
-            ><span style="font-size: 25px; margin-right: 18px">{{
-              tongJiList[1]
-            }}</span
-            >台</span
-          >
+          <span><span style="font-size: 25px; margin-right: 18px">{{ tongJiList[1] }}</span>台</span>
         </div>
-        <div
-          style="
-            width: 173px;
-            display: flex;
-            justify-content: space-evenly;
-            align-items: center;
-          "
-        >
+        <div style="width: 173px; display: flex; justify-content: space-evenly; align-items: center;">
           <span>相机</span>
-          <span
-            ><span style="font-size: 25px; margin-right: 18px">{{
-              tongJiList[2]
-            }}</span
-            >台</span
-          >
+          <span><span style="font-size: 25px; margin-right: 18px">{{ tongJiList[2] }}</span>台</span>
         </div>
       </div>
     </div>
 
-    <el-table
-      v-loading="loading"
-      :data="bdglsecrecyList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-      style="width: 100%"
-    >
+    <el-table v-loading="loading" :data="bdglsecrecyList" @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }" style="width: 100%">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
-          <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="分类" align="center" prop="kind">
@@ -194,65 +130,26 @@
       <el-table-column label="编号" align="center" prop="number" width="200" />
       <!-- <el-table-column label="密级" align="center" prop="confidential" /> -->
       <!-- <el-table-column label="使用人" align="center" prop="people1Name" /> -->
-      <el-table-column
-        label="使用单位"
-        align="center"
-        prop="unitId"
-        :formatter="deptIdformatter"
-        width="200"
-      />
+      <el-table-column label="使用单位" align="center" prop="unitId" :formatter="deptIdformatter" width="200"/>
       <el-table-column label="责任人" align="center" prop="peopleName" />
-      <el-table-column
-        label="用途"
-        align="center"
-        show-overflow-tooltip
-        prop="people2Name"
-        width="200"
-      />
-      <el-table-column
-        label="启用时间"
-        align="center"
-        prop="startTime"
-        width="160"
-      >
+      <el-table-column label="用途" align="center" show-overflow-tooltip prop="people2Name" width="200"/>
+      <el-table-column label="启用时间" align="center" prop="startTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="停用时间"
-        align="center"
-        prop="endTime"
-        width="160"
-      >
+      <el-table-column label="停用时间" align="center" prop="endTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="归还时间"
-        align="center"
-        prop="hindOverTime"
-        width="160"
-      >
+      <el-table-column label="归还时间" align="center" prop="hindOverTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.hindOverTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="备注"
-        align="center"
-        show-overflow-tooltip
-        prop="remarks"
-        width="200"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200"
-        fixed="right"
-      >
+      <el-table-column label="备注" align="center" show-overflow-tooltip prop="remarks" width="200"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
         <template slot-scope="scope">
           <!-- <el-button
             size="btk"
@@ -261,20 +158,10 @@
             v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
             ><span class="chakan">查看</span></el-button
           > -->
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['bdglSecret:secret:edit']"
-          >
+          <el-button size="btu" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['bdglSecret:secret:edit']">
             <span class="edit">修改</span>
           </el-button>
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['bdglSecret:secret:remove']"
-          >
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)" v-hasPermi="['bdglSecret:secret:remove']">
             <span class="delete">删除</span>
           </el-button>
         </template>
@@ -290,21 +177,9 @@
     />
 
     <!-- 添加或修改网络/手机/涉密载体登记本对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1016px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
+    <el-dialog :title="title" :visible.sync="open" width="1016px" append-to-body :close-on-click-modal="false">
       <div class="jiben">基本信息</div>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <el-form-item label="使用单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
@@ -657,7 +532,9 @@ export default {
     },
     // 查询电子产品
     getdict() {
+      console.log('this.dictType.dictType', this.dictType.dictType)
       getDicts(this.dictType.dictType).then((res) => {
+        console.log('getdict res', res)
         this.ziDian = res.data;
       });
     },

src/views/grassrootsregistration/bdgleven/index.vue

@@ -1044,7 +1044,7 @@ export default {
 }
 .divbox img {
   width: 700px;
-  height: 500px;
+  /*height: 500px;*/
   border-radius: 10px;
 }
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -14,7 +14,7 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- 
+      <!--
       <el-form-item label="" prop="compereId">
         <el-select
           v-model="queryParams.compereId"
@@ -360,7 +360,7 @@
             class="quill-editor"
             ref="myTextEditor"
             v-model="form.title"
-            style=" height: 150px; width: 920px; 
+            style=" height: 150px; width: 920px;
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
           ></quill-editor>
 
@@ -370,7 +370,7 @@
             class="quill-editor"
             ref="myTextEditor"
             v-model="form.contents"
-            style="height: 150px; width: 920px; 
+            style="height: 150px; width: 920px;
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
           ></quill-editor> -->
         </el-form>
@@ -1258,7 +1258,7 @@ export default {
 }
 .divbox img {
   width: 700px;
-  height: 500px;
+  /*height: 500px;*/
   border-radius: 10px;
 }
 </style>

src/views/grassrootsregistration/bdglparty/index.vue

@@ -1219,7 +1219,7 @@ export default {
 }
 .divbox img {
   width: 700px;
-  height: 500px;
+  /*height: 500px;*/
   border-radius: 10px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -338,7 +338,7 @@
           <quill-editor
             class="quill-editor"
             v-model="form.title"
-            style="height: 150px; width: 920px; 
+            style="height: 150px; width: 920px;
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
           ></quill-editor>
 
@@ -347,7 +347,7 @@
           <!-- <quill-editor
             class="quill-editor"
             v-model="form.contents"
-            style="height: 150px; width: 920px; 
+            style="height: 150px; width: 920px;
            margin-bottom: 60px  margin-left: 0px;  margin-bottom: 55px;"
           ></quill-editor> -->
         </el-form>
@@ -1173,7 +1173,7 @@ export default {
 }
 .divbox img {
   width: 700px;
-  height: 500px;
+  /*height: 500px;*/
   border-radius: 10px;
 }
-</style>
+</style>

src/views/login.vue

@@ -35,7 +35,7 @@
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="medium" type="primary" style="width: 100%"
           @click.native.prevent="handleLogin">
-          <span v-if="!loading">登 录</span>
+          <span v-if="!loading">1登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
         <div style="float: right" v-if="register">
@@ -81,7 +81,7 @@ export default {
       // 验证码开关
       captchaOnOff: true,
       // 注册开关
-      register: false,
+      register: true,
       redirect: undefined,
     };
   },

src/views/pt.vue

@@ -733,6 +733,7 @@ export default {
     this.xianShang();
     this.getTiXing();
     getNone().then(res => {
+      console.log("getNone", res);
       this.str = res.msg;
     });
     noReminder().then(res => {
@@ -758,6 +759,7 @@ export default {
     // 获取提示信息
     getTiXing() {
       remindPrint().then(res => {
+        console.log("getTiXing", res)
         this.opentitel = res.msg;
         if (res.num == 0) {
           this.open6 = false;
@@ -789,19 +791,21 @@ export default {
     },
     // 手机柜线S地址console
     xianShang() {
-      axios
-        // 线上地址
-        .post("http://172.4.5.232:12092/wl/api/getAccessToken", {
-          password: "super123fs456wl",
-          username: "admin"
-        })
-        .then(res => {
-          Cookies.set("accessToken", res.data.accessToken);
-        });
+      // axios
+      //   // 线上地址
+      //   .post("http://172.4.5.232:12092/wl/api/getAccessToken", {
+      //     password: "123456",
+      //     username: "admin"
+      //   })
+      //   .then(res => {
+      //     Cookies.set("accessToken", res.data.accessToken);
+      //   });
+      Cookies.set("accessToken", "res.data.accessToken");
     },
     // 获取登录信息
     getUser() {
       getUserProfile().then(response => {
+        console.log("getUserProfile", response);
         this.user = response.data;
         this.danWie = response.data.dept.deptName;
         this.yongHu = response.data.nickName;