修改进去页面强制刷新

src/layout/components/Navbar.vue

@@ -15,7 +15,7 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="yong_hu">
-      <span>单位 :</span>
+      <span style="color: ">单位 :</span>
       <span class="span" style="padding-left: 4px">{{ danWie }}</span>
       <span>用户名 :</span>
       <span style="padding-left: 4px">{{ yongHu }}</span>

src/views/PrintsManage/manage/index.vue

@@ -221,18 +221,19 @@
               (scope.row.printStatus == 1 &&
                 scope.row.printRoom == 0 &&
                 roles == '15号文印室') ||
-                (scope.row.printStatus == 1 &&
-                  scope.row.printRoom == 1 &&
-                  roles == '19号文印室')
+              (scope.row.printStatus == 1 &&
+                scope.row.printRoom == 1 &&
+                roles == '19号文印室')
             "
             >待打印</span
           >
-          
+
           <span
             style="color: #90da90"
             v-if="
-            scope.row.printStatus == 1 &&
-                (roles != '19号文印室' && roles != '15号文印室' )
+              scope.row.printStatus == 1 &&
+              roles != '19号文印室' &&
+              roles != '15号文印室'
             "
             >打印中</span
           >
@@ -588,7 +589,7 @@ import {
   exportManage,
   printFile,
   listPeople,
-  printCode
+  printCode,
 } from "@/api/PrintsManage/manage";
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
@@ -606,23 +607,23 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 50
+      default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "pdf", "zip"]
+      default: () => ["doc", "xls", "ppt", "pdf", "zip"],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -668,7 +669,7 @@ export default {
         receiveName: null,
         sFile: null,
         printInfo: null,
-        printRoom: null
+        printRoom: null,
       },
       // 表单参数
       form: {},
@@ -677,14 +678,14 @@ export default {
       rules: {
         name: [
           // { required: true, message: "发送文件不能为空", trigger: "click" },
-          { required: true }
+          { required: true },
         ],
         printRoom: [
-          { required: true, message: "打印室不能为空", trigger: "change" }
+          { required: true, message: "打印室不能为空", trigger: "change" },
         ],
         isReturn: [
-          { required: true, message: "是否归还需要选择", trigger: "change" }
-        ]
+          { required: true, message: "是否归还需要选择", trigger: "change" },
+        ],
       },
       //级别
       levelMs: [],
@@ -694,7 +695,7 @@ export default {
       uploadFileUrl:
         process.env.VUE_APP_BASE_API + "/PrintsManage/manage/printFile", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization: "Bearer " + getToken(),
       },
       fileList: [],
       faith: null,
