zxr пре 3 година
родитељ
комит
21a209a7dd

+ 1 - 1
src/layout/components/AppMain.vue

@@ -125,7 +125,7 @@ export default {
   },
   mounted(){
      // window.location.reload()
-     this.$forceUpdate();
+    //  this.$forceUpdate();
   },
   methods: {
     showfun() {

+ 28 - 9
src/layout/components/Sidebar/index.vue

@@ -1,14 +1,27 @@
 <template>
   <div
-    :class="{'has-logo':showLogo}"
-    :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"
+    :class="{ 'has-logo': showLogo }"
+    :style="{
+      backgroundColor:
+        settings.sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground
+    }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
       <el-menu
         :collapse="false"
-        :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
-        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
+        :background-color="
+          settings.sideTheme === 'theme-dark'
+            ? variables.menuBackground
+            : variables.menuLightBackground
+        "
+        :text-color="
+          settings.sideTheme === 'theme-dark'
+            ? variables.menuColor
+            : variables.menuLightColor
+        "
         :unique-opened="true"
         :active-text-color="settings.theme"
         :collapse-transition="false"
@@ -18,7 +31,7 @@
       >
         <sidebar-item
           v-for="(route, index) in routs"
-          :key="route.path  + index"
+          :key="route.path + index"
           :item="route"
           :base-path="route.path"
         />
@@ -32,13 +45,14 @@ import { mapGetters, mapState } from "vuex";
 import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
+import Cookies from "js-cookie";
 
 export default {
   data() {
     return {
       routs: [],
       p: null,
-      defaultpath:null,
+      defaultpath: null
     };
   },
   components: { SidebarItem, Logo },
@@ -81,11 +95,16 @@ export default {
           // console.log(item);
           this.routs.push(item);
           if (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.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 });
           } else {
-            this.defaultpath=[this.routs[0].path];
+            this.defaultpath = [this.routs[0].path];
             this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;
             this.$router.push({ path: this.p });
           }

+ 5 - 0
src/views/PrintsManage/manage/index.vue

@@ -679,6 +679,11 @@ export default {
   },
   created() {
     this.getList();
+    if(Cookies.get('shuaxin')!='true'){
+       window.location.reload()
+       
+    }
+    Cookies.set('shuaxin','true');
     //级别
     this.getDicts("level").then(response => {
       this.levelMs = response.data;

+ 97 - 76
src/views/bdglSecret/secret/index.vue

@@ -10,7 +10,7 @@
       <el-form-item label="" prop="kind">
         <el-select
           v-model="queryParams.kind"
-          placeholder="请选择类"
+          placeholder="请选择类"
           clearable
           size="small"
           @change="secrecy"
@@ -24,7 +24,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item prop="confidential">
+      <!-- <el-form-item prop="confidential">
         <el-input
           v-model="queryParams.confidential"
           placeholder="请输入密级"
@@ -32,7 +32,7 @@
           size="small"
           @input="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
           >重置</el-button
@@ -106,22 +106,23 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="单位"
-        align="center"
-        prop="unitId"
-        :formatter="deptIdformatter"
-      />
-      <el-table-column label="种类" align="center" prop="kind"  >
+      <el-table-column label="分类" align="center" prop="kind">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.electronic" :value="scope.row.kind" />
         </template>
       </el-table-column>
-      <el-table-column label="编号" align="center" prop="number" />
-      <el-table-column label="密级" align="center" prop="confidential" />
-      <el-table-column label="责任人" align="center" prop="peopleName" />
+      <el-table-column label="型号" align="center" prop="version" width="200" />
+      <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="people2Name" />
+      <el-table-column
+        label="使用单位"
+        align="center"
+        prop="unitId"
+        :formatter="deptIdformatter"
+        width="200"
+      />
+      <el-table-column label="用途" align="center" show-overflow-tooltip prop="people2Name" width="200" />
       <el-table-column
         label="起用时间"
         align="center"
@@ -143,7 +144,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="移交时间"
+        label="归还时间"
         align="center"
         prop="hindOverTime"
         width="160"
@@ -152,11 +153,14 @@
           <span>{{ parseTime(scope.row.hindOverTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="责任人" align="center" prop="peopleName" />
+      <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
@@ -208,19 +212,19 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="单位" prop="unitId">
+        <el-form-item label="使用单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
-            placeholder="请选择单位"
+            placeholder="请选择使用单位"
             @select="selectPeo"
             @open="blurSelect"
           />
         </el-form-item>
-        <el-form-item label="类" prop="kind">
+        <el-form-item label="类" prop="kind">
           <el-select
             v-model="form.kind"
-            placeholder="请选择类"
+            placeholder="请选择类"
             @change="zhongLei"
           >
             <el-option
@@ -236,43 +240,43 @@
         <el-form-item label="编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入编号" disabled />
         </el-form-item>
-        <el-form-item label="型号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入型号" />
-        </el-form-item>
-        <el-form-item label="密级" prop="confidential">
-          <el-input v-model="form.confidential" placeholder="请输入密级" />
-        </el-form-item>
-        <el-form-item label="责任人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择负责人">
+        <el-form-item label="使用人" prop="peopleId1">
+          <el-select
+            ref="aa"
+            v-model="form.peopleId1"
+            placeholder="请选择使用人"
+          >
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
               :label="item.name"
               :value="item.id"
-              @click.native="zheRenRe(item.name)"
+              @click.native="shiYongRen(item.name)"
               class="input_xiala"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="使用人" prop="peopleId1">
-          <el-select
-            ref="aa"
-            v-model="form.peopleId1"
-            placeholder="请选择使用人"
-          >
+        <el-form-item label="型号" prop="version">
+          <el-input v-model="form.version" placeholder="请输入型号" />
+        </el-form-item>
+        <!-- <el-form-item label="密级" prop="confidential">
+          <el-input v-model="form.confidential" placeholder="请输入密级" />
+        </el-form-item> -->
+        <el-form-item label="责任人" prop="peopleId">
+          <el-select v-model="form.peopleId" placeholder="请选择负责人">
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
               :label="item.name"
               :value="item.id"
-              @click.native="shiYongRen(item.name)"
+              @click.native="zheRenRe(item.name)"
               class="input_xiala"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="批准人" prop="peopleId2">
+        <!-- <el-form-item label="批准人" prop="peopleId2">
           <el-select v-model="form.peopleId2" placeholder="请选择批准人">
             <el-option
               v-for="(item, i) in renYuan"
@@ -284,7 +288,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="起用时间" prop="startTime">
           <el-date-picker
             clearable
@@ -310,7 +314,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="移交时间" prop="hindOverTime">
+        <el-form-item label="归还时间" prop="hindOverTime">
           <el-date-picker
             clearable
             size="small"
@@ -318,15 +322,30 @@
             type="date"
             :editable="false"
             value-format="yyyy-MM-dd"
-            placeholder="请选择移交时间"
+            placeholder="请选择归还时间"
           >
           </el-date-picker>
         </el-form-item>
+        <div class="jiben">用途</div>
+        <el-form-item label="" prop="people2Name">
+          <el-input
+            v-model="form.people2Name"
+            type="textarea"
+            placeholder="请输入用途"
+          />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item label="" prop="remarks">
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入备注"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
         <el-button @click="cancel" size="btn">取消</el-button>
-        
       </div>
     </el-dialog>
     <div class="fff">
@@ -356,21 +375,19 @@ import {
   addSecret,
   updateSecret,
   exportSecret,
-  getDepts,
+  getDepts
 } from "@/api/bdglSecret/secret";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import {
   getZhuChiRen,
-  getDept,
+  getDept
 } from "@/api/grassrootsregistration/bdglmeeting";
 export default {
   name: "Bdglsecrecy",
   components: { Treeselect, bdglsecrecy },
-  dicts: [
-    "electronic"
-  ],
+  dicts: ["electronic"],
   data() {
     return {
       //查看页面
@@ -411,34 +428,36 @@ export default {
         peopleId: null,
         peopleId1: null,
         peopleId2: null,
+        people2Name:null,
         startTime: null,
         endTime: null,
         hindOverTime: null,
         unitId: null,
+        remarks:null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
+          { required: true, message: "单位名称不能为空", trigger: "blur" }
         ],
         kind: [{ required: true, message: "种类不能为空", trigger: "blur" }],
         confidential: [
-          { required: true, message: "密级不能为空", trigger: "blur" },
+          { required: true, message: "密级不能为空", trigger: "blur" }
         ],
         peopleId: [
-          { required: true, message: "责任人不能为空", trigger: "blur" },
+          { required: true, message: "责任人不能为空", trigger: "blur" }
         ],
         peopleId1: [
-          { required: true, message: "使用人不能为空", trigger: "blur" },
-        ],
-        peopleId2: [
-          { required: true, message: "批准人不能为空", trigger: "blur" },
+          { required: true, message: "使用人不能为空", trigger: "blur" }
         ],
+        // peopleId2: [
+        //   { required: true, message: "批准人不能为空", trigger: "blur" },
+        // ],
         startTime: [
-          { required: true, message: "起用时间不能为空", trigger: "blur" },
-        ],
+          { required: true, message: "起用时间不能为空", trigger: "blur" }
+        ]
       },
       //下拉
       options: [],
@@ -446,7 +465,7 @@ export default {
       deptOptions: [],
       // 查询字典
       dictType: {
-        dictType: "electronic",
+        dictType: "electronic"
       },
       // 字典列表
       ziDian: [],
@@ -455,16 +474,16 @@ export default {
       // 树形配置对象
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "label"
       },
-      unitId: [],
+      unitId: []
     };
   },
   created() {
     this.getList();
     this.getdict();
     //部门数据
-    getDepts().then((res) => {
+    getDepts().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
@@ -474,7 +493,7 @@ export default {
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
-      this.unitId.map((item) => {
+      this.unitId.map(item => {
         if (item.deptId == row.unitId) {
           deptName = item.deptName;
         }
@@ -510,7 +529,7 @@ export default {
     },
     // 获取主持人
     getZhuChi(id) {
-      getZhuChiRen(id).then((res) => {
+      getZhuChiRen(id).then(res => {
         this.renYuan = res.data;
       });
     },
@@ -524,7 +543,7 @@ export default {
     /** 查询网络/手机/涉密载体登记本列表 */
     getList() {
       this.loading = true;
-      listSecret(this.queryParams).then((response) => {
+      listSecret(this.queryParams).then(response => {
         this.bdglsecrecyList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -532,21 +551,21 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then((response) => {
+      getDept().then(response => {
         // console.log(response);
         this.deptOptions = response.data;
       });
     },
     // 查询电子产品
     getdict() {
-      getDicts(this.dictType.dictType).then((res) => {
+      getDicts(this.dictType.dictType).then(res => {
         this.ziDian = res.data;
       });
     },
     // 选中添加部门单位触发
     department() {
       console.log(this.form);
-      getZhuChiRen(this.form.unitId).then((res) => {
+      getZhuChiRen(this.form.unitId).then(res => {
         console.log(res);
         this.renYuan = res.data;
       });
@@ -589,10 +608,12 @@ export default {
         peopleId: null,
         peopleId1: null,
         peopleId2: null,
+        people2Name:null,
         startTime: null,
         endTime: null,
         hindOverTime: null,
         unitId: null,
+        remarks:null,
       };
       this.resetForm("form");
     },
@@ -618,7 +639,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;
     },
@@ -644,7 +665,7 @@ export default {
       this.reset();
       this.getTreeselect();
       const id = row.id || this.ids;
-      getSecret(id).then((response) => {
+      getSecret(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改网络/手机/涉密载体登记本";
@@ -655,7 +676,7 @@ export default {
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
-      getSecret(id).then((response) => {
+      getSecret(id).then(response => {
         console.log(response);
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
@@ -666,16 +687,16 @@ export default {
     /** 提交按钮 */
     submitForm(style) {
       this.style = style;
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSecret(this.form).then((response) => {
+            updateSecret(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addSecret(this.form).then((response) => {
+            addSecret(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -692,7 +713,7 @@ export default {
         //   '是否确认删除网络/手机/涉密载体登记本编号为"' + ids + '"的数据项?'
         // )
         .confirm("是否确认删除该数据?")
-        .then(function () {
+        .then(function() {
           return delSecret(ids);
         })
         .then(() => {
@@ -710,13 +731,13 @@ export default {
           this.exportLoading = true;
           return exportSecret(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>
@@ -725,7 +746,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 882px;
+  width: 920px;
   height: 104px;
 }
 ::v-deep .el-dialog__header {
@@ -870,4 +891,4 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-</style>
+</style>

+ 13 - 3
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -252,8 +252,13 @@
             <el-form-item label="天气" prop="weather">
               <el-input v-model="form.weather" placeholder="请输入天气" />
             </el-form-item>
-            <el-form-item label="值班首长"  prop="lead">
-              <el-select v-model="form.lead" filterable placeholder="请选择首长" clearable>
+            <el-form-item label="值班首长" prop="lead">
+              <el-select
+                v-model="form.lead"
+                filterable
+                placeholder="请选择首长"
+                clearable
+              >
                 <el-option
                   :label="item.nickName"
                   v-for="(item, i) in shouZhang"
@@ -687,7 +692,7 @@
                 </div>
               </el-form>
             </div>
-            <div class="jiben" >临时来队亲属</div>
+            <div class="jiben">临时来队亲属</div>
             <div class="box3">
               <div class="box4">
                 <el-form v-for="(item1, i) in relatives" :key="i">
@@ -854,6 +859,7 @@ import { getDicts } from "@/api/system/dict/data";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Cookies from "js-cookie";
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1068,6 +1074,10 @@ export default {
     this.treeselect();
     // 获取数据
     this.getShuJu();
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
   },
   methods: {
     // 点击数据盒子

+ 18 - 1
src/views/pt.vue

@@ -701,79 +701,95 @@ export default {
       this.$router
         .push({ path: "/index", query: { name: "/grassrootsregistration" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     zhanbeifun() {
       this.$router
         .push({ path: "/index", query: { name: "/combatduty" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     renlifun() {
       this.$router
         .push({ path: "/index", query: { name: "/peopleManage" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     renyuanfun() {
       this.$router
         .push({ path: "/index", query: { name: "/peopleChuRu" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     yingfangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/barracksManagement" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     junchefun() {
       this.$router
         .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     gongzuofun() {
       this.$router
         .push({ path: "/index", query: { name: "/workingArrangements" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     guizhangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/regulations" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     yiliaofun() {
       this.$router
         .push({ path: "/index", query: { name: "/medicalhealth" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     jianchafun() {
       this.$router
         .push({ path: "/index", query: { name: "/bdglregular" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     mengangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/doormanManage" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     yingjufun() {
       this.$router
         .push({ path: "/index", query: { name: "/materialManagement" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     xitongfun() {
       this.$router
         .push({ path: "/index", query: { name: "/system" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     gongju() {
       this.$router
         .push({ path: "/index", query: { name: "/tool" } })
         .catch(() => {});
+        Cookies.set('shuaxin','false');
     },
     wenyinfun() {
       this.$router
         .push({ path: "/index", query: { name: "/print" } })
         .catch(() => {});
+       Cookies.set('shuaxin','false');
     },
     taishifun() {
       this.$router.push({ path: "/taishi" }).catch(() => {});
+      Cookies.set('shuaxin','false');
       // window.open(`/taishi`,'_self');
     },
     baomifun() {
@@ -894,7 +910,8 @@ export default {
       // this.open5 = true;
       // this.ggflg = true;
       // this.reset();
-      this.$router.push({ path: "/system/notice" }).catch(() => {});
+      window.open(`/system/notice`, "_self");
+      // this.$router.push({ path: "/system/notice" }).catch(() => {});
     },
     submitForm() {
       // addNotice(this.form).then((response) => {

+ 99 - 74
src/views/regulations/fileinfo/index.vue

@@ -30,7 +30,7 @@
                 <img
                   v-else-if="
                     scope.row.parentDirId == '.doc' ||
-                    scope.row.parentDirId == '.docx'
+                      scope.row.parentDirId == '.docx'
                   "
                   src="../../../images/doc.png"
                   alt=""
@@ -308,6 +308,7 @@
             </td>
           </tr>
         </table>
+
         <!-- <el-table
           v-loading="loading"
           :data="list"
@@ -491,7 +492,7 @@
         class="el-dialog__header"
         :close-on-click-modal="false"
       >
-        <div  ref="file"></div>
+        <div ref="file"></div>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm3">确 定</el-button>
           <el-button @click="open33 = false" size="" class="aa1">
@@ -511,32 +512,51 @@
       >
         <template>
           <!-- <div style="margin-bottom:20px"> -->
-            <div style="display:flex">
-            <el-button :theme="'default'" type="submit" :title="'上一页'" @click.native="prePage"> 上一页</el-button>
-            <div style="margin-left:10px;margin-right:10px">{{pageNum}}/{{pageTotalNum}} </div>
-            <el-button :theme="'default'" type="submit" :title="'下一页'" @click.native="nextPage"> 下一页</el-button>
+          <div style="display:flex">
+            <el-button
+              :theme="'default'"
+              type="submit"
+              :title="'上一页'"
+              @click.native="prePage"
+            >
+              上一页</el-button
+            >
+            <div style="margin-left:10px;margin-right:10px">
+              {{ pageNum }}/{{ pageTotalNum }}
+            </div>
+            <el-button
+              :theme="'default'"
+              type="submit"
+              :title="'下一页'"
+              @click.native="nextPage"
+            >
+              下一页</el-button
+            >
             <!-- <el-button :theme="'default'" type="submit" :title="'顺时针旋转'" @click.native="clock" > 顺时针旋转</el-button>
             <el-button :theme="'default'" type="submit" :title="'逆时针旋转'" @click.native="counterClock" > 逆时针旋转</el-button>
            <el-button :theme="'default'" type="submit" :title="'打印'" @click.native="pdfPrintAll"> 打印</el-button> -->
           </div>
-            <PDF
-              ref="pdf"
-              :src="pdfurl"
-              :page="pageNum"
-              :rotate="pageRotate"
-              @progress="loadedRatio = $event"
-              @page-loaded="pageLoaded($event)"
-              @num-pages="pageTotalNum = $event"
-              @error="pdfError($event)"
-              @link-clicked="page = $event"
-              
-            ></PDF>
+          <PDF
+            ref="pdf"
+            :src="pdfurl"
+            :page="pageNum"
+            :rotate="pageRotate"
+            @progress="loadedRatio = $event"
+            @page-loaded="pageLoaded($event)"
+            @num-pages="pageTotalNum = $event"
+            @error="pdfError($event)"
+            @link-clicked="page = $event"
+          ></PDF>
           <!-- </div> -->
-            <!-- <div class="el-dialog__footer"> -->
-              <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="previewDialog = false">确 定</el-button>
-                <el-button @click="previewDialog = false" size="" class="aa1">取 消</el-button>
-              </div>
+          <!-- <div class="el-dialog__footer"> -->
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="previewDialog = false"
+              >确 定</el-button
+            >
+            <el-button @click="previewDialog = false" size="" class="aa1"
+              >取 消</el-button
+            >
+          </div>
           <!-- </div> -->
         </template>
       </el-dialog>
@@ -547,6 +567,7 @@
 <script>
 import axios from "axios";
 import PDF from "vue-pdf";
+import Cookies from "js-cookie";
 const docx = require("docx-preview");
 window.JSZip = require("jszip");
 import {
@@ -563,7 +584,7 @@ import {
   // 导出文件列表接口
   exportFileinfo,
   // 获取排行接口
-  rankList,
+  rankList
 } from "@/api/regulations/fileinfo";
 import {
   // 查询目录列表接口
@@ -571,7 +592,7 @@ import {
   // 添加目录列表接口
   addDirectoryinfo,
   // 删除目录列表接口
-  delDirectoryinfo,
+  delDirectoryinfo
 } from "@/api/regulations/directoryinfo";
 export default {
   name: "Fileinfo",
@@ -580,16 +601,16 @@ export default {
       list: [
         {
           id: 1,
-          file: "文件",
+          file: "文件"
         },
         {
           id: 2,
-          file: "文件",
+          file: "文件"
         },
         {
           id: 3,
-          file: "文件",
-        },
+          file: "文件"
+        }
       ],
       // 分页器1
       total: 0,
@@ -609,7 +630,7 @@ export default {
         directoryName: null,
         parentDirId: null,
         parentDirName: null,
-        fileSize: null,
+        fileSize: null
       },
       queryParams1: {
         pageNum: 1,
@@ -625,7 +646,7 @@ export default {
         directoryName: null,
         parentDirId: null,
         parentDirName: null,
-        fileSize: null,
+        fileSize: null
       },
       // 上传文件
       open: false,
@@ -677,17 +698,21 @@ export default {
       downurl: process.env.VUE_APP_BASE_API,
       // pdf文件
       previewDialog: false,
-      pdfurl:"",
+      pdfurl: "",
       pageNum: 1,
       pageTotalNum: 1,
       pageRotate: 0,
       // 加载进度
       loadedRatio: 0,
-      curPageNum: 0,
+      curPageNum: 0
     };
   },
 
   created() {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
     this.getList();
     // 获取目录接口
     this.ListDirectoryinfo();
@@ -702,7 +727,7 @@ export default {
     $(".sidebar-logo-container").removeClass("collapse");
   },
   components: {
-    PDF,
+    PDF
   },
   methods: {
     /**
@@ -754,7 +779,7 @@ export default {
       this.open33 = false;
     },
     RankList() {
-      rankList().then((res) => {
+      rankList().then(res => {
         this.Ranking = res.data;
       });
     },
@@ -764,8 +789,8 @@ export default {
       this.queryParams.pageNum = val;
       listFileinfo({
         pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize,
-      }).then((res) => {
+        pageSize: this.queryParams.pageSize
+      }).then(res => {
         this.fileinfoList = res.rows;
         // this.fileinfoList.map(item=>{
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
@@ -791,11 +816,11 @@ export default {
         parentId: this.parentId,
         pageNum: this.queryParams1.pageNum,
         pageSize: this.queryParams1.pageSize,
-        common: this.queryParams1.common,
-      }).then((res) => {
+        common: this.queryParams1.common
+      }).then(res => {
         this.directory = res.rows;
         // console.log(this.directory)
-        this.directory.map((item) => {
+        this.directory.map(item => {
           if (item.subclassification != 0) {
             // this.queryParams1.pageNum=1
             this.addbtn = true;
@@ -812,7 +837,7 @@ export default {
       console.log(row);
       this.$modal
         .confirm("是否确认删除该文件")
-        .then(function () {
+        .then(function() {
           return delFileinfo(row.id);
         })
         .then(() => {
@@ -833,7 +858,7 @@ export default {
       this.loading = true;
       this.queryParams.common = "1";
       this.queryParams1.common = "1";
-      listDirectoryinfo(this.queryParams1).then((res) => {
+      listDirectoryinfo(this.queryParams1).then(res => {
         this.directory = res.rows;
         console.log(this.directory);
         this.total1 = res.total;
@@ -858,8 +883,8 @@ export default {
       listFileinfo({
         directoryId: this.form.directoryId,
         pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize,
-      }).then((res) => {
+        pageSize: this.queryParams.pageSize
+      }).then(res => {
         this.fileinfoList = res.rows;
         // this.fileinfoList.map(item=>{
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
@@ -877,9 +902,9 @@ export default {
       listDirectoryinfo({
         parentId: this.parentId,
         pageNum: this.queryParams1.pageNum,
-        pageSize: this.queryParams1.pageSize,
-      }).then((res) => {
-        res.rows.forEach((item) => {
+        pageSize: this.queryParams1.pageSize
+      }).then(res => {
+        res.rows.forEach(item => {
           if (item.subclassification == 0) {
             this.directory = res.rows;
             this.total1 = res.total;
@@ -906,14 +931,14 @@ export default {
       this.subclassification = [];
       this.parentId = id;
       // 获取到父目录id了
-      listDirectoryinfo({ parentId: this.parentId }).then((res) => {
+      listDirectoryinfo({ parentId: this.parentId }).then(res => {
         this.subclassification = res.rows;
       });
     },
     /** 查询规章制度文件记录列表 */
     getList() {
       this.loading = true;
-      listFileinfo(this.queryParams).then((response) => {
+      listFileinfo(this.queryParams).then(response => {
         this.fileinfoList = response.rows;
         // this.fileinfoList.map(item=>{
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
@@ -944,7 +969,7 @@ export default {
         directoryName: null,
         parentDirId: null,
         parentDirName: null,
-        fileSize: null,
+        fileSize: null
       };
       this.resetForm("form");
     },
@@ -960,7 +985,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;
     },
@@ -974,7 +999,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getFileinfo(id).then((response) => {
+      getFileinfo(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改规章制度文件记录";
@@ -983,7 +1008,7 @@ export default {
     /** 上传文件提交按钮 */
     submitForm() {
       console.log(this.form);
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           console.log(this.form.file[0]);
           // 文件名
@@ -1001,7 +1026,7 @@ export default {
           //输出结果
           console.log(this.form);
           // 上传文件接口
-          addFileinfo(this.form).then((response) => {
+          addFileinfo(this.form).then(response => {
             this.ListDirectoryinfo();
             this.$modal.msgSuccess("上传成功");
             this.open = false;
@@ -1014,9 +1039,9 @@ export default {
     submitForm1() {
       // 新建分类接口
       // addDirectoryinfo
-      this.$refs["form1"].validate((valid) => {
+      this.$refs["form1"].validate(valid => {
         if (valid) {
-          addDirectoryinfo(this.form1).then((response) => {
+          addDirectoryinfo(this.form1).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.ListDirectoryinfo();
             this.open1 = false;
@@ -1028,10 +1053,10 @@ export default {
     },
     // 添加子分类
     submitForm2() {
-      this.$refs["form2"].validate((valid) => {
+      this.$refs["form2"].validate(valid => {
         console.log(this.form2);
         if (valid) {
-          addDirectoryinfo(this.form2).then((response) => {
+          addDirectoryinfo(this.form2).then(response => {
             this.$modal.msgSuccess("上传子分类成功");
             this.open2 = false;
             this.form2 = {};
@@ -1048,7 +1073,7 @@ export default {
       // console.log(ids);
       this.$modal
         .confirm("是否确认删除该文件?")
-        .then(function () {
+        .then(function() {
           return delDirectoryinfo(ids);
         })
         .then(() => {
@@ -1058,9 +1083,9 @@ export default {
           listDirectoryinfo({
             parentId: this.parentId,
             pageNum: this.queryParams1.pageNum,
-            pageSize: this.queryParams1.pageSize,
+            pageSize: this.queryParams1.pageSize
             //  common: this.queryParams1.common,
-          }).then((res) => {
+          }).then(res => {
             console.log(res);
             this.directory = res.rows;
             this.total1 = res.total;
@@ -1093,7 +1118,7 @@ export default {
           this.exportLoading = true;
           return exportFileinfo(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1136,7 +1161,7 @@ export default {
         axios({
           method: "get",
           responseType: "blob", // 设置响应文件格式
-          url: process.env.VUE_APP_BASE_API + row.parentDirName,
+          url: process.env.VUE_APP_BASE_API + row.parentDirName
         }).then(({ data }) => {
           // console.log(11)
           console.log(data);
@@ -1144,22 +1169,22 @@ export default {
           // console.log($(".docx"));
           docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
         });
-      } else if(row.parentDirId =='.pdf'){
+      } else if (row.parentDirId == ".pdf") {
         this.previewDialog = true;
-        this.pdfurl=process.env.VUE_APP_BASE_API + row.parentDirName
+        this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
       }
       row.common = "1";
-      updateFileinfo(row).then((res) => {
+      updateFileinfo(row).then(res => {
         this.getList();
-        rankList().then((res) => {
+        rankList().then(res => {
           this.Ranking = res.data;
         });
       });
       // window.open("www.baidu.com","_self");
     },
     // 下载按钮操作
-    handleupLoad() {},
-  },
+    handleupLoad() {}
+  }
 };
 </script>
 
@@ -1169,13 +1194,13 @@ export default {
   height: 600px !important;
 } */
 /* doc文件样式修改 */
-::v-deep .docx{
+::v-deep .docx {
   padding: 0 !important;
 }
-::v-deep .docx-wrapper>section.docx{
+::v-deep .docx-wrapper > section.docx {
   /* padding: 0 !important; */
- margin-bottom: 0px !important;
- box-shadow: none;
+  margin-bottom: 0px !important;
+  box-shadow: none;
 }
 /* 预览弹框背景去除 */
 ::v-deep .docx-wrapper {
@@ -1618,7 +1643,7 @@ body,
 ::v-deep .el-dialog__footer .dialog-footer .el-button--btn {
   padding-top: 00px !important;
 }
-.userAgree{
+.userAgree {
   height: 600px;
   overflow: auto;
 }

+ 7 - 2
src/views/taishi/index.vue

@@ -1001,6 +1001,7 @@ import {
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
+import Cookies from "js-cookie";
 export default {
   data() {
     return {
@@ -1086,7 +1087,11 @@ export default {
     };
   },
   created() {
-    
+    if(Cookies.get('shuaxin')!='true'){
+       window.location.reload()
+       
+    }
+    Cookies.set('shuaxin','true');
     //大队人员在位数据
     zaiweipeople().then((res) => {
       if (res.code == 200) {
@@ -1099,7 +1104,7 @@ export default {
     });
     //今日值班
     jinrizhiban().then((res) => {
-      if (res.data.length > 0) {
+      if (res.data!=null) {
         this.jrzblist = [];
         for (var i in res.data) {
           if (i == "chiefDutyName") {

+ 113 - 224
src/views/workingArrangements/workTask/index.vue

@@ -50,7 +50,7 @@
           <el-option label="参谋部" value="adviser"></el-option>
           <el-option label="保障部" value="safeguard"></el-option>
         </el-select>
-      </el-form-item> -->
+      </el-form-item>-->
       <el-form-item prop="type" class="plantypes" label-width="80px">
         <el-select v-model="queryParams.type" placeholder="请选择任务类型">
           <el-option
@@ -59,8 +59,7 @@
             :label="item.type"
             :value="item.type"
             @click.native="zidainType(item)"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="adminId" class="plantypes" label-width="80px">
@@ -79,14 +78,8 @@
           size="btn"
           @click="handleQuery"
           >搜索</el-button
-        > -->
-        <el-button
-          type="btr"
-          icon="el-icon-refresh"
-          size="mini"
-          @click="resetQuery"
-          >重置</el-button
-        >
+        >-->
+        <el-button type="btr" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -98,8 +91,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['workingArrangements:workTask:add']"
-          >新增</el-button
-        >
+        >新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -124,7 +116,7 @@
           v-hasPermi="['workingArrangements:workTask:remove']"
           >删除</el-button
         >
-      </el-col> -->
+      </el-col>-->
       <!-- <el-col :span="1.5">
         <el-button
           type="warning"
@@ -136,11 +128,11 @@
           v-hasPermi="['workingArrangements:workTask:export']"
           >导出</el-button
         >
-      </el-col> -->
+      </el-col>-->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar> -->
+      ></right-toolbar>-->
     </el-row>
 
     <el-table
@@ -156,51 +148,23 @@
         align="center"
         prop="adminId"
         :formatter="unit3Format"
-      /> -->
+      />-->
       <el-table-column label="发布人" align="center" prop="username" />
-      <el-table-column
-        label="任务类型"
-        align="center"
-        prop="type"
-      />
-      <el-table-column
-        label="执行人"
-        align="center"
-        prop="peopleId"
-        :formatter="unit2Format"
-      />
+      <el-table-column label="任务类型" align="center" prop="type" />
+      <el-table-column label="执行人" align="center" prop="peopleId" :formatter="unit2Format" />
       <!-- <el-table-column label="编号" align="center" prop="number" /> -->
-      <el-table-column
-        label="任务开始时间"
-        align="center"
-        prop="startTime"
-        width="180"
-      >
+      <el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="任务结束时间"
-        align="center"
-        prop="endTime"
-        width="180"
-      >
+      <el-table-column label="任务结束时间" align="center" prop="endTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="描述"
-        align="center"
-        prop="contents"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="描述" align="center" prop="contents" show-overflow-tooltip />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="btlook"
@@ -234,16 +198,14 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['workingArrangements:planTask:edit']"
             v-if="scope.row.common == 2"
-            >修改</el-button
-          >
+          >修改</el-button>
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-if="scope.row.common == 2"
             v-hasPermi="['workingArrangements:planTask:remove']"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -262,20 +224,10 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
         <div class="jiben">基本信息</div>
         <el-form-item label="任务名称" prop="name">
-          <el-input
-            placeholder="请选择任务名称"
-            v-model="form.name"
-            @click.native="planName"
-          />
+          <el-input placeholder="请选择任务名称" v-model="form.name" @click.native="planName" />
         </el-form-item>
         <el-form-item label="任务编号" prop="number">
           <el-input
@@ -284,8 +236,7 @@
             v-model="form.number"
             :disabled="true"
             class="ipt"
-          >
-          </el-input>
+          ></el-input>
         </el-form-item>
         <el-form-item label="发布单位" prop="adminId">
           <treeselect
@@ -321,22 +272,11 @@
               :value="parseInt(item.dictSort)"
             >
             </el-option>
-          </el-select> -->
-          <el-input
-            placeholder="请输入任务类型"
-            v-model="form.type"
-            style="width: 200px"
-          >
-          </el-input>
+          </el-select>-->
+          <el-input placeholder="请输入任务类型" v-model="form.type" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="发布人" prop="username">
-          <el-input
-            placeholder="请输入发布人"
-            v-model="form.username"
-            :disabled="true"
-            class="ipt"
-          >
-          </el-input>
+          <el-input placeholder="请输入发布人" v-model="form.username" :disabled="true" class="ipt"></el-input>
         </el-form-item>
         <div>
           <el-form-item label="执行人" prop="peopleName" label-width="100px">
@@ -368,8 +308,7 @@
             v-model="form.startTime"
             type="datetime"
             style="width: 200px"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" label-width="100px" prop="endTime">
           <el-date-picker
@@ -380,8 +319,7 @@
             type="datetime"
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <div class="jiben">任务附件</div>
         <el-form-item style="margin-left: 30px">
@@ -398,12 +336,7 @@
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remark">
-          <el-input
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-            style="width: 950px"
-          />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 950px" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -420,13 +353,7 @@
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="Progress"
-        :model="Progress"
-        :rules="rules1"
-        label-width="100px"
-        :inline="true"
-      >
+      <el-form ref="Progress" :model="Progress" :rules="rules1" label-width="100px" :inline="true">
         <div class="jiben">完成进度</div>
         <el-form-item prop="planProgress">
           <div>
@@ -451,11 +378,7 @@
         </el-form-item>
         <div class="jiben">备注</div>
         <el-form-item prop="remark">
-          <el-input
-            v-model="Progress.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+          <el-input v-model="Progress.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <div class="jiben">完成时间</div>
         <el-form-item prop="accomplishTime">
@@ -467,8 +390,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择完成时间"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -498,7 +420,7 @@
             label="计划名称"
             v-model="ProgressLook.comPlan"
             class="big"
-          /> -->
+        />-->
         <!-- </el-form-item> -->
         <el-progress
           :text-inside="true"
@@ -531,19 +453,13 @@
           <!-- <el-input
             v-model="singleTable."
             class="big"
-          /> -->
-          <div style="width: 350px">
-            {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
-          </div>
+          />-->
+          <div style="width: 350px">{{ singleTable.startTime }} 至 {{ singleTable.endTime }}</div>
         </el-form-item>
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
-          <el-input
-            label="附件名称"
-            v-model="singleTable.fileName"
-            style="width: 820px"
-          />
+          <el-input label="附件名称" v-model="singleTable.fileName" style="width: 820px" />
           <!-- <div>{{singleTableb.fileName}}</div> -->
           <a
             :href="singleTable.file"
@@ -551,8 +467,7 @@
             title="下载"
             style="color: white; margin-left: 10px"
             class="downloadfile"
-            >下载附件</a
-          >
+          >下载附件</a>
         </el-form-item>
         <div class="jiben">任务描述</div>
         <div class="thistext">{{ singleTable.contents }}</div>
@@ -573,13 +488,7 @@
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="moreTable"
-        :model="moreTable"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
+      <el-form ref="moreTable" :model="moreTable" :rules="rules" label-width="100px" :inline="true">
         <div class="jiben">完成进度</div>
         <el-progress
           :text-inside="true"
@@ -607,22 +516,21 @@
               />
             </el-select>
           </div>
-        </el-form-item> -->
-        <el-form-item label="发布人" prop="username" label-width="auto" >
+        </el-form-item>-->
+        <el-form-item label="发布人" prop="username" label-width="auto">
           <el-input
             placeholder="请输入发布人"
             v-model="moreTable.username"
             :disabled="true"
             class="ipt"
             style="color:#fff;width:350px;"
-          >
-          </el-input>
+          ></el-input>
         </el-form-item>
         <el-form-item prop="comWeek" label="任务周期" label-width="100px">
           <!-- <el-input
             v-model="singleTable."
             class="big"
-          /> -->
+          />-->
           <div
             style="
               width: 350px;
@@ -635,24 +543,18 @@
               margin-bottom: 20px;
               color:#fff;
             "
-          >
-            {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
-          </div>
+          >{{ moreTable.startTime }} 至 {{ moreTable.endTime }}</div>
         </el-form-item>
         <!-- <div class="jiben">任务周期</div>
         <div class="thistext">
           {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
-        </div> -->
+        </div>-->
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
           <!-- <el-input label="计划名称" v-model="ProgressLook.file" class="big" /> -->
           <!-- <a :href="moreTable.file" download title="下载" style="color:white;margin-left:10px">下载附件</a> -->
-          <el-input
-            label="附件名称"
-            v-model="moreTable.fileName"
-            style="width: 820px"
-          />
+          <el-input label="附件名称" v-model="moreTable.fileName" style="width: 820px" />
           <!-- <div>{{singleTableb.fileName}}</div> -->
           <a
             :href="moreTable.file"
@@ -660,8 +562,7 @@
             title="下载"
             style="color: white; margin-left: 10px"
             class="downloadfile"
-            >下载附件</a
-          >
+          >下载附件</a>
         </el-form-item>
         <div class="jiben">任务描述</div>
         <div class="thistext">{{ moreTable.contents }}</div>
@@ -674,8 +575,7 @@
           style="width: 100%; background: #004d86"
           class="tabless"
         >
-          <el-table-column prop="peopleName" label="执行人" width="180">
-          </el-table-column>
+          <el-table-column prop="peopleName" label="执行人" width="180"></el-table-column>
           <el-table-column label="任务周期" width="190">
             <template slot-scope="scope">
               <div>{{ scope.row.taskCycle }}</div>
@@ -692,8 +592,7 @@
               ></el-progress>
             </template>
           </el-table-column>
-          <el-table-column prop="accomplishTime" label="完成时间" width="180">
-          </el-table-column>
+          <el-table-column prop="accomplishTime" label="完成时间" width="180"></el-table-column>
           <el-table-column label="状态" width="180">
             <template slot-scope="scope">
               <div>{{ scope.row.schedule == 100 ? "完成" : "未完成" }}</div>
@@ -732,7 +631,7 @@
             label="计划名称"
             v-model="ProgressLook.comPlan"
             class="big"
-          /> -->
+        />-->
         <!-- </el-form-item> -->
         <el-progress
           :text-inside="true"
@@ -760,23 +659,23 @@
               />
             </el-select>
           </div>
-        </el-form-item> -->
-         <el-form-item label="发布人" prop="username" label-width="auto" >
+        </el-form-item>-->
+        <el-form-item label="发布人" prop="username" label-width="auto">
           <el-input
             placeholder="请输入发布人"
             v-model="singleTable.username"
             :disabled="true"
             class="ipt"
             style="color:#fff;width:350px;"
-          >
-          </el-input>
+          ></el-input>
         </el-form-item>
         <el-form-item prop="comWeek" label="任务周期" label-width="100px">
           <!-- <el-input
             v-model="singleTable."
             class="big"
-          /> -->
-          <div  style="
+          />-->
+          <div
+            style="
               width: 350px;
               border: 1px solid #fff;
               border-radius: 4px;
@@ -786,18 +685,13 @@
               text-indent: 1em;
               margin-bottom: 20px;
               color:#fff;
-            ">
-            {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
-          </div>
+            "
+          >{{ singleTable.startTime }} 至 {{ singleTable.endTime }}</div>
         </el-form-item>
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
-          <el-input
-            label="附件名称"
-            v-model="singleTable.fileName"
-            style="width: 820px"
-          />
+          <el-input label="附件名称" v-model="singleTable.fileName" style="width: 820px" />
           <!-- <div>{{singleTableb.fileName}}</div> -->
           <a
             :href="singleTable.file"
@@ -805,8 +699,7 @@
             title="下载"
             style="color: white; margin-left: 10px"
             class="downloadfile"
-            >下载附件</a
-          >
+          >下载附件</a>
         </el-form-item>
         <div class="jiben">备注</div>
         <div class="thistext">{{ singleTable.remark }}</div>
@@ -827,13 +720,7 @@
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
-      <el-form
-        ref="moreTable"
-        :model="daoruobj"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
+      <el-form ref="moreTable" :model="daoruobj" :rules="rules" label-width="100px" :inline="true">
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker
             placeholder="请选择开始时间"
@@ -844,8 +731,7 @@
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 200px"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" label-width="100px" prop="endTime">
           <el-date-picker
@@ -856,8 +742,7 @@
             type="datetime"
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -878,13 +763,13 @@ import {
   exportWorkTask,
   singProgress,
   moreProgress,
-  uploadProgress,
+  uploadProgress
 } from "@/api/workingArrangements/workTask";
 import {
   deptUser,
   allUser,
   getDept,
-  getDeptList,
+  getDeptList
 } from "@/api/workingArrangements/workTask";
 import { getDicts } from "@/api/system/dict/data";
 import Treeselect from "@riophae/vue-treeselect";
@@ -901,7 +786,7 @@ export default {
       loading: true,
       // 导出遮罩层
       exportLoading: false,
-      url:process.env.VUE_APP_BASE_API,
+      url: process.env.VUE_APP_BASE_API,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -946,41 +831,41 @@ export default {
         unitName2: null,
         taskProgress: null,
         releaseUnit: null,
-        executableUnit: null,
+        executableUnit: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "任务名称不能为空", trigger: "blur" },
+          { required: true, message: "任务名称不能为空", trigger: "blur" }
         ],
         number: [{ required: true, message: "编号不能为空", trigger: "blur" }],
         peopleName: [
-          { required: true, message: "执行人不能为空", trigger: "blur" },
+          { required: true, message: "执行人不能为空", trigger: "blur" }
         ],
         // name: [{ required: true, message: "不能为空", trigger: "blur" }],
         adminId: {
           required: true,
           message: "发布单位不能为空",
-          trigger: "blur",
+          trigger: "blur"
         },
         unitId: {
           required: true,
           message: "执行单位不能为空",
-          trigger: "blur",
+          trigger: "blur"
         },
         type: { required: true, message: "计划类型不能为空", trigger: "blur" },
         startTime: {
           required: true,
           message: "开始时间不能为空",
-          trigger: "blur",
+          trigger: "blur"
         },
         endTime: {
           required: true,
           message: "结束时间不能为空",
-          trigger: "blur",
-        },
+          trigger: "blur"
+        }
       },
       rules1: {
         // planProgress: [
@@ -996,7 +881,7 @@ export default {
       rylist: [],
       // 查询字典
       dictType: {
-        dictType: "work_type",
+        dictType: "work_type"
       },
       ziDian: [],
       // 部门列表
@@ -1015,20 +900,24 @@ export default {
         accomplishTime: "",
         taskId: "",
         id: "",
-        publisherId: "",
+        publisherId: ""
       },
       defaultTime: null,
       daoruobj: {},
-      open4: null,
+      open4: null
     };
   },
   created() {
     this.getList();
     this.getdept();
-    allUser().then((res) => {
+    if (Cookies.get("shuaxin") != "true") {
+      window.location.reload();
+    }
+    Cookies.set("shuaxin", "true");
+    allUser().then(res => {
       this.rylist = res.rows;
     });
-    getDeptList().then((res) => {
+    getDeptList().then(res => {
       this.getdeptList = res.data;
     });
     this.getdict();
@@ -1068,7 +957,7 @@ export default {
       this.open1 = true;
       this.title = "进度录入";
       this.jinduId = row.id;
-      singProgress(this.jinduId).then((res) => {
+      singProgress(this.jinduId).then(res => {
         console.log(res.data);
         this.Progress.id = res.data.workProgress.id;
         this.Progress.taskId = res.data.id;
@@ -1084,11 +973,10 @@ export default {
       this.title = "进度查看";
       // 获取当前行的id
       // console.log(row.id);
-      singProgress(row.id).then((res) => {
+      singProgress(row.id).then(res => {
         console.log(res);
         this.singleTable = res.data;
-        this.singleTable.planProgresses =
-          this.singleTable.workProgress.schedule;
+        this.singleTable.planProgresses = this.singleTable.workProgress.schedule;
         this.Progress.id = this.singleTable.workProgress.id;
 
         this.singleTable.file =
@@ -1112,16 +1000,17 @@ export default {
       this.open3 = true;
       this.title = "进度查看";
       // 获取当前行的id
-      moreProgress(row.id).then((res) => {
+      moreProgress(row.id).then(res => {
         // console.log(res)
         this.comstatus = 0;
         this.moreTable = res.data;
         console.log(this.moreTable);
-        this.moreTable.file = process.env.VUE_APP_BASE_API + this.moreTable.file;
-        this.moreTable.workProgresses.map((item) => {
+        this.moreTable.file =
+          process.env.VUE_APP_BASE_API + this.moreTable.file;
+        this.moreTable.workProgresses.map(item => {
           item.file = process.env.VUE_APP_BASE_API + item.file;
         });
-        this.moreTable.workProgresses.forEach((item) => {
+        this.moreTable.workProgresses.forEach(item => {
           this.comstatus +=
             item.schedule / this.moreTable.workProgresses.length;
         });
@@ -1131,7 +1020,7 @@ export default {
     /** 查询工作任务列表 */
     getList() {
       this.loading = true;
-      listWorkTask(this.queryParams).then((response) => {
+      listWorkTask(this.queryParams).then(response => {
         this.workTaskList = response.rows;
         console.log(this.workTaskList);
         this.total = response.total;
@@ -1171,18 +1060,18 @@ export default {
         unitName2: null,
         taskProgress: null,
         releaseUnit: null,
-        executableUnit: null,
+        executableUnit: null
       };
       this.resetForm("form");
     },
     zidainType(item) {
-     // this.queryParams.type = item.dictValue;
+      // this.queryParams.type = item.dictValue;
       this.getList();
       // console.log(item)
     },
     // 发布单位选中触发
     selectPeo3(val) {
-      getDept2().then((res) => {
+      getDept2().then(res => {
         this.users = res.data;
       });
       this.queryParams.adminId = val.id;
@@ -1203,13 +1092,13 @@ 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;
     },
     // 获取执行人
     getZhuChi(id) {
-      deptUser(id).then((res) => {
+      deptUser(id).then(res => {
         // this.renYuan = res.data;
         this.executor = res.data;
         console.log(this.executor);
@@ -1229,7 +1118,7 @@ export default {
 
     // 查询计划类型
     getdict() {
-      getDicts(this.dictType.dictType).then((res) => {
+      getDicts(this.dictType.dictType).then(res => {
         this.ziDian = res.data;
       });
     },
@@ -1268,7 +1157,7 @@ export default {
       // this.form.endTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
 
       // 获取执行单位列表
-      getDept2().then((res) => {
+      getDept2().then(res => {
         // console.log(res,2)
         this.users = res.data;
 
@@ -1278,13 +1167,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      getDept2().then((res) => {
+      getDept2().then(res => {
         // console.log(res,2)
         this.users = res.data;
         console.log(this.users);
       });
       const id = row.id || this.ids;
-      getWorkTask(id).then((response) => {
+      getWorkTask(id).then(response => {
         this.form = response.data;
         this.form.type = parseInt(this.form.type);
         // this.getDept2()
@@ -1300,7 +1189,7 @@ export default {
         parseInt(this.workTaskList[0].common) == 1 ||
         this.workTaskList[0].common == 2
       ) {
-        this.rylist.map((item) => {
+        this.rylist.map(item => {
           row.peopleName.split(",").forEach((items, index) => {
             if (item.userId == items) {
               // console.log(item.nickName)
@@ -1309,7 +1198,7 @@ export default {
           });
         });
       } else if (parseInt(this.workTaskList[0].common) == 0) {
-        this.rylist.map((item) => {
+        this.rylist.map(item => {
           row.peopleName.split(",").forEach((items, index) => {
             if (item.userId == items) {
               // console.log(item.nickName)
@@ -1326,13 +1215,13 @@ export default {
         parseInt(this.workTaskList[0].common) == 1 ||
         this.workTaskList[0].common == 2
       ) {
-        this.getdeptList.map((item) => {
+        this.getdeptList.map(item => {
           if (item.deptId == row.adminId) {
             deptName = item.deptName;
           }
         });
       } else if (parseInt(this.workTaskList[0].common) == 0) {
-        this.getdeptList.map((item) => {
+        this.getdeptList.map(item => {
           if (item.deptId == row.adminId) {
             deptName = item.deptName;
           }
@@ -1342,7 +1231,7 @@ export default {
     },
     unit4Format(row, column) {
       var deptName = "";
-      this.ziDian.map((item) => {
+      this.ziDian.map(item => {
         if (item.dictSort == row.type) {
           deptName = item.dictLabel;
         }
@@ -1359,7 +1248,7 @@ export default {
         this.form.fileName = this.form.file[0].name;
         this.form.file = this.form.file[0].url;
       }
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.adminId === this.form.unitId) {
             alert("发布单位和执行单位不能相同");
@@ -1368,14 +1257,14 @@ export default {
             this.form.peopleId = this.form.peopleName;
             console.log(this.form);
             if (this.form.id != null) {
-              updateWorkTask(this.form).then((response) => {
+              updateWorkTask(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.queryParams.type = "";
                 this.open = false;
                 this.getList();
               });
             } else {
-              addWorkTask(this.form).then((response) => {
+              addWorkTask(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -1407,7 +1296,7 @@ export default {
     },
     submitForm1() {
       // console.log(this.Progress)
-      this.$refs["Progress"].validate((valid) => {
+      this.$refs["Progress"].validate(valid => {
         if (valid) {
           this.Progress.taskId = this.jinduId;
           this.Progress.schedule = this.Progress.planProgress;
@@ -1417,7 +1306,7 @@ export default {
           }
 
           console.log(this.Progress);
-          uploadProgress(this.Progress).then((res1) => {
+          uploadProgress(this.Progress).then(res1 => {
             this.$modal.msgSuccess("上传成功");
             // this.Progress
             this.reset();
@@ -1437,7 +1326,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除?")
-        .then(function () {
+        .then(function() {
           return delWorkTask(ids);
         })
         .then(() => {
@@ -1471,7 +1360,7 @@ export default {
           this.exportLoading = true;
           return exportWorkTask(this.daoruobj);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
           this.open4 = false;
@@ -1480,13 +1369,13 @@ export default {
     },
     // 发布单位接口
     getdept() {
-      getDept().then((res) => {
+      getDept().then(res => {
         this.part = res.data;
       });
     },
     // 获取执行单位列表
     getdeptlist() {
-      getDeptList().then((res) => {
+      getDeptList().then(res => {
         this.ExecutableUnit = res.data;
         console.log(this.ExecutableUnit);
       });
@@ -1519,8 +1408,8 @@ export default {
     // 获取发布单位id
     issueunit(id) {
       this.form.adminId = id;
-    },
-  },
+    }
+  }
 };
 </script>
 <style>