修改bug

src/api/phone/grid.js

@@ -1,6 +1,12 @@
 import request from '@/utils/request'
 
 
+export function listGrid() {
+  return request({
+    url: '/phone/grid/list',
+    method: 'get'
+  })
+}
 
 // 查询手机柜格子详细
 export function getGrid(id) {

src/permission.js

@@ -10,12 +10,8 @@ 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()
   let getTOken = getToken()
-  console.log('beforeEach getTOken', getTOken)
   if (getTOken) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
@@ -23,13 +19,10 @@ router.beforeEach((to, from, next) => {
       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((res) => {
-          console.log('beforeEach res', res)
           store.dispatch('GenerateRoutes').then(accessRoutes => {
-            console.log('GenerateRoutes accessRoutes', accessRoutes)
             // 根据roles权限生成可访问的路由表
             // accessRoutes = [{
             //   // hidden: true,
@@ -40,7 +33,7 @@ router.beforeEach((to, from, next) => {
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
-          console.log('beforeEach err', err)
+          // console.log('beforeEach err', err)
             store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
@@ -51,7 +44,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    console.log('whiteList', whiteList)
+    // console.log('whiteList', whiteList)
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入

src/router/index.js

@@ -106,37 +106,37 @@ export const constantRoutes = [
   //   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: '/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
+  },
   //
   // // 战备值班
   // {
@@ -249,8 +249,8 @@ export const constantRoutes = [
   //   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/thebusAccessLog/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),
@@ -272,20 +272,7 @@ export const constantRoutes = [
   //   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),

src/views/bdglSecret/secretaccount/index.vue

@@ -495,7 +495,7 @@ export default {
     },
     // 获取主持人
     getZhuChi(id) {
-      console.log(id);
+      console.log("获取主持人", id);
       getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });

src/views/combatduty/RateOfTen/index.vue

@@ -694,7 +694,7 @@ export default {
       console.log(1111)
       this.open1 = true;
       this.form1.zbky = this.zbky;
-      
+
       this.form1 = this.zhuangbei;
       console.log(this.form1)
       addzbwl().then((res) => {

src/views/combatduty/grassdutyinfo/index.vue

@@ -632,6 +632,7 @@ export default {
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {
+        console.log("获取登录信息", response)
         this.deptId = response.data.dept.deptId;
         this.danWie = response.data.dept.deptName;
       });
@@ -763,6 +764,8 @@ export default {
       this.qdflg = 1;
       this.form.unitName = this.danWie;
       this.form.unitId = this.deptId;
+      console.log("添加基层值班 this.form.unitId", this.form.unitId);
+      console.log("添加基层值班 this.form.unitName", this.form.unitName);
       this.getrylist(this.form.unitId);
     },
     /** 修改按钮操作 */

src/views/combatduty/militarydutyinfo/index.vue

@@ -327,6 +327,7 @@ export default {
     getBianList() {
       this.buses = [];
       this.buslist = [];
+      console.log("suoYouBus", this.suoYouBus);
       this.suoYouBus.forEach((item, i) => {
         if (this.form.numberPlateIdList.indexOf(item.id) != -1) {
           this.buses.push(item);
@@ -335,6 +336,7 @@ export default {
         }
       });
       this.buslist = this.buses;
+      console.log("buslist", this.buslist);
     },
     // 获取所有车辆
     getQuanBus() {
@@ -783,4 +785,4 @@ export default {
 ::v-deep .tags .el-tag.el-tag--info {
   margin-right: 10px;
 }
-</style>
+</style>

src/views/combatduty/regisdutyinfo/index.vue

@@ -876,4 +876,4 @@ export default {
 ::v-deep .vue-treeselect__single-value {
   color: #fff;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -504,38 +504,32 @@ export default {
       }
     },
     timeDay(val) {
-      var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.recordDate = null;
-            })
-            .catch(() => {
-              this.form.recordDate = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+      if (!val) return;
+
+      // 用户输入的时间戳（秒）
+      const date1 = Math.floor(new Date(val).getTime() / 1000);
+
+      // 获取当月第一天 00:00:00
+      const now = new Date(val);  // 这里用 val 保证选中月份为准
+      const firstDay = new Date(now.getFullYear(), now.getMonth(), 1).getTime() / 1000;
+
+      // 获取当月最后一天 23:59:59
+      const lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59).getTime() / 1000;
+
+      // 判断是否在当月范围内
+      if (this.dayTime === 1 && (date1 < firstDay || date1 > lastDay)) {
+        this.$confirm("请在规定时间内填写", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.form.recordDate = null;
           })
-            .then(() => {
-              this.form.recordDate = null;
-            })
-            .catch(() => {
-              this.form.recordDate = null;
-            });
-        }
-      });
+          .catch(() => {
+            this.form.recordDate = null;
+          });
+      }
     },
     getYear() {
       var myDate = new Date();

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -132,7 +132,6 @@
       <el-table-column label="司务长" align="center" prop="messOfficerName" />
       <el-table-column label="班长" align="center" prop="peopleName" />
       <!-- <el-table-column label="食谱内容" align="center" prop="contents" />
-      
       <el-table-column label="创建时间" align="center" prop="createtime" />
       <el-table-column label="更新时间" align="center" prop="updatetime" /> -->
       <el-table-column
@@ -2096,38 +2095,34 @@ export default {
       }
     },
     timeDay(val) {
-      var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.startTime = null;
-            })
-            .catch(() => {
-              this.form.startTime = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+      if (!val) return;
+
+      // 用户选择的时间戳（秒）
+      const date1 = Math.floor(new Date(val).getTime() / 1000);
+
+      // 当前月份
+      const now = new Date(val);
+
+      // 当月第一天 00:00:00
+      const firstDay = Math.floor(new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0).getTime() / 1000);
+
+      // 当月最后一天 23:59:59
+      const lastDay = Math.floor(new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59).getTime() / 1000);
+
+      // 判断是否在当月范围内
+      if (this.dayTime === 1 && (date1 < firstDay || date1 > lastDay)) {
+        this.$confirm("请在规定时间内填写", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.form.startTime = null;
           })
-            .then(() => {
-              this.form.startTime = null;
-            })
-            .catch(() => {
-              this.form.startTime = null;
-            });
-        }
-      });
+          .catch(() => {
+            this.form.startTime = null;
+          });
+      }
     },
     // //获取部门列表
     getdept() {
@@ -4548,7 +4543,7 @@ table td {
   background: #004d86 !important;
 } */
 /* ::v-deep.el-input_inner ::-webkit-input-placeholder{
-        font-size:16px;  
+        font-size:16px;
         color: rgba(255,255,255,0.1) !important;
 }  */
 
@@ -4565,4 +4560,4 @@ table td {
 #chakan /deep/ .el-dialog__body {
   margin: 10px 0px 20px 64px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -975,38 +975,32 @@ export default {
       }
     },
     timeDay(val) {
-      var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.drillTime = null;
-            })
-            .catch(() => {
-              this.form.drillTime = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
+      if (!val) return;
+
+      // 用户输入的时间戳（秒）
+      const date1 = Math.floor(new Date(val).getTime() / 1000);
+
+      // 获取当月第一天 00:00:00
+      const now = new Date(val);  // 这里用 val 保证选中月份为准
+      const firstDay = new Date(now.getFullYear(), now.getMonth(), 1).getTime() / 1000;
+
+      // 获取当月最后一天 23:59:59
+      const lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59).getTime() / 1000;
+
+      // 判断是否在当月范围内
+      if (this.dayTime === 1 && (date1 < firstDay || date1 > lastDay)) {
+        this.$confirm("请在规定时间内填写", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.form.recordDate = null;
           })
-            .then(() => {
-              this.form.drillTime = null;
-            })
-            .catch(() => {
-              this.form.drillTime = null;
-            });
-        }
-      });
+          .catch(() => {
+            this.form.recordDate = null;
+          });
+      }
     },
     getYear() {
       var myDate = new Date();

src/views/grassrootsregistration/bdglfood/index.vue

@@ -1436,24 +1436,18 @@ export default {
     },
     timeDay(val) {
       var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.recordDate = null;
-            })
-            .catch(() => {
-              this.form.recordDate = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
+
+      // 获取本月第一天 00:00:00
+      var now = new Date();
+      var firstDay = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      var monthStart = Math.round(firstDay.getTime() / 1000);
+
+      // 获取本月最后一天 23:59:59
+      var lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59);
+      var monthEnd = Math.round(lastDay.getTime() / 1000);
+
+      if (this.dayTime == 1) {
+        if (date1 > monthEnd || date1 < monthStart) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -1466,7 +1460,7 @@ export default {
               this.form.recordDate = null;
             });
         }
-      });
+      }
     },
     // 搜索人员触发
     Renyuan() {
@@ -2266,4 +2260,4 @@ table td {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 0px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -468,37 +468,31 @@ export default {
     },
     timeDay(val) {
       var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.equipTime = null;
-            })
-            .catch(() => {
-              this.form.equipTime = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
+
+      // 获取本月第一天 00:00:00
+      var now = new Date();
+      var firstDay = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      var monthStart = Math.round(firstDay.getTime() / 1000);
+
+      // 获取本月最后一天 23:59:59
+      var lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59);
+      var monthEnd = Math.round(lastDay.getTime() / 1000);
+
+      if (this.dayTime == 1) {
+        if (date1 > monthEnd || date1 < monthStart) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
           })
             .then(() => {
-              this.form.equipTime = null;
+              this.form.recordDate = null;
             })
             .catch(() => {
-              this.form.equipTime = null;
+              this.form.recordDate = null;
             });
         }