@@ -704,36 +705,36 @@ export default {
       dyopen2: false,
       tableau: null,
       yaoqiuflg: false,
-      roles: ""
+      roles: "",
     };
   },
   created() {
-    this.getList();
     if (Cookies.get("shuaxin") != "true") {
       window.location.reload();
     }
     Cookies.set("shuaxin", "true");
+    this.getList();
     //级别
-    this.getDicts("level").then(response => {
+    this.getDicts("level").then((response) => {
       this.levelMs = response.data;
     });
     //文印室
-    this.getDicts("print_room").then(response => {
+    this.getDicts("print_room").then((response) => {
       this.printRooms = response.data;
     });
     //是否
-    this.getDicts("sys_is").then(response => {
+    this.getDicts("sys_is").then((response) => {
       this.islist = response.data;
     });
   },
-  mounted(){
+  mounted() {
     this.roles = Cookies.get("roles");
   },
   methods: {
     /** 查询集中文印主列表 */
     getList() {
       this.loading = true;
-      listManage(this.queryParams).then(response => {
+      listManage(this.queryParams).then((response) => {
         this.manageList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -773,7 +774,7 @@ export default {
         printNumber: null,
         isPrintTwo: null,
         isPrintColor: null,
-        printRoom: null
+        printRoom: null,
       };
       this.resetForm("form");
     },
@@ -791,7 +792,7 @@ export default {
         statusG: null,
         isPrintTwo: null,
         isPrintColor: null,
-        printRoom: null
+        printRoom: null,
       };
       this.resetForm("dyform");
     },
@@ -807,7 +808,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -823,7 +824,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getManage(id).then(response => {
+      getManage(id).then((response) => {
         this.form = response.data;
         this.form.isPrintColor = response.data.isPrintColor + "";
         this.form.isPrintTwo = response.data.isPrintTwo + "";
@@ -833,16 +834,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateManage(this.form).then(response => {
+            updateManage(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addManage(this.form).then(response => {
+            addManage(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -856,7 +857,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项？")
-        .then(function() {
+        .then(function () {
           return delManage(ids);
         })
         .then(() => {
@@ -874,7 +875,7 @@ export default {
           this.exportLoading = true;
           return exportManage(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -900,7 +901,7 @@ export default {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
           this.form.type = fileExtension;
         }
-        const isTypeOk = this.fileType.some(type => {
+        const isTypeOk = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -975,7 +976,7 @@ export default {
     },
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
@@ -983,14 +984,14 @@ export default {
     },
     //打印提交
     dysubmitForm() {
-      this.$refs["dyform"].validate(valid => {
+      this.$refs["dyform"].validate((valid) => {
         if (valid) {
           if (this.dyform.isReturn == 0) {
             this.dyform.statusG = 1;
           } else {
             this.dyform.statusG = 0;
           }
-          printCode(this.dyform).then(res => {
+          printCode(this.dyform).then((res) => {
             if (res.code == 200) {
               console.log(res);
               this.dyopen = false;
@@ -1008,8 +1009,8 @@ export default {
 
       // open.location.href="http://192.168.5.188:8080/priofile/print/202203211244.docx";
       // window.open( `https://view.officeapps.live.com/op/view.aspx?src=http://192.168.5.188:8080/profile/print/202203211428.docx`, "_blank");
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/bdglregular/regularcountinfo/index.vue

@@ -116,7 +116,7 @@ import {
   pendingacceptance,
   completeproportion,
   unitproportion,
-  getRegularinfo
+  getRegularinfo,
 } from "@/api/bdglregular/regularcountinfo";
 import * as echarts from "echarts";
 import Cookies from "js-cookie";
@@ -125,16 +125,16 @@ export default {
     return {
       peopleList: [],
       peopleList2: [],
-      peopleList3: []
+      peopleList3: [],
     };
   },
   created() {
-    this.getlist();
-    this.getlist2();
     if (Cookies.get("shuaxin") != "true") {
       window.location.reload();
     }
     Cookies.set("shuaxin", "true");
+    this.getlist();
+    this.getlist2();
   },
   mounted() {
     this.getlist3();
@@ -142,21 +142,21 @@ export default {
   },
   methods: {
     getlist() {
-      unitrank().then(res => {
+      unitrank().then((res) => {
         if (res.code == 200) {
           this.peopleList = res.data;
         }
       });
     },
     getlist2() {
-      pendingacceptance().then(res => {
+      pendingacceptance().then((res) => {
         if (res.code == 200) {
           this.peopleList2 = res.data;
         }
       });
     },
     getlist3() {
-      completeproportion().then(res => {
+      completeproportion().then((res) => {
         if (res.code == 200) {
           var myChart = echarts.init(
             document.getElementById("foot-left-content")
@@ -165,11 +165,11 @@ export default {
             title: {
               text: "",
               subtext: "",
-              left: ""
+              left: "",
             },
             tooltip: {
               trigger: "item",
-              formatter: "{a} <br/>{b} : {c} ({d}%)"
+              formatter: "{a} <br/>{b} : {c} ({d}%)",
             },
             color: ["#5470c6", "#fac858", "#ee6666", "#91cc75"],
             legend: {
@@ -178,9 +178,9 @@ export default {
               top: "10%",
               itemGap: 20,
               textStyle: {
-                color: "#fff"
+                color: "#fff",
               },
-              data: ["待处理", "待验收", "未通过", "已通过"]
+              data: ["待处理", "待验收", "未通过", "已通过"],
             },
             series: [
               {
@@ -195,9 +195,9 @@ export default {
                     textStyle: {
                       fontWeight: 300,
                       fontSize: 16,
-                      color: "#fff"
-                    }
-                  }
+                      color: "#fff",
+                    },
+                  },
                 },
                 data: [
                   {
@@ -205,42 +205,42 @@ export default {
                       res.data[0].daiyanshou == 0
                         ? null
                         : res.data[0].daiyanshou,
-                    name: "待验收"
+                    name: "待验收",
                   },
                   {
                     value:
                       res.data[0].daichuli == 0 ? null : res.data[0].daichuli,
-                    name: "待处理"
+                    name: "待处理",
                   },
                   {
                     value:
                       res.data[0].weitongguo == 0
                         ? null
                         : res.data[0].weitongguo,
-                    name: "未通过"
+                    name: "未通过",
                   },
                   {
                     value:
                       res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
-                    name: "已通过"
-                  }
+                    name: "已通过",
+                  },
                 ],
                 emphasis: {
                   itemStyle: {
                     shadowBlur: 10,
                     shadowOffsetX: 0,
-                    shadowColor: "rgba(0, 0, 0, 0.5)"
-                  }
+                    shadowColor: "rgba(0, 0, 0, 0.5)",
+                  },
                 },
                 itemStyle: {
                   normal: {
                     //饼状图阴影，值越大阴影亮度越高
                     shadowBlur: 5,
-                    shadowColor: "#93DDFF"
-                  }
-                }
-              }
-            ]
+                    shadowColor: "#93DDFF",
+                  },
+                },
+              },
+            ],
           };
           if (
             res.data[0].daiyanshou == 0 &&
@@ -250,7 +250,7 @@ export default {
           ) {
             option.color = ["#255F8A"];
             option.tooltip = {
-              show: false
+              show: false,
             };
             option.series[0].data = [{ value: 0, name: "无" }];
           }
@@ -260,7 +260,7 @@ export default {
     },
     getlist4() {},
     echarfun() {
-      unitproportion().then(res => {
+      unitproportion().then((res) => {
         if (res.code == 200) {
           this.peopleList3 = res.data;
           console.log(res.data);
@@ -279,13 +279,13 @@ export default {
                   color: "#ffff",
                   // fontSize: 12,
                   fontStyle: "normal",
-                  fontWeight: "normal"
-                }
+                  fontWeight: "normal",
+                },
               },
               color: ["#5470c6", "#fac858", "#ee6666", "#91cc75"],
               tooltip: {
                 trigger: "item",
-                formatter: "{a} <br/>{b} : {c} ({d}%)"
+                formatter: "{a} <br/>{b} : {c} ({d}%)",
               },
               // legend: {
               //   orient: "vertical",
@@ -311,9 +311,9 @@ export default {
                       textStyle: {
                         fontWeight: 300,
                         fontSize: 16,
-                        color: "#fff"
-                      }
-                    }
+                        color: "#fff",
+                      },
+                    },
                   },
                   data: [
                     {
@@ -322,7 +322,7 @@ export default {
                           ? null
                           : this.peopleList3[i].daiyanshou,
                       name: "待验收",
-                      id: this.peopleList3[i].deptId
+                      id: this.peopleList3[i].deptId,
                     },
                     {
                       value:
@@ -330,7 +330,7 @@ export default {
                           ? null
                           : this.peopleList3[i].daichuli,
                       name: "待处理",
-                      id: this.peopleList3[i].deptId
+                      id: this.peopleList3[i].deptId,
                     },
                     {
                       value:
@@ -338,7 +338,7 @@ export default {
                           ? null
                           : this.peopleList3[i].weitongguo,
                       name: "未通过",
-                      id: this.peopleList3[i].deptId
+                      id: this.peopleList3[i].deptId,
                     },
                     {
                       value:
@@ -346,25 +346,25 @@ export default {
                           ? null
                           : this.peopleList3[i].yitongguo,
                       name: "已通过",
-                      id: this.peopleList3[i].deptId
-                    }
+                      id: this.peopleList3[i].deptId,
+                    },
                   ],
                   emphasis: {
                     itemStyle: {
                       shadowBlur: 10,
                       shadowOffsetX: 0,
-                      shadowColor: "rgba(0, 0, 0, 0.5)"
-                    }
+                      shadowColor: "rgba(0, 0, 0, 0.5)",
+                    },
                   },
                   itemStyle: {
                     normal: {
                       //饼状图阴影，值越大阴影亮度越高
                       shadowBlur: 5,
-                      shadowColor: "#93DDFF"
-                    }
-                  }
-                }
-              ]
+                      shadowColor: "#93DDFF",
+                    },
+                  },
+                },
+              ],
             };
             if (
               this.peopleList3[i].daiyanshou == 0 &&
@@ -374,7 +374,7 @@ export default {
             ) {
               option.color = ["#255F8A"];
               option.tooltip = {
-                show: false
+                show: false,
               };
               option.series[0].data = [{ value: 0, name: "无" }];
             }
@@ -390,7 +390,7 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: { id: row.inspectedUnitId }
+          query: { id: row.inspectedUnitId },
         })
         .catch(() => {});
     },
@@ -400,11 +400,11 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: { obj: param.data }
+          query: { obj: param.data },
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/combatduty/RateOfTen/index.vue

@@ -592,7 +592,7 @@ import {
   getzbky,
   // 获取装备五率接口
   addzbwl,
-  getliulian
+  getliulian,
 } from "@/api/combatduty/ReteOfTen";
 import Cookies from "js-cookie";
 export default {
@@ -611,24 +611,26 @@ export default {
       // 表单校验
       rules: {
         bzrs: [
-          { required: true, message: "编制人数不能为空", trigger: "blur" }
+          { required: true, message: "编制人数不能为空", trigger: "blur" },
         ],
         zbbz: [
-          { required: true, message: "装备编制不能为空", trigger: "blur" }
+          { required: true, message: "装备编制不能为空", trigger: "blur" },
         ],
         zbsy: [
-          { required: true, message: "装备实有不能为空", trigger: "blur" }
+          { required: true, message: "装备实有不能为空", trigger: "blur" },
         ],
         sjpt: [
-          { required: true, message: "实际配套不能为空", trigger: "blur" }
+          { required: true, message: "实际配套不能为空", trigger: "blur" },
         ],
         bzpt: [
-          { required: true, message: "编制配套不能为空", trigger: "blur" }
+          { required: true, message: "编制配套不能为空", trigger: "blur" },
         ],
         zbcd: [
-          { required: true, message: "战术储备不能为空", trigger: "blur" }
+          { required: true, message: "战术储备不能为空", trigger: "blur" },
+        ],
+        cczb: [
+          { required: true, message: "存储标准不能为空", trigger: "blur" },
         ],
-        cczb: [{ required: true, message: "存储标准不能为空", trigger: "blur" }]
       },
       zaiweirenshu: 0,
       chudongrenshu: 0,
@@ -643,15 +645,11 @@ export default {
       // 六量加载
       loading3: false,
       zhuangbei: [],
-      zbky: ""
+      zbky: "",
     };
   },
   mounted() {
-    if (Cookies.get("shuaxin") != "true") {
-      window.location.reload();
-    }
-    Cookies.set("shuaxin", "true");
-    getReteOfTen().then(res => {
+    getReteOfTen().then((res) => {
       // console.log(res)
       this.loading1 = true;
       this.form = res.rows[0];
@@ -661,15 +659,19 @@ export default {
     this.getZbwl();
   },
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getLiuliang();
-    getzbky().then(res => {
+    getzbky().then((res) => {
       this.zbky = res.msg;
       console.log(this.zbky);
     });
   },
   methods: {
     getZbwl() {
-      getzbwl().then(res => {
+      getzbwl().then((res) => {
         this.loading2 = true;
         this.form1 = {};
         this.zhuangbei = res.rows[0];
@@ -680,7 +682,7 @@ export default {
     },
     getLiuliang() {
       this.loading3 = true;
-      getliuliang().then(res => {
+      getliuliang().then((res) => {
         this.form2 = {};
         this.sixnum = res.rows[0];
         this.loading3 = false;
@@ -696,23 +698,23 @@ export default {
       this.form1.zbky = this.zbky;
       this.form1 = this.zhuangbei;
       console.log(this.form1);
-      addzbwl().then(res => {
+      addzbwl().then((res) => {
         this.form1 = res.rows[0];
       });
     },
     editor3() {
       this.open2 = true;
       this.form2 = this.sixnum;
-      getliulian().then(res => {
+      getliulian().then((res) => {
         this.form2 = res.rows[0];
       });
     },
     // 编辑人员五率确定
     submitForm() {
       console.log(this.form);
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          updatewulv(this.form).then(response => {
+          updatewulv(this.form).then((response) => {
             this.form = this.form;
             this.$modal.msgSuccess("上传成功");
             this.open = false;
@@ -723,11 +725,11 @@ export default {
     },
     // 编辑装备五率确定
     submitForm1() {
-      this.$refs["form1"].validate(valid => {
+      this.$refs["form1"].validate((valid) => {
         this.form.zbky = 0;
         if (valid) {
           // 添加装备五率的接口
-          updatezbwl(this.form1).then(response => {
+          updatezbwl(this.form1).then((response) => {
             this.$modal.msgSuccess("上传成功");
             this.open1 = false;
             // 调用装备五率列表接口
@@ -738,9 +740,9 @@ export default {
     },
     // 编辑六量确定
     submitForm2() {
-      this.$refs["form2"].validate(valid => {
+      this.$refs["form2"].validate((valid) => {
         if (valid) {
-          updateliuliang(this.form2).then(response => {
+          updateliuliang(this.form2).then((response) => {
             this.$modal.msgSuccess("上传成功");
             this.open2 = false;
             this.getLiuliang();
@@ -802,11 +804,11 @@ export default {
       var data = [
         {
           value: this.form.bzrs,
-          name: "实际人数"
+          name: "实际人数",
         },
         {
-          value: this.form.sjrs
-        }
+          value: this.form.sjrs,
+        },
       ];
       data[1].value = this.form.sjrs - data[0].value;
       let data11 = this.form.sjrs;
@@ -814,7 +816,7 @@ export default {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               "编制人数" +
               "(" +
@@ -828,7 +830,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.9 ) ",
-          borderColor: "#fff"
+          borderColor: "#fff",
         },
         color: ["#F2AC72", "#144d72"],
         series: [
@@ -848,9 +850,9 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 // console.log(data[1].value)
                 // 设置满编率
                 // var n = data[0].value / (data[1].value + data[0].value);
@@ -867,14 +869,14 @@ export default {
                     `{name|满编率}`;
                   return s;
                 }
-              }
+              },
             },
             normal: {
               label: {
                 show: true,
-                formatter: "{b} : {c} ({d}%)"
+                formatter: "{b} : {c} ({d}%)",
               },
-              labelLine: { show: true }
+              labelLine: { show: true },
             },
             // 样式
             // itemStyle: {
@@ -891,20 +893,20 @@ export default {
             labelLine: {
               // show: true,
             },
-            data: data
-          }
-        ]
+            data: data,
+          },
+        ],
       };
       // 在位率
       var data2 = [
         {
           value: this.form.zwrs,
-          name: "在位人数"
+          name: "在位人数",
         },
         {
           value: this.form.zwrs,
-          name: "未在位人数"
-        }
+          name: "未在位人数",
+        },
       ];
       data2[1].value = this.form.bzrs - data2[0].value;
       let data22 = this.form.zwrs;
@@ -912,96 +914,96 @@ export default {
       var data3 = [
         {
           value: this.form.dkrs,
-          name: "指挥员/参谋员/专业技术人员/主战专业军士实际专业对口"
+          name: "指挥员/参谋员/专业技术人员/主战专业军士实际专业对口",
         },
         {
           value: this.form.dkrs,
-          name: "实际人数"
-        }
+          name: "实际人数",
+        },
       ];
       data3[1].value = this.form.sjrs - data3[0].value;
       // console.log(data3[1].value)
       var data4 = [
         {
           value: this.form.cdrs,
-          name: "出动人数"
+          name: "出动人数",
         },
         {
           value: this.form.cdrs,
-          name: "未出动率"
-        }
+          name: "未出动率",
+        },
       ];
       data4[1].value = this.form.bzrs - data4[0].value;
       let data44 = this.form.cdrs;
       var data5 = [
         {
           value: 5,
-          name: "军事训练成绩达到合格人数"
+          name: "军事训练成绩达到合格人数",
         },
         {
           value: 200,
-          name: "未合格人数"
-        }
+          name: "未合格人数",
+        },
       ];
       data5[1].value = this.form.zwrs - data5[0].value;
       let data55 = this.form.zwrs;
       var data6 = [
         {
           value: this.zhuangbei.zbsy,
-          name: "按编配配备的装备实力数"
+          name: "按编配配备的装备实力数",
         },
         {
           value: 200,
-          name: "未配备人数"
-        }
+          name: "未配备人数",
+        },
       ];
       data6[1].value = this.zhuangbei.zbbz - data6[0].value;
 
       var data7 = [
         {
           value: this.zhuangbei.zbky,
-          name: "装备可用数"
+          name: "装备可用数",
         },
         {
           value: 200,
-          name: "装备不可用数"
-        }
+          name: "装备不可用数",
+        },
       ];
       data7[1].value = this.zhuangbei.zbsy - this.zhuangbei.zbky;
 
       var data8 = [
         {
           value: this.zhuangbei.sjpt,
-          name: "装备实际配套数"
+          name: "装备实际配套数",
         },
         {
           value: 200,
-          name: "装备未配套数"
-        }
+          name: "装备未配套数",
+        },
       ];
       data8[1].value = this.zhuangbei.bzpt - data8[0].value;
 
       var data9 = [
         {
           value: this.zhuangbei.cczb,
-          name: "建制单位达到战备战备储存标准的装备数量"
+          name: "建制单位达到战备战备储存标准的装备数量",
         },
         {
           value: 200,
-          name: "未达标"
-        }
+          name: "未达标",
+        },
       ];
       data9[1].value = this.zhuangbei.zbsy - data9[0].value;
 
       var data10 = [
         {
           value: this.zhuangbei.zbcd,
-          name: "装备出动数"
+          name: "装备出动数",
         },
         {
           value: 200,
-          name: "装备未出动数"
-        }
+          name: "装备未出动数",
+        },
       ];
       data10[1].value = this.zhuangbei.zbbz - data10[0].value;
 
@@ -1009,7 +1011,7 @@ export default {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data2[0].name +
               "(" +
@@ -1023,7 +1025,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#27A1F8", "#144d72"],
         series: [
@@ -1041,9 +1043,9 @@ export default {
               // borderWidth: 5, borderRadius: 5, // padding: [0, 86], height: 70, fontSize: 20, show: true,
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 // if(_this.form.bzrs-_this.form.zwrs<=0){
                 //   // console.log(1)
                 //   data2[1].value=9
@@ -1071,21 +1073,21 @@ export default {
                     return s;
                   }
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
             //   borderWidth: 10,
             // },
-            data: data2
-          }
-        ]
+            data: data2,
+          },
+        ],
       };
       var option3 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             if (data3[0].name.length > 20) {
               return (
                 data3[0].name.slice(0, 20) +
@@ -1115,7 +1117,7 @@ export default {
             }
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#FAC858", "#144d72"],
         series: [
@@ -1133,9 +1135,9 @@ export default {
               // borderWidth: 5, borderRadius: 5, // padding: [0, 86], height: 70, fontSize: 20, show: true,
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 if (_this.form.dkrs == 0 || _this.form.sjrs == 0) {
                   var s =
                     `{value|${(0).toFixed()}%}` + "\n" + "\n" + `{name|对口率}`;
@@ -1149,21 +1151,21 @@ export default {
                     `{name|对口率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
             //   borderWidth: 10,
             // },
-            data: data3
-          }
-        ]
+            data: data3,
+          },
+        ],
       };
       var option4 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data4[0].name +
               "(" +
@@ -1177,7 +1179,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#05D5E9", "#144d72"],
         series: [
@@ -1193,14 +1195,12 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if (_this.form.cdrs == 0 || _this.form.bzrs==0) {
-                  var s = `{value|${(0).toFixed()}%}` +
-                    "\n" +
-                    "\n" +
-                    `{name|出动率}`;
+                if (_this.form.cdrs == 0 || _this.form.bzrs == 0) {
+                  var s =
+                    `{value|${(0).toFixed()}%}` + "\n" + "\n" + `{name|出动率}`;
                   return s;
                 } else {
                   var n = _this.form.cdrs / _this.form.bzrs;
@@ -1211,21 +1211,21 @@ export default {
                     `{name|出动率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
             //   borderWidth: 10,
             // },
-            data: data4
-          }
-        ]
+            data: data4,
+          },
+        ],
       };
       var option5 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data5[0].name +
               "(" +
@@ -1239,7 +1239,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#11F0A0 ", "#144d72"],
         series: [
@@ -1257,9 +1257,9 @@ export default {
               // borderWidth: 5, borderRadius: 5, // padding: [0, 86], height: 70, fontSize: 20, show: true,
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 if (data5[0].value == 0 || _this.form.zwrs == 0) {
                   var s =
                     `{value|${(0).toFixed()}%}` + "\n" + "\n" + `{name|称职率}`;
@@ -1273,21 +1273,21 @@ export default {
                     `{name|称职率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
             //   borderWidth: 10,
             // },
-            data: data5
-          }
-        ]
+            data: data5,
+          },
+        ],
       };
       var option6 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data6[0].name +
               "(" +
@@ -1301,7 +1301,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#F2AC72", "#144d72"],
         series: [
@@ -1317,9 +1317,9 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 if (_this.zhuangbei.zbsy == 0 || _this.zhuangbei.zbbz == 0) {
                   var s =
                     `{value|${(0).toFixed()}%}` +
@@ -1336,7 +1336,7 @@ export default {
                     `{name|装备满编率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
@@ -1350,17 +1350,17 @@ export default {
             //   },
             // },
             labelLine: {
-              show: true
+              show: true,
             },
-            data: data6
-          }
-        ]
+            data: data6,
+          },
+        ],
       };
       var option7 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data7[0].name +
               "(" +
@@ -1374,7 +1374,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#27A1F8", "#144d72"],
         series: [
@@ -1390,14 +1390,15 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if (_this.zhuangbei.zbky== 0 || _this.zhuangbei.zbsy==0) {
-                  var s = `{value|${(0).toFixed()}%}` +
-                  "\n" +
-                  "\n" +
-                  `{name|装备可用率}`;
+                if (_this.zhuangbei.zbky == 0 || _this.zhuangbei.zbsy == 0) {
+                  var s =
+                    `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|装备可用率}`;
                   return s;
                 } else {
                   var n = _this.zhuangbei.zbky / _this.zhuangbei.zbsy;
@@ -1408,7 +1409,7 @@ export default {
                     `{name|装备可用率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
@@ -1424,15 +1425,15 @@ export default {
             // labelLine: {
             //   show: true,
             // },
-            data: data7
-          }
-        ]
+            data: data7,
+          },
+        ],
       };
       var option8 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data8[0].name +
               "(" +
@@ -1446,7 +1447,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#FAC858", "#144d72"],
         series: [
@@ -1462,15 +1463,16 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 // var n = data8[0].value / (data8[1].value + data8[0].value);
-                 if (_this.zhuangbei.sjpt== 0 || _this.zhuangbei.bzpt==0) {
-                  var s = `{value|${(0).toFixed()}%}` +
-                  "\n" +
-                  "\n" +
-                  `{name|装备配套率}`;
+                if (_this.zhuangbei.sjpt == 0 || _this.zhuangbei.bzpt == 0) {
+                  var s =
+                    `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|装备配套率}`;
                   return s;
                 } else {
                   var n = _this.zhuangbei.sjpt / _this.zhuangbei.bzpt;
@@ -1481,7 +1483,7 @@ export default {
                     `{name|装备配套率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
@@ -1497,15 +1499,15 @@ export default {
             // labelLine: {
             //   show: true,
             // },
-            data: data8
-          }
-        ]
+            data: data8,
+          },
+        ],
       };
       var option9 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             if (data9[0].name.length > 15) {
               return (
                 data9[0].name.slice(0, 15) +
@@ -1535,7 +1537,7 @@ export default {
             }
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#05D5E9", "#144d72"],
         series: [
@@ -1551,9 +1553,9 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
-              formatter: function(params) {
+              formatter: function (params) {
                 if (_this.zhuangbei.cczb == 0 || _this.zhuangbei.zbsy == 0) {
                   var s =
                     `{value|${(0).toFixed()}%}` +
@@ -1570,7 +1572,7 @@ export default {
                     `{name|装备战备储存率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
@@ -1586,15 +1588,15 @@ export default {
             // labelLine: {
             //   show: true,
             // },
-            data: data9
-          }
-        ]
+            data: data9,
+          },
+        ],
       };
       var option10 = {
         tooltip: {
           trigger: "item",
           position: ["10%", "50%"],
-          formatter: function(params) {
+          formatter: function (params) {
             return (
               data10[0].name +
               "(" +
@@ -1608,7 +1610,7 @@ export default {
             );
           },
           backgroundColor: "rgba(32, 99, 200,0.8 )",
-          borderColor: "#17F765"
+          borderColor: "#17F765",
         },
         color: ["#11F0A0", "#144d72"],
         series: [
@@ -1624,14 +1626,15 @@ export default {
               position: "center",
               rich: {
                 value: { fontSize: 28, color: "#fff" },
-                name: { color: "#fff", fontSize: 14 }
+                name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                   if (_this.zhuangbei.zbcd== 0 || _this.form.zbbz==0) {
-                  var s = `{value|${(0).toFixed()}%}`+
-                  "\n" +
-                  "\n" +
-                  `{name|装备出动率}`;
+                if (_this.zhuangbei.zbcd == 0 || _this.form.zbbz == 0) {
+                  var s =
+                    `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|装备出动率}`;
                   return s;
                 } else {
                   var n = data10[0].value / (data10[1].value + data10[0].value);
@@ -1642,7 +1645,7 @@ export default {
                     `{name|装备出动率}`;
                   return s;
                 }
-              }
+              },
             },
             // itemStyle: {
             //   borderRadius: 2,
@@ -1658,73 +1661,73 @@ export default {
             // labelLine: {
             //   show: true,
             // },
-            data: data10
-          }
-        ]
+            data: data10,
+          },
+        ],
       };
 
       myChart1.setOption(option);
       myChart1.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart2.setOption(option2);
       myChart2.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart3.setOption(option3);
       myChart3.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart4.setOption(option4);
       myChart4.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart5.setOption(option5);
       myChart5.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart6.setOption(option6);
       myChart6.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart7.setOption(option7);
       myChart7.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart8.setOption(option8);
       myChart8.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart9.setOption(option9);
       myChart9.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
       myChart10.setOption(option10);
       myChart10.dispatchAction({
         type: "highlight",
         seriesIndex: 0,
-        dataIndex: 0
+        dataIndex: 0,
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1066,6 +1066,10 @@ export default {
   //   this.changeColor();
   // },
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getList();
     // 获取单位
     this.getDept();
@@ -1075,10 +1079,6 @@ export default {
     this.treeselect();
     // 获取数据
     this.getShuJu();
-    if (Cookies.get("shuaxin") != "true") {
-      window.location.reload();
-    }
-    Cookies.set("shuaxin", "true");
   },
   methods: {
     // 点击数据盒子

src/views/peopleChuRu/leaveOne/index.vue

@@ -725,12 +725,12 @@ import {
   addLeaveOne,
   updateLeaveOne,
   exportLeaveOne,
-  getDept2
+  getDept2,
 } from "@/api/peopleChuRu/leaveOne";
 import {
   getUser,
   getDept,
-  getQuanBu
+  getQuanBu,
 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -740,7 +740,7 @@ import Cookies from "js-cookie";
 export default {
   name: "LeaveOne",
   components: {
-    Treeselect
+    Treeselect,
   },
   dicts: ["people_state"],
   data() {
@@ -802,7 +802,7 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null
+        actualreturntime: null,
       },
       // 表单参数
       form: {},
@@ -811,27 +811,27 @@ export default {
       // 树形结构列表
       deptOptions: [],
       renYuan: [],
-      unitlist: []
+      unitlist: [],
     };
   },
   created() {
-    this.getList();
-    // 获取单位树形
-    this.getBuMeng();
     if (Cookies.get("shuaxin") != "true") {
       window.location.reload();
     }
     Cookies.set("shuaxin", "true");
+    this.getList();
+    // 获取单位树形
+    this.getBuMeng();
   },
   mounted() {
-    getDept2().then(res => {
+    getDept2().then((res) => {
       this.unitlist = res.data;
     });
   },
   methods: {
     unit3Format(row, column) {
       var deptName = "";
-      this.unitlist.map(item => {
+      this.unitlist.map((item) => {
         if (item.deptId == row.unitId) {
           deptName = item.deptName;
         }
@@ -841,7 +841,7 @@ export default {
     },
     // 获取部门列表
     getBuMeng() {
-      getDept().then(res => {
+      getDept().then((res) => {
         this.deptOptions = res.data;
       });
     },
@@ -862,13 +862,13 @@ export default {
     },
     // 获取用户列表
     getYong(id) {
-      getUser(id).then(res => {
+      getUser(id).then((res) => {
         this.yongHu = res.data;
       });
     },
     // 获取人员
     getRen(id, num) {
-      getQuanBu(id, num).then(response => {
+      getQuanBu(id, num).then((response) => {
         this.renYuan = response.data;
       });
     },
@@ -887,7 +887,7 @@ export default {
     /** 查询人员请假列表 */
     getList() {
       this.loading = true;
-      listLeaveOne(this.queryParams).then(response => {
+      listLeaveOne(this.queryParams).then((response) => {
         // 获取单位树形
         this.getBuMeng();
         this.leaveOneList = response.rows;
@@ -937,7 +937,7 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null
+        actualreturntime: null,
       };
       this.resetForm("form");
     },
@@ -953,7 +953,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -969,7 +969,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getLeaveOne(id).then(response => {
+      getLeaveOne(id).then((response) => {
         this.form = response.data;
         // 获取单位树形
         this.getBuMeng();
@@ -980,16 +980,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateLeaveOne(this.form).then(response => {
+            updateLeaveOne(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addLeaveOne(this.form).then(response => {
+            addLeaveOne(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1003,7 +1003,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm('是否确认删除人员请假编号为"' + ids + '"的数据项？')
-        .then(function() {
+        .then(function () {
           return delLeaveOne(ids);
         })
         .then(() => {
@@ -1021,13 +1021,13 @@ export default {
           this.exportLoading = true;
           return exportLeaveOne(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/peopleManage/people/index.vue

@@ -9,7 +9,7 @@
         <div class="tree">
           <el-tree
             class="userAgrees"
-            style="height:700px;overflow:auto;"
+            style="height: 700px; overflow: auto"
             :data="deptOptions"
             :props="defaultProps"
             @node-click="handleNodeClick"
@@ -1262,7 +1262,7 @@ import {
   exportPeople,
   getDept,
   listDept,
-  treeselect
+  treeselect,
 } from "@/api/peopleManage/people";
 import Cookies from "js-cookie";
 
@@ -1282,7 +1282,7 @@ export default {
     "bloodType",
     "sys_yes_no",
     "sys_yes_no",
-    "people_state"
+    "people_state",
   ],
   data() {
     return {
@@ -1373,7 +1373,7 @@ export default {
         userId: null,
         nowMilitaryRank: null,
         treatmentLevel: null,
-        rankUpgradeTime: null
+        rankUpgradeTime: null,
       },
       // 表单参数
       form: {},
@@ -1383,66 +1383,69 @@ export default {
         idcard: [
           { required: true, message: "身份证号不能为空", trigger: "blur" },
           {
-            pattern: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            pattern:
+              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
             message: "请输入正确的身份证号",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         nationId: [
-          { required: true, message: "民族不能为空", trigger: "blur" }
+          { required: true, message: "民族不能为空", trigger: "blur" },
         ],
         sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
         age: [{ required: true, message: "年龄不能为空", trigger: "blur" }],
         birthDate: [
-          { required: true, message: "出生年月不能为空", trigger: "blur" }
+          { required: true, message: "出生年月不能为空", trigger: "blur" },
         ],
         origin: [{ required: true, message: "籍贯不能为空", trigger: "blur" }],
         live: [
-          { required: true, message: "家庭住址不能为空", trigger: "blur" }
+          { required: true, message: "家庭住址不能为空", trigger: "blur" },
         ],
         partyId: [
-          { required: true, message: "政治面貌不能为空", trigger: "change" }
+          { required: true, message: "政治面貌不能为空", trigger: "change" },
         ],
         healthy: [
-          { required: true, message: "健康情况不能为空", trigger: "change" }
+          { required: true, message: "健康情况不能为空", trigger: "change" },
         ],
         marryList: [
-          { required: true, message: "婚姻情况不能为空", trigger: "change" }
+          { required: true, message: "婚姻情况不能为空", trigger: "change" },
         ],
         educationId: [
-          { required: true, message: "学历不能为空", trigger: "change" }
+          { required: true, message: "学历不能为空", trigger: "change" },
         ],
         admissionTime: [
-          { required: true, message: "入学时间不能为空", trigger: "change" }
+          { required: true, message: "入学时间不能为空", trigger: "change" },
         ],
         graduationDate: [
-          { required: true, message: "毕业时间不能为空", trigger: "change" }
+          { required: true, message: "毕业时间不能为空", trigger: "change" },
         ],
         school: [
-          { required: true, message: "毕业学校不能为空", trigger: "blur" }
+          { required: true, message: "毕业学校不能为空", trigger: "blur" },
         ],
         phone: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         phoneStandby: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         enlistDate: [
-          { required: true, message: "入伍时间不能为空", trigger: "change" }
+          { required: true, message: "入伍时间不能为空", trigger: "change" },
         ],
         authorizedStrength: [
-          { required: true, message: "是否编制不能为空", trigger: "change" }
+          { required: true, message: "是否编制不能为空", trigger: "change" },
+        ],
+        deptId: [
+          { required: true, message: "单位不能为空", trigger: "change" },
         ],
-        deptId: [{ required: true, message: "单位不能为空", trigger: "change" }]
         // name: [{ required: true, message: "亲属姓名不能为空", trigger: "blur" }]
         // jtname:[{ validator: jtnameblur, trigger: "blur" }],
         // characterRelationship: [
@@ -1492,16 +1495,16 @@ export default {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null
-        }
+          unitName: null,
+        },
       ],
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       deptOptions: [],
       value: null,
-      btnflg: false
+      btnflg: false,
     };
   },
   created() {
@@ -1511,64 +1514,64 @@ export default {
     Cookies.set("shuaxin", "true");
     this.getList();
     //性别
-    this.getDicts("sys_user_sex").then(response => {
+    this.getDicts("sys_user_sex").then((response) => {
       this.sexList = response.data;
     });
     //血型
-    this.getDicts("bloodType").then(response => {
+    this.getDicts("bloodType").then((response) => {
       this.bloodType = response.data;
     });
     //政治面貌
-    this.getDicts("Caucus").then(response => {
+    this.getDicts("Caucus").then((response) => {
       this.partyIds = response.data;
     });
     //健康情况
-    this.getDicts("healthy").then(response => {
+    this.getDicts("healthy").then((response) => {
       this.healthy = response.data;
     });
     //婚姻情况
-    this.getDicts("marryList").then(response => {
+    this.getDicts("marryList").then((response) => {
       this.marryList = response.data;
     });
     //学历
-    this.getDicts("Degree_level").then(response => {
+    this.getDicts("Degree_level").then((response) => {
       this.educationId = response.data;
     });
     //婚姻情况
-    this.getDicts("degree").then(response => {
+    this.getDicts("degree").then((response) => {
       this.degree = response.data;
     });
     //是否编制
-    this.getDicts("sys_yes_no").then(response => {
+    this.getDicts("sys_yes_no").then((response) => {
       this.authorizedStrength = response.data;
     });
     //子女情况
-    this.getDicts("sys_yw").then(response => {
+    this.getDicts("sys_yw").then((response) => {
       this.childrenList = response.data;
     });
     //人员类别
-    this.getDicts("personnel_type").then(response => {
+    this.getDicts("personnel_type").then((response) => {
       this.classId = response.data;
     });
     //职务层级
-    this.getDicts("post_Level").then(response => {
+    this.getDicts("post_Level").then((response) => {
       this.postIds = response.data;
     });
     //军衔
-    this.getDicts("sys_user_rank").then(response => {
+    this.getDicts("sys_user_rank").then((response) => {
       this.rankIds = response.data;
     });
     //民族
-    this.getDicts("sys_familyName").then(response => {
+    this.getDicts("sys_familyName").then((response) => {
       this.nationIds = response.data;
     });
     //部门数据
-    getDept().then(res => {
+    getDept().then((res) => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
-    treeselect().then(res => {
+    treeselect().then((res) => {
       console.log(res);
       if (res.code == 200) {
         this.deptOptions = res.data;
@@ -1579,7 +1582,7 @@ export default {
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
-      this.unitId.map(item => {
+      this.unitId.map((item) => {
         if (item.deptId == row.deptId) {
           deptName = item.deptName;
         }
@@ -1589,7 +1592,7 @@ export default {
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
-      listPeople(this.queryParams).then(response => {
+      listPeople(this.queryParams).then((response) => {
         this.peopleList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1667,7 +1670,7 @@ export default {
         rankUpgradeTime: null,
         phoneStandby: null,
         deptName: null,
-        isBianzhi: null
+        isBianzhi: null,
       };
       this.bdglPeopleList = [];
       this.resetForm("form");
@@ -1684,7 +1687,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1699,15 +1702,15 @@ export default {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null
-        }
+          unitName: null,
+        },
       ];
     },
     /** 查看按钮操作 */
     handlesee(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then(response => {
+      getPeople(id).then((response) => {
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         //家庭人员判空处理
@@ -1719,8 +1722,8 @@ export default {
               name: null,
               characterRelationship: null,
               phoneNumber: null,
-              unitName: null
-            }
+              unitName: null,
+            },
           ];
         }
         this.bdglPeopleList = response.data.bdglPeopleList;
@@ -1733,7 +1736,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then(response => {
+      getPeople(id).then((response) => {
         this.form = response.data;
         //家庭人员判空处理
         if (this.form.familyInformation.length > 0) {
@@ -1744,8 +1747,8 @@ export default {
               name: null,
               characterRelationship: null,
               phoneNumber: null,
-              unitName: null
-            }
+              unitName: null,
+            },
           ];
         }
 
@@ -1758,7 +1761,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       // console.log(this.form.laborContractUploading)
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.readmeFile) {
             this.form.readmeFile = this.form.readmeFile[0].name;
@@ -1767,7 +1770,7 @@ export default {
           this.form.bdglPeopleList = this.bdglPeopleList;
           this.form.familyInformation = this.jtlist;
           if (this.form.id != null) {
-            updatePeople(this.form).then(response => {
+            updatePeople(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1775,7 +1778,7 @@ export default {
           } else {
             this.form.familyInformation = this.jtlist;
             this.form.deptName = this.$refs["deptId"].selectedLabel;
-            addPeople(this.form).then(response => {
+            addPeople(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1789,7 +1792,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除人员管理的数据项？")
-        .then(function() {
+        .then(function () {
           return delPeople(ids);
         })
         .then(() => {
@@ -1873,14 +1876,14 @@ export default {
       } else {
         const bdglPeopleList = this.bdglPeopleList;
         const checkedBdglPeople = this.checkedBdglPeople;
-        this.bdglPeopleList = bdglPeopleList.filter(function(item) {
+        this.bdglPeopleList = bdglPeopleList.filter(function (item) {
           return checkedBdglPeople.indexOf(item.index) == -1;
         });
       }
     },
     /** 复选框选中数据 */
     handleBdglPeopleSelectionChange(selection) {
-      this.checkedBdglPeople = selection.map(item => item.index);
+      this.checkedBdglPeople = selection.map((item) => item.index);
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1891,7 +1894,7 @@ export default {
           this.exportLoading = true;
           return exportPeople(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1903,7 +1906,7 @@ export default {
         name: null,
         characterRelationship: null,
         phoneNumber: null,
-        unitName: null
+        unitName: null,
       });
     },
     //删除家庭成员
@@ -1924,7 +1927,7 @@ export default {
         this.form.idcard.substr(12, 2);
       var myDate = new Date();
       this.form.age = myDate.getFullYear() - this.form.idcard.substr(6, 4);
-      listPeople({ idcard: this.form.idcard }).then(response => {
+      listPeople({ idcard: this.form.idcard }).then((response) => {
         console.log();
         if (response.rows.length > 0) {
           this.form.idcard = null;
@@ -1944,8 +1947,8 @@ export default {
     handleNodeClick(data) {
       this.queryParams.deptId = data.id;
       this.getList();
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

src/views/thought/thoughtPlan/index.vue

@@ -342,6 +342,14 @@
             placeholder="请输入计划简介"
           />
         </el-form-item>
+        <div class="jiben">计划条数</div>
+        <el-form-item prop="remark">
+          <el-input
+            type="textarea"
+            v-model="form.planIntroduction"
+            placeholder="请输入计划详情"
+          />
+        </el-form-item>
         <!-- <el-form-item label="文件路径" prop="filePath">
           <el-input v-model="form.filePath" placeholder="请输入文件路径" />
         </el-form-item>

src/views/workingArrangements/workTask/index.vue

@@ -1016,12 +1016,12 @@ export default {
     };
   },
   created() {
-    this.getList();
-    this.getdept();
     if (Cookies.get("shuaxin") != "true") {
       window.location.reload();
     }
     Cookies.set("shuaxin", "true");
+    this.getList();
+    this.getdept();
     allUser().then((res) => {
       this.rylist = res.rows;
     });