-      });
+      }
     },
     // 获取当前年
     getYear() {

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -527,37 +527,31 @@ export default {
     },
     timeDay(val) {
       var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.startTime = null;
-            })
-            .catch(() => {
-              this.form.startTime = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
+
+      // 获取本月第一天 00:00:00
+      var now = new Date();
+      var firstDay = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      var monthStart = Math.round(firstDay.getTime() / 1000);
+
+      // 获取本月最后一天 23:59:59
+      var lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59);
+      var monthEnd = Math.round(lastDay.getTime() / 1000);
+
+      if (this.dayTime == 1) {
+        if (date1 > monthEnd || date1 < monthStart) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
           })
             .then(() => {
-              this.form.startTime = null;
+              this.form.recordDate = null;
             })
             .catch(() => {
-              this.form.startTime = null;
+              this.form.recordDate = null;
             });
         }
-      });
+      }
     },
     // 获取当前年
     getYear() {
@@ -952,4 +946,4 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 0px 30px 15px;
 }
-</style>
+</style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -599,37 +599,31 @@ export default {
     },
     timeDay(val) {
       var date1 = Math.round(new Date(val) / 1000);
-      // 当月时间
-      this.current_month.forEach((element) => {
-        // 十号之前是1675987200
-        var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1678406400 && this.dayTime == 1) {
-          this.$confirm("请在规定时间内填写", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.form.convokeTime = null;
-            })
-            .catch(() => {
-              this.form.convokeTime = null;
-            });
-        }
-        if (date1 < 1675180250 && this.dayTime == 1) {
+
+      // 获取本月第一天 00:00:00
+      var now = new Date();
+      var firstDay = new Date(now.getFullYear(), now.getMonth(), 1, 0, 0, 0);
+      var monthStart = Math.round(firstDay.getTime() / 1000);
+
+      // 获取本月最后一天 23:59:59
+      var lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59);
+      var monthEnd = Math.round(lastDay.getTime() / 1000);
+
+      if (this.dayTime == 1) {
+        if (date1 > monthEnd || date1 < monthStart) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
           })
             .then(() => {
-              this.form.convokeTime = null;
+              this.form.recordDate = null;
             })
             .catch(() => {
-              this.form.convokeTime = null;
+              this.form.recordDate = null;
             });
         }
-      });
+      }
     },
     // 翻译
     meetingFormFn(row) {

src/views/medicalhealth/announcement/index.vue

@@ -283,6 +283,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log("this.form", this.form)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -381,4 +382,4 @@ export default {
 ::v-deep .el-input__inner {
   height: 36px !important;
 }
-</style>
+</style>

src/views/medicalhealth/antiepidemicamount/index.vue

@@ -370,13 +370,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateAntiepidemicamount(this.form).then((response) => {
-              this.msgSuccess("修改成功");
+              this.$message.success("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addAntiepidemicamount(this.form).then((response) => {
-              this.msgSuccess("新增成功");
+              this.$message.success("新增成功");
               this.open = false;
               this.getList();
             });
@@ -397,7 +397,7 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.msgSuccess("删除成功");
+          this.$message.success("删除成功");
         })
         .catch(() => {});
     },

src/views/militaryvehicleManagement/thebus/index.vue

@@ -185,10 +185,8 @@
       />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="创建人ID" align="center" prop="adminId" />
-   
       <el-table-column label="修改时间" align="center" prop="updatetime" />
       <el-table-column label="所属单位" align="center" prop="unitId" />
-
       <el-table-column label="ETC品牌" align="center" prop="etcBrand" />
       <el-table-column label="ETC编码" align="center" prop="etcNumber" /> -->
       <el-table-column
@@ -564,6 +562,7 @@ export default {
     getRen(id) {
       getRen(id).then((res) => {
         this.renYuan = res.rows;
+        console.log("人员", res.rows);
       });
     },
     //  获取单位列表
@@ -642,7 +641,6 @@ export default {
       this.title = "添加军车管理";
       this.form.status = "1";
     },
-    
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -919,4 +917,4 @@ export default {
   background: transparent;
   color: #fff;
 }
-</style>
+</style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1751,6 +1751,7 @@ export default {
     // 获取审批模板列表
     getShenPi() {
       listThebusConfig().then((response) => {
+        console.log("获取审批模板列表", response);
         this.shenPi = response.rows;
       });
     },

src/views/peopleChuRu/bdglLeave/index.vue

@@ -1358,7 +1358,6 @@
             placeholder="请输入一级审批人"
             ref="abcdef"
             disabled
-            clearable
           >
             <el-option
               v-for="(item, i) in shenAllRenList"
@@ -1379,7 +1378,6 @@
             placeholder="请输入二级审批人"
             ref="abcde"
             disabled
-            clearable
           >
             <el-option
               v-for="(item, i) in shenAllRenList"
@@ -1698,6 +1696,7 @@ export default {
     getShenRen() {
       getAll().then((res) => {
         this.shenAllRenList = res.rows;
+        console.log("获取所有审批人员", this.shenAllRenList)
       });
     },
     // 审批获取所有单位
@@ -1821,9 +1820,12 @@ export default {
     },
     // 查询请假类型
     getdict() {
+      console.log("字典类型", this.dictType.dictType);
       getDicts(this.dictType.dictType).then((res) => {
-        res.data.splice(0, 1);
+        console.log("res", res);
+        // res.data.splice(0, 1);
         this.ziDian = res.data;
+        console.log("字典数据", this.ziDian);
       });
     },
     // 请假人选中
@@ -2067,6 +2069,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加人员请假";
+      this.getShenRen()
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/peopleManage/people/index.vue

@@ -1103,7 +1103,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      open1: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1339,7 +1338,7 @@ export default {
     this.getDicts("Degree_level").then(response => {
       this.educationId = response.data;
     });
-    //婚姻情况
+    //学位
     this.getDicts("degree").then(response => {
       this.degree = response.data;
     });
@@ -1509,13 +1508,16 @@ export default {
     },
     /** 查看按钮操作 */
     handlesee(row) {
+      console.log("查看",row)
       this.reset();
       const id = row.id || this.ids;
       getPeople(id).then(response => {
+        console.log("response",response)
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         //家庭人员判空处理
-        if (this.form.familyInformation.length > 0) {
+        console.log("this.form.familyInformation",this.form.familyInformation)
+        if (this.form.familyInformation && this.form.familyInformation.length > 0) {
           this.jtlist = response.data.familyInformation;
         } else {
           this.jtlist = [
@@ -1531,6 +1533,8 @@ export default {
         this.open = true;
         this.title = "查看人员管理";
         this.btnflg = false;
+      }).catch(err => {
+        console.error("getPeople请求失败", err);
       });
     },
     /** 修改按钮操作 */

src/views/phone/cabinet/index.vue

@@ -368,7 +368,9 @@ export default {
     },
     /** 查询手机柜列表 */
     getList() {
+      console.log("查询手机柜列表");
       xianPhone().then((res) => {
+        console.log("查询手机柜列表", res);
         this.cabinetList = res.data.infos;
       });
     },

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
 
 const name = process.env.VUE_APP_TITLE || '智能督察管理平台' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 8001 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions