zhanbei

src/views/bdglregular/regularinfo/index.vue

@@ -345,9 +345,9 @@
             type="text"
             v-if="
               scope.row.caoZuoType == '0' &&
-              scope.row.isCaoZuoDept == 0 &&
-              (scope.row.currentState == '未通过' ||
-                scope.row.currentState == '待处理')
+                scope.row.isCaoZuoDept == 0 &&
+                (scope.row.currentState == '未通过' ||
+                  scope.row.currentState == '待处理')
             "
             @click="handleUpdate(scope.row)"
             >整改</el-button
@@ -358,8 +358,8 @@
             @click="shenpifun(scope.row)"
             v-if="
               queryParams.caoZuoType == 0 &&
-              scope.row.isShenPi == 0 &&
-              scope.row.currentState == '待验收'
+                scope.row.isShenPi == 0 &&
+                scope.row.currentState == '待验收'
             "
             >审批</el-button
           >
@@ -413,7 +413,7 @@
             @change="unitCheckIdfun"
             clearable
             placeholder="请选择检查单位"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
               v-for="dict in unitId"
@@ -429,7 +429,7 @@
             @change="inspectedUnitfun"
             clearable
             placeholder="请选择受检单位"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
               v-for="dict in unitId"
@@ -439,30 +439,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="检查单位" prop="unitCheck">
-          <el-select v-model="form.unitCheck" clearable placeholder="请选择检查单位">
-            <el-option
-              v-for="dict in unitId"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>-->
-        <!-- <el-form-item label="受检单位" prop="inspectedUnit">
-          <el-select v-model="form.inspectedUnit" clearable placeholder="请选择受检单位">
-            <el-option
-              v-for="dict in unitId"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>-->
         <el-form-item label="类型" prop="inspectionType">
           <el-select
             v-model="form.inspectionType"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
             clearable
             placeholder="请选择类型"
           >
@@ -474,9 +454,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="单位检查_id" prop="unitCheckId">
-          <el-input v-model="form.unitCheckId" placeholder="请输入单位检查_id" />
-        </el-form-item>-->
         <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
@@ -486,13 +463,13 @@
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择检查时间"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="检查地点" prop="inspectionSite">
           <el-input
             v-model="form.inspectionSite"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
             placeholder="请输入检查地点"
           />
         </el-form-item>
@@ -517,7 +494,7 @@
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择整改时间"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           ></el-date-picker>
         </el-form-item>
         <el-form-item
@@ -530,7 +507,7 @@
             clearable
             @change="chargePeoplefun"
             placeholder="请选择受检负责人"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg != 3"
           >
             <el-option
               v-for="dict in peopleIds"
@@ -540,46 +517,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="负责人" prop="chargePeople">
-          <el-select
-            v-model="form.chargePeople"
-            clearable
-            @change="peopleIdfun"
-            ref="peopleId"
-            placeholder="请选择负责人"
-          >
-            <el-option
-              v-for="dict in peopleIds"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>-->
-        <!-- <el-form-item label="当前状态" prop="currentState">
-          <el-input v-model="form.currentState" placeholder="请输入当前状态" />
-        </el-form-item>-->
-        <!-- <el-form-item label="是由" prop="question">
-          <el-input v-model="form.question" placeholder="请输入是由" />
-        </el-form-item>
-        <el-form-item label="创建人ID" prop="createUserId">
-          <el-input v-model="form.createUserId" placeholder="请输入创建人ID" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUser">
-          <el-input v-model="form.createUser" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="负责人ID" prop="chargePeopleId">
-          <el-input v-model="form.chargePeopleId" placeholder="请输入负责人ID" />
-        </el-form-item>
-        <el-form-item label="负责人" prop="chargePeople">
-          <el-input v-model="form.chargePeople" placeholder="请输入负责人" />
-        </el-form-item>-->
+
         <div class="jiben" v-if="queryParams.caoZuoType == 0">存在问题</div>
         <div class="jiben" v-if="queryParams.caoZuoType == 1">加分事由</div>
         <el-form-item label prop="question">
           <el-input
             v-model="form.question"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
             type="textarea"
             placeholder="请输入内容"
           />
@@ -588,7 +532,7 @@
         <el-form-item label prop="correctiveAction" v-if="jiannum != 0">
           <el-input
             v-model="form.correctiveAction"
-            :disabled="disabled"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg != 3"
             type="textarea"
             placeholder="请输入内容"
           />
@@ -596,7 +540,6 @@
         <div class="jiben" v-if="jiannum != 0">图片举证</div>
         <el-form-item label prop="pictureProof" v-if="jiannum != 0">
           <imageUpload v-model="form.pictureProof" :limit="1" />
-          <!-- <el-input v-model="form.pictureProof" placeholder="请输入图片举证" /> -->
         </el-form-item>
         <div class="jiben" v-if="jiannum != 0">文件举证</div>
         <el-form-item label prop="documentProof" v-if="jiannum != 0">
@@ -663,7 +606,7 @@
             @change="unitCheckIdfun"
             clearable
             placeholder="请选择检查单位"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled"
           >
             <el-option
               v-for="dict in unitId"
@@ -679,7 +622,7 @@
             @change="inspectedUnitfun"
             clearable
             placeholder="请选择受检单位"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled"
           >
             <el-option
               v-for="dict in unitId"
@@ -763,6 +706,212 @@
         <el-button @click="open1 = false" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="open3"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="120px"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="检查单位" prop="unitCheck">
+          <el-select
+            v-model="form.unitCheck"
+            @change="unitCheckIdfun"
+            clearable
+            placeholder="请选择检查单位"
+            :disabled="disabled"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="受检单位" prop="inspectedUnit">
+          <el-select
+            v-model="form.inspectedUnit"
+            @change="inspectedUnitfun"
+            clearable
+            placeholder="请选择受检单位"
+            :disabled="disabled"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检查时间" prop="inspectionTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.inspectionTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择检查时间"
+            :disabled="disabled"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="检查地点" prop="inspectionSite">
+          <el-input
+            v-model="form.inspectionSite"
+            :disabled="disabled"
+            placeholder="请输入检查地点"
+          />
+        </el-form-item>
+        <el-form-item label="分值" prop="score" v-if="jiannum == 0">
+          <!-- <el-input v-model="form.score" type="number" @blur="scoreblur" :disabled="disabled" placeholder="请输入分值" /> -->
+          <el-input-number
+            v-model="form.score"
+            controls-position="right"
+            :min="0"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item
+          label="整改时间"
+          prop="rectificationTime"
+          v-if="queryParams.caoZuoType == 0"
+        >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rectificationTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择整改时间"
+            :disabled="disabled"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="受检负责人"
+          prop="chargePeople"
+          v-if="jiannum != 0"
+        >
+          <el-select
+            v-model="form.chargePeople"
+            clearable
+            @change="chargePeoplefun"
+            placeholder="请选择受检负责人"
+            :disabled="disabled"
+          >
+            <el-option
+              v-for="dict in peopleIds"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="jiben" v-if="queryParams.caoZuoType == 0">存在问题</div>
+        <div class="jiben" v-if="queryParams.caoZuoType == 1">加分事由</div>
+        <el-form-item label prop="question">
+          <el-input
+            v-model="form.question"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">整改措施</div>
+        <el-form-item label prop="correctiveAction" v-if="jiannum != 0">
+          <el-input
+            v-model="form.correctiveAction"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">图片举证</div>
+        <el-form-item label prop="pictureProof" v-if="jiannum != 0">
+          <imageUpload v-model="form.pictureProof" :limit="1" />
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">文件举证</div>
+        <el-form-item label prop="documentProof" v-if="jiannum != 0">
+          <!-- <fileUpload
+            v-model="form.documentProof"
+            :limit="1"
+            :class="{ active: isActive }"
+          /> -->
+          <input
+            label="附件名称"
+            v-model="form.wenjianname"
+            style="width: 600px"
+            class="wenjian"
+          />
+          <a
+            :href="url+form.documentProof"
+            :download="form.wenjianname"
+            title="下载"
+            style="color: white; margin-left: 10px"
+            class="downloadfile"
+            >下载附件</a
+          >
+        </el-form-item>
+        <div class="jiben" v-if="currentState == 1">未通过原因</div>
+        <el-form-item label prop="score" v-if="currentState == 1">
+          <el-input
+            v-model="form.reasonReturn"
+            :disabled="disabled || curr"
+            type="textarea"
+            placeholder="请输入未通过原因"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="btnnum != 0 && btnnum != 1 && zg != 3"
+          >确 定</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm2"
+          v-if="btnnum != 0 && btnnum != 1 && zg == 3"
+          >确 定</el-button
+        >
+        <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
+          >通 过</el-button
+        >
+        <el-button type="primary" @click="zhenggaifun" v-if="btnnum == 0"
+          >重新整改</el-button
+        >
+        <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
+          >确 定</el-button
+        >
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -780,7 +929,7 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listRegularinfos,
+  listRegularinfos
 } from "@/api/bdglregular/regularinfo";
 import { getUserProfile } from "@/api/system/user";
 export default {
@@ -830,7 +979,7 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       },
       // 用户
       user: {},
@@ -841,27 +990,27 @@ export default {
       // 表单校验
       rules: {
         unitCheck: [
-          { required: true, message: "检查单位不能为空", trigger: "change" },
+          { required: true, message: "检查单位不能为空", trigger: "change" }
         ],
         inspectedUnit: [
-          { required: true, message: "受检单位不能为空", trigger: "change" },
+          { required: true, message: "受检单位不能为空", trigger: "change" }
         ],
         inspectionType: [
-          { required: true, message: "类型不能为空", trigger: "change" },
+          { required: true, message: "类型不能为空", trigger: "change" }
         ],
         inspectionTime: [
-          { required: true, message: "检查时间不能为空", trigger: "change" },
+          { required: true, message: "检查时间不能为空", trigger: "change" }
         ],
         inspectionSite: [
-          { required: true, message: "检查地点不能为空", trigger: "blur" },
+          { required: true, message: "检查地点不能为空", trigger: "blur" }
         ],
         score: [{ required: true, message: "分值不能为空", trigger: "blur" }],
         rectificationTime: [
-          { required: true, message: "整改时间不能为空", trigger: "change" },
+          { required: true, message: "整改时间不能为空", trigger: "change" }
         ],
         chargePeople: [
-          { required: true, message: "负责人不能为空", trigger: "change" },
-        ],
+          { required: true, message: "负责人不能为空", trigger: "change" }
+        ]
       },
       //单位
       unitId: [],
@@ -879,6 +1028,9 @@ export default {
       open1: false,
       zg: null,
       isActive: null,
+      sp: null,
+      open3: false,
+      url: process.env.VUE_APP_BASE_API
     };
   },
   created() {
@@ -904,28 +1056,28 @@ export default {
       correctiveAction: null,
       pictureProof: null,
       documentProof: null,
-      caoZuoType: 0,
+      caoZuoType: 0
     };
     // this.danWiess()
     //部门数据
-    getDept().then((res) => {
+    getDept().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
     //调动人员对象
-    listPeople().then((res) => {
+    listPeople().then(res => {
       if (res.code == 200) {
         this.peopleIds = res.rows;
       }
     });
     //检查类型
-    this.getDicts("inspectionType").then((response) => {
+    this.getDicts("inspectionType").then(response => {
       this.inspectionType = response.data;
     });
 
     if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then((res) => {
+      bumenlist(this.$route.query.id).then(res => {
         console.log(1);
         this.regularinfoList = res.rows;
         this.total = res.total;
@@ -958,10 +1110,10 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       };
       if (to.query.id) {
-        bumenlist(to.query.id).then((res) => {
+        bumenlist(to.query.id).then(res => {
           this.regularinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -970,7 +1122,7 @@ export default {
         this.queryParams.inspectedUnitId = to.query.obj.id + "";
         this.queryParams.currentState = to.query.obj.name + "";
 
-        listRegularinfos(this.queryParams).then((res) => {
+        listRegularinfos(this.queryParams).then(res => {
           console.log(res);
           this.regularinfoList = res.rows;
           this.total = res.total;
@@ -982,7 +1134,7 @@ export default {
 
       // listRegularinfos
       // console.log(to.query.obj);
-    },
+    }
   },
   mounted() {
     console.log(0);
@@ -991,7 +1143,7 @@ export default {
   methods: {
     danWiess() {
       // 获取当前用户接口
-      getUserProfile().then((response) => {
+      getUserProfile().then(response => {
         this.user = response.data;
         console.log(this.user);
         // console.log(response.data.dept.deptId+"这是")
@@ -1002,7 +1154,7 @@ export default {
     /** 查询经常性检查列表 */
     getList() {
       this.loading = true;
-      listRegularinfo(this.queryParams).then((response) => {
+      listRegularinfo(this.queryParams).then(response => {
         this.regularinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1011,6 +1163,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open3 = false;
       this.reset();
       this.jiannum = null;
     },
@@ -1038,7 +1191,7 @@ export default {
         correctiveAction: null,
         pictureProof: null,
         documentProof: null,
-        reasonReturn: null,
+        reasonReturn: null
       };
       this.resetForm("form");
     },
@@ -1054,7 +1207,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;
     },
@@ -1107,8 +1260,9 @@ export default {
       console.log(row);
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.form = response.data;
+        this.disabled = true;
         this.open = true;
         this.title = "修改经常性检查";
         this.jiannum = 1;
@@ -1126,7 +1280,7 @@ export default {
       this.isdisabled = true;
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.form = response.data;
         this.open1 = true;
         this.title = "修改经常性检查";
@@ -1142,22 +1296,24 @@ export default {
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then((response) => {
+      getRegularinfo(id).then(response => {
         this.disabled = true;
         this.form = response.data;
-        this.open = true;
+        this.open3 = true;
         this.title = "修改经常性检查";
         this.jiannum = 1;
         this.btnnum = 0;
         this.isActive = 1;
+        this.sp = 0;
       });
     },
     //通过
     tongguofun() {
-      editissuccess(this.form).then((res) => {
+      editissuccess(this.form).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("审批成功");
           this.open = false;
+          this.open3 = false;
           this.getList();
         }
       });
@@ -1169,6 +1325,8 @@ export default {
       this.disabled = false;
       this.currentState = 1;
       this.curr = false;
+      this.open3 = false;
+      this.open = true;
       // this.reset();
       // editissuccess().then(res => {
       //   if (res.code == 200) {
@@ -1178,45 +1336,57 @@ export default {
     },
     //未通过提交
     weitongguofun() {
-      editisfalse(this.form).then((res) => {
+      editisfalse(this.form).then(res => {
         this.$modal.msgSuccess("操作成功");
         this.open = false;
         this.getList();
       });
     },
     submitForm2() {
-      this.form.documentProof = this.form.documentProof[0].url;
-      // console.log(this.form);
-      editquestion(this.form).then((response) => {
+      if (this.form.documentProof) {
+        if (typeof this.form.documentProof != "string") {
+          let documentProofs = this.form.documentProof;
+          this.form.documentProof = documentProofs[0].url;
+          this.form.wenjianname = documentProofs[0].name;
+        }
+      }
+      this.form.caoZuoType = this.queryParams.caoZuoType;
+      editquestion(this.form).then(response => {
         this.$modal.msgSuccess("整改成功");
         this.open = false;
         this.open1 = false;
+        // this.open3=false;
         this.getList();
       });
     },
     /** 提交按钮 */
     submitForm() {
       // console.log(this.form)
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.documentProof) {
-            this.form.documentProof = this.form.documentProof[0].url;
+            if (typeof this.form.documentProof != "string") {
+              let documentProofs = this.form.documentProof;
+              this.form.documentProof = documentProofs[0].url;
+              this.form.wenjianname = documentProofs[0].name;
+            }
           }
-
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            updateRegularinfo(this.form).then((response) => {
+            updateRegularinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.open1 = false;
+              // this.open3=false;
               this.getList();
             });
           } else {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            addRegularinfo(this.form).then((response) => {
+            addRegularinfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.open1 = false;
+              // this.open3=false;
               this.getList();
             });
           }
@@ -1228,7 +1398,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除经常性检查的数据项？")
-        .then(function () {
+        .then(function() {
           return delRegularinfo(ids);
         })
         .then(() => {
@@ -1246,7 +1416,7 @@ export default {
           this.exportLoading = true;
           return exportRegularinfo(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1275,8 +1445,8 @@ export default {
       if (this.form.score < 0) {
         this.form.score = null;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>
@@ -1411,4 +1581,18 @@ hr {
 ::v-deep .active .upload-file-uploader .el-upload .el-button {
   display: none;
 }
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
+.wenjian {
+  width: 600px !important;
+  height: 33px;
+}
 </style>

src/views/bdglregular/specialinfo/index.vue

@@ -214,15 +214,9 @@
         label="负责人"
         align="center"
         prop="chargePeople"
-        :key="Math.random()"
         v-if="queryParams.caoZuoType == 0"
       />
-      <el-table-column
-        label="分值"
-        align="center"
-        :key="Math.random()"
-        prop="score"
-      >
+      <el-table-column label="分值" align="center" prop="score">
         <template slot-scope="scope">
           <div style="color: rgb(255 106 0)" v-if="queryParams.caoZuoType == 0">
             {{ scope.row.score }}
@@ -269,7 +263,6 @@
         label="当前状态"
         align="center"
         prop="currentState"
-        :key="Math.random()"
         v-if="queryParams.caoZuoType == 0"
       >
         <template slot-scope="scope">
@@ -300,7 +293,6 @@
         label="整改时间"
         align="center"
         prop="rectificationTime"
-        :key="Math.random()"
         v-if="queryParams.caoZuoType == 0"
       />
 
@@ -321,9 +313,9 @@
             type="text"
             v-if="
               queryParams.caoZuoType == 0 &&
-              scope.row.isCaoZuoDept == 0 &&
-              (scope.row.currentState == '未通过' ||
-                scope.row.currentState == '待处理')
+                scope.row.isCaoZuoDept == 0 &&
+                (scope.row.currentState == '未通过' ||
+                  scope.row.currentState == '待处理')
             "
             @click="handleUpdate(scope.row)"
             >整改</el-button
@@ -334,8 +326,8 @@
             @click="shenpifun(scope.row)"
             v-if="
               queryParams.caoZuoType == 0 &&
-              scope.row.isShenPi == 0 &&
-              scope.row.currentState == '待验收'
+                scope.row.isShenPi == 0 &&
+                scope.row.currentState == '待验收'
             "
             >审批</el-button
           >
@@ -386,7 +378,7 @@
             @change="inspectedUnitfun"
             clearable
             placeholder="请选择受检单位"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
               v-for="dict in unitId"
@@ -396,16 +388,158 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="受检单位" prop="inspectedUnit">
-         <el-select v-model="form.unitCheck" clearable placeholder="请选择检查单位">
+        <el-form-item label="检查时间" prop="inspectionTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.inspectionTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择检查时间"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="分值" prop="score" v-if="jiannum == 0">
+          <el-input-number
+            v-model="form.score"
+            controls-position="right"
+            :min="0"
+            :disabled="disabled"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="整改时间" prop="rectificationTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rectificationTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择整改时间"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="受检负责人"
+          prop="chargePeople"
+          v-if="jiannum != 0"
+        >
+          <el-select
+            v-model="form.chargePeople"
+            clearable
+            @change="chargePeoplefun"
+            placeholder="请选择受检负责人"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg != 3"
+          >
+            <el-option
+              v-for="dict in peopleIds"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <div class="jiben" v-if="queryParams.caoZuoType == 0">存在问题</div>
+        <div class="jiben" v-if="queryParams.caoZuoType == 1">加分事由</div>
+        <el-form-item label prop="question">
+          <el-input
+            v-model="form.question"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">整改措施</div>
+        <el-form-item label prop="correctiveAction" v-if="jiannum != 0">
+          <el-input
+            v-model="form.correctiveAction"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg != 3"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">图片举证</div>
+        <el-form-item label prop="pictureProof" v-if="jiannum != 0">
+          <imageUpload v-model="form.pictureProof" :limit="1" />
+          <!-- <el-input v-model="form.pictureProof" placeholder="请输入图片举证" /> -->
+        </el-form-item>
+        <div class="jiben" v-if="jiannum != 0">文件举证</div>
+        <el-form-item
+          label
+          prop="documentProof"
+          :class="{ active: isActive }"
+          v-if="jiannum != 0"
+        >
+          <!-- <fileUpload v-model="form.documentProof" /> -->
+          <fileUpload v-model="form.documentProof" :limit="1" />
+          <!-- <el-input v-model="form.documentProof" placeholder="请输入文件举证" /> -->
+        </el-form-item>
+        <div class="jiben" v-if="currentState == 1">未通过原因</div>
+        <el-form-item label prop="score" v-if="currentState == 1">
+          <el-input
+            v-model="form.reasonReturn"
+            :disabled="disabled || curr"
+            type="textarea"
+            placeholder="请输入未通过原因"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="submitForm"
+          v-if="btnnum != 0 && btnnum != 1 && zg != 3"
+          >确 定</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm2"
+          v-if="btnnum != 0 && btnnum != 1 && zg == 3"
+          >确 定</el-button
+        >
+        <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
+          >通 过</el-button
+        >
+        <el-button type="primary" @click="zhenggaifun" v-if="btnnum == 0"
+          >重新整改</el-button
+        >
+        <el-button type="primary" @click="weitongguofun" v-if="btnnum == 1"
+          >确 定</el-button
+        >
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="open3"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="120px"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="受检单位" prop="inspectedUnit">
+          <el-select
+            v-model="form.inspectedUnit"
+            @change="inspectedUnitfun"
+            clearable
+            placeholder="请选择受检单位"
+            :disabled="disabled"
+          >
             <el-option
               v-for="dict in unitId"
               :key="dict.deptId"
               :label="dict.deptName"
-              :value="dict.deptId"
+              :value="dict"
             ></el-option>
           </el-select>
-        </el-form-item>-->
+        </el-form-item>
         <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
@@ -414,11 +548,10 @@
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择检查时间"
-            :disabled="disabled || this.isdisabled == true"
+            :disabled="disabled"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="分值" prop="score" v-if="jiannum == 0">
-          <!-- <el-input v-model="form.score" @blur="scoreblur" :disabled="disabled" type="number" placeholder="请输入分值" /> -->
           <el-input-number
             v-model="form.score"
             controls-position="right"
@@ -426,9 +559,6 @@
             :disabled="disabled"
           ></el-input-number>
         </el-form-item>
-        <!-- <el-form-item label="积分" prop="score">
-          <el-input v-model="form.score" placeholder="请输入积分" />
-        </el-form-item>-->
         <el-form-item label="整改时间" prop="rectificationTime">
           <el-date-picker
             clearable
@@ -441,9 +571,6 @@
             :disabled="disabled"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="当前状态" prop="currentState">
-          <el-input v-model="form.currentState" placeholder="请输入当前状态" />
-        </el-form-item>-->
         <el-form-item
           label="受检负责人"
           prop="chargePeople"
@@ -464,19 +591,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="整改负责人" prop="chargePeopleId">
-          <el-select
-            v-model="form.chargePeopleId"
-            clearable
-            ref="chargePeopleId"
-            placeholder="请选择负责人"
-          >
-            <el-option v-for="dict in peopleIds" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="整改负责人" prop="chargePeople">
-          <el-input v-model="form.chargePeople" placeholder="请输入整改负责人" />
-        </el-form-item>-->
         <div class="jiben" v-if="queryParams.caoZuoType == 0">存在问题</div>
         <div class="jiben" v-if="queryParams.caoZuoType == 1">加分事由</div>
         <el-form-item label prop="question">
@@ -502,9 +616,28 @@
           <!-- <el-input v-model="form.pictureProof" placeholder="请输入图片举证" /> -->
         </el-form-item>
         <div class="jiben" v-if="jiannum != 0">文件举证</div>
-        <el-form-item label prop="documentProof" v-if="jiannum != 0">
+        <el-form-item
+          label
+          prop="documentProof"
+          :class="{ active: isActive }"
+          v-if="jiannum != 0"
+        >
           <!-- <fileUpload v-model="form.documentProof" /> -->
-          <fileUpload v-model="form.documentProof" :limit="1" />
+          <!-- <fileUpload v-model="form.documentProof" :limit="1" /> -->
+          <input
+            label="附件名称"
+            v-model="form.wenjianname"
+            style="width: 600px"
+            class="wenjian"
+          />
+          <a
+            :href="url+form.documentProof"
+            :download="form.wenjianname"
+            title="下载"
+            style="color: white; margin-left: 10px"
+            class="downloadfile"
+            >下载附件</a
+          >
           <!-- <el-input v-model="form.documentProof" placeholder="请输入文件举证" /> -->
         </el-form-item>
         <div class="jiben" v-if="currentState == 1">未通过原因</div>
@@ -516,18 +649,18 @@
             placeholder="请输入未通过原因"
           />
         </el-form-item>
-        <!-- <el-form-item label="创建人ID" prop="createUserId">
-          <el-input v-model="form.createUserId" placeholder="请输入创建人ID" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createUser">
-          <el-input v-model="form.createUser" placeholder="请输入创建人" />
-        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
           type="primary"
           @click="submitForm"
-          v-if="btnnum != 0 && btnnum != 1"
+          v-if="btnnum != 0 && btnnum != 1 && zg != 3"
+          >确 定</el-button
+        >
+        <el-button
+          type="primary"
+          @click="submitForm2"
+          v-if="btnnum != 0 && btnnum != 1 && zg == 3"
           >确 定</el-button
         >
         <el-button type="primary" @click="tongguofun" v-if="btnnum == 0"
@@ -559,7 +692,7 @@ import {
   editissuccess,
   editisfalse,
   bumenlist,
-  listSpecialinfos,
+  listSpecialinfos
 } from "@/api/bdglregular/specialinfo";
 
 export default {
@@ -604,24 +737,24 @@ export default {
         documentProof: null,
         createUserId: null,
         createUser: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         inspectedUnit: [
-          { required: true, message: "受检单位不能为空", trigger: "change" },
+          { required: true, message: "受检单位不能为空", trigger: "change" }
         ],
         inspectionTime: [
-          { required: true, message: "检查时间不能为空", trigger: "change" },
+          { required: true, message: "检查时间不能为空", trigger: "change" }
         ],
         rectificationTime: [
-          { required: true, message: "整改时间为空", trigger: "change" },
+          { required: true, message: "整改时间为空", trigger: "change" }
         ],
         chargePeople: [
-          { required: true, message: "整改负责人不能为空", trigger: "change" },
-        ],
+          { required: true, message: "整改负责人不能为空", trigger: "change" }
+        ]
       },
       //单位
       unitId: [],
@@ -635,6 +768,10 @@ export default {
       curr: null,
       // 是否禁用
       isdisabled: false,
+      zg: null,
+      open3: false,
+      isActive: null,
+      url: process.env.VUE_APP_BASE_API,
     };
   },
   created() {
@@ -655,22 +792,22 @@ export default {
       documentProof: null,
       createUserId: null,
       createUser: null,
-      caoZuoType: 0,
+      caoZuoType: 0
     };
     //部门数据
-    getDept().then((res) => {
+    getDept().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
     //调动人员对象
-    listPeople().then((res) => {
+    listPeople().then(res => {
       if (res.code == 200) {
         this.peopleIds = res.rows;
       }
     });
     if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then((res) => {
+      bumenlist(this.$route.query.id).then(res => {
         this.specialinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -679,7 +816,7 @@ export default {
       this.queryParams.inspectedUnitId = this.$route.query.obj.id;
       this.queryParams.currentState = this.$route.query.obj.name + "";
 
-      listSpecialinfos(this.queryParams).then((res) => {
+      listSpecialinfos(this.queryParams).then(res => {
         this.specialinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -707,11 +844,11 @@ export default {
         documentProof: null,
         createUserId: null,
         createUser: null,
-        caoZuoType: 0,
+        caoZuoType: 0
       };
       if (to.query.id) {
         console.log(1);
-        bumenlist(to.query.id).then((res) => {
+        bumenlist(to.query.id).then(res => {
           this.specialinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
@@ -721,7 +858,7 @@ export default {
         this.queryParams.inspectedUnitId = to.query.obj.id;
         this.queryParams.currentState = to.query.obj.name + "";
 
-        listSpecialinfos(this.queryParams).then((res) => {
+        listSpecialinfos(this.queryParams).then(res => {
           console.log(res);
           this.specialinfoList = res.rows;
           this.total = res.total;
@@ -731,13 +868,13 @@ export default {
         console.log(3);
         this.getList();
       }
-    },
+    }
   },
   methods: {
     /** 查询专项检查列表 */
     getList() {
       this.loading = true;
-      listSpecialinfo(this.queryParams).then((response) => {
+      listSpecialinfo(this.queryParams).then(response => {
         this.specialinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -746,6 +883,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open3 = false;
       this.reset();
     },
     // 表单重置
@@ -767,7 +905,7 @@ export default {
         createTime: null,
         createUserId: null,
         createUser: null,
-        updateTime: null,
+        updateTime: null
       };
       this.resetForm("form");
     },
@@ -783,7 +921,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;
     },
@@ -824,13 +962,15 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then((response) => {
+      getSpecialinfo(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改专项检查";
         this.jiannum = 1;
         this.btnnum = null;
-        this.disabled = false;
+
+        this.disabled = true;
+        this.zg = 3;
         if (this.form.currentState == "未通过") {
           this.currentState = 1;
           this.curr = true;
@@ -842,11 +982,11 @@ export default {
       this.isdisabled = true;
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then((response) => {
+      getSpecialinfo(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改专项检查";
-        this.jiannum = 1;
+        this.jiannum = 0;
         this.btnnum = null;
         this.disabled = false;
         if (this.form.currentState == "未通过") {
@@ -859,21 +999,23 @@ export default {
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getSpecialinfo(id).then((response) => {
+      getSpecialinfo(id).then(response => {
         this.disabled = true;
         this.form = response.data;
-        this.open = true;
+        this.open3 = true;
         this.title = "修改经常性检查";
         this.jiannum = 1;
+        this.isActive = 1;
         this.btnnum = 0;
       });
     },
     //通过
     tongguofun() {
-      editissuccess(this.form).then((res) => {
+      editissuccess(this.form).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("审批成功");
           this.open = false;
+          this.open3 = false;
           this.getList();
         }
       });
@@ -885,38 +1027,64 @@ export default {
       this.disabled = false;
       this.currentState = 1;
       this.curr = false;
+      this.open3 = false;
+      this.open = true;
     },
     //未通过提交
     weitongguofun() {
-      editisfalse(this.form).then((res) => {
+      editisfalse(this.form).then(res => {
         this.$modal.msgSuccess("操作成功");
         this.open = false;
         this.getList();
       });
     },
+    submitForm2() {
+      if (this.form.documentProof) {
+        if (typeof this.form.documentProof != "string") {
+          let documentProofs = this.form.documentProof;
+          this.form.documentProof = documentProofs[0].url;
+          this.form.wenjianname = documentProofs[0].name;
+        }
+      }
+      this.form.caoZuoType = this.queryParams.caoZuoType;
+      editquestion(this.form).then(response => {
+        this.$modal.msgSuccess("整改成功");
+        this.open = false;
+        this.open3 = false;
+        // this.open3=false;
+        this.getList();
+      });
+    },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
+          console.log(1);
           if (this.form.documentProof) {
-            console.log(this.form.documentProof[0]);
-            // this.form.documentProof = this.form.documentProof[0];
+            if (typeof this.form.documentProof != "string") {
+              let documentProofs = this.form.documentProof;
+              this.form.documentProof = documentProofs[0].url;
+              this.form.wenjianname = documentProofs[0].name;
+            }
+          }
+
+          if (this.form.id != null) {
+            this.form.caoZuoType = this.queryParams.caoZuoType;
+            editquestion(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.open3 = false;
+              this.getList();
+            });
+          } else {
+            this.form.caoZuoType = this.queryParams.caoZuoType;
+            addSpecialinfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.open3 = false;
+              this.getList();
+            });
           }
-          // if (this.form.id != null) {
-          //   this.form.caoZuoType = this.queryParams.caoZuoType;
-          //   editquestion(this.form).then((response) => {
-          //     this.$modal.msgSuccess("修改成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // } else {
-          //   this.form.caoZuoType = this.queryParams.caoZuoType;
-          //   addSpecialinfo(this.form).then((response) => {
-          //     this.$modal.msgSuccess("新增成功");
-          //     this.open = false;
-          //     this.getList();
-          //   });
-          // }
         }
       });
     },
@@ -925,7 +1093,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除专项检查的数据项？")
-        .then(function () {
+        .then(function() {
           return delSpecialinfo(ids);
         })
         .then(() => {
@@ -943,7 +1111,7 @@ export default {
           this.exportLoading = true;
           return exportSpecialinfo(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -972,8 +1140,8 @@ export default {
       if (this.form.score < 0) {
         this.form.score = null;
       }
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>
@@ -1096,4 +1264,18 @@ hr {
   height: 1px;
   background-color: rgba(204, 204, 204, 0.5);
 }
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
+.wenjian {
+  width: 600px !important;
+  height: 33px;
+}
 </style>

src/views/taishi/index.vue

@@ -1044,7 +1044,7 @@ import {
   getantiepidemic,
   antiepidemicArchivesList,
   getLeavlNumber,
-  zongjinrizhiban,
+  zongjinrizhiban
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -1085,7 +1085,7 @@ export default {
         indexHeader: "序号",
         oddRowBGC: "",
         evenRowBGC: "",
-        columnWidth: [100, 200, 200, 100],
+        columnWidth: [100, 200, 200, 100]
       },
       config2: {
         header: ["人员", "份数", "日期"],
@@ -1099,7 +1099,7 @@ export default {
           ["行7列1", "行7列2", "行7列3"],
           ["行8列1", "行8列2", "行8列3"],
           ["行9列1", "行9列2", "行9列3"],
-          ["行10列1", "行10列2", "行10列3"],
+          ["行10列1", "行10列2", "行10列3"]
         ],
         index: false,
         columnWidth: [],
@@ -1107,13 +1107,13 @@ export default {
         headerBGC: "",
         indexHeader: "序号",
         oddRowBGC: "",
-        evenRowBGC: "",
+        evenRowBGC: ""
       },
       listdata: [
         { name: "发射一营", a: 0, b: 1, c: 1, d: 0 },
         { name: "发射二营", a: 0, b: 1, c: 1, d: 0 },
         { name: "发射三营", a: 0, b: 1, c: 1, d: 0 },
-        { name: "发射四营", a: 0, b: 1, c: 1, d: 0 },
+        { name: "发射四营", a: 0, b: 1, c: 1, d: 0 }
       ],
       timer2: null,
       times: null,
@@ -1125,11 +1125,11 @@ export default {
         { name: "政治工作部值班员", value: "" },
         { name: "保障部值班员", value: "" },
         { name: "值班通信员", value: "" },
-        { name: "值班总人数", value: "" },
+        { name: "值班总人数", value: "" }
       ],
       // 检查督导
       jianCanName: [],
-      jianCanScore: [],
+      jianCanScore: []
     };
   },
   created() {
@@ -1138,7 +1138,7 @@ export default {
     // }
     // Cookies.set("shuaxin", "true");
     //大队人员在位数据
-    zaiweipeople().then((res) => {
+    zaiweipeople().then(res => {
       if (res.code == 200) {
         // this.zwlist = res.data[0];
         let arr = res.data[0];
@@ -1148,7 +1148,7 @@ export default {
       }
     });
     //今日值班
-    jinrizhiban().then((res) => {
+    jinrizhiban().then(res => {
       if (res.data != null) {
         this.jrzblist = [];
         for (var i in res.data) {
@@ -1163,20 +1163,20 @@ export default {
           } else if (i == "politicalName") {
             this.jrzblist.push({
               name: "政治工作部值班员",
-              value: res.data[i],
+              value: res.data[i]
             });
           } else if (i == "guaranteeName") {
             this.jrzblist.push({
               name: "保障部值班员",
-              value: res.data[i],
+              value: res.data[i]
             });
           } else if (i == "messengerName") {
             this.jrzblist.push({
               name: "值班通信员",
-              value: res.data[i],
+              value: res.data[i]
             });
           } else if (i == "detachmentName") {
-            zongjinrizhiban().then((res) => {
+            zongjinrizhiban().then(res => {
               this.jrzblist.push({ name: "值班总人数", value: res.data[1] });
             });
           }
@@ -1184,11 +1184,11 @@ export default {
       }
     });
     //登记落实
-    tongjiluoshi().then((res) => {
+    tongjiluoshi().then(res => {
       this.djlslist = res.data;
     });
     //集中文印
-    rizongwenyin().then((res) => {
+    rizongwenyin().then(res => {
       // console.log(res.data[0])
       this.wylist = res.data;
       if (this.wylist[1]) {
@@ -1204,25 +1204,32 @@ export default {
       // console.log(this.wylist)
     });
     //军车
-    juncheguanli().then((res) => {
+    juncheguanli().then(res => {
       // console.log(res)
+      for (var i in res.data) {
+        if (res.data[i] >= 0) {
+          res.data[i];
+        } else {
+          res.data[i] = 0;
+        }
+      }
       this.jclist = res.data;
     });
     //涉密移动载体
-    getNumber().then((res) => {
+    getNumber().then(res => {
       // console.log(res.data[0])
       this.smztlist = res.data;
     });
     //营具
-    getantiepidemic().then((res) => {
+    getantiepidemic().then(res => {
       this.yingjulist = res.data;
     });
     //防疫
-    antiepidemicArchivesList().then((res) => {
+    antiepidemicArchivesList().then(res => {
       this.fylist = res.data;
     });
     //人员请销假
-    getLeavlNumber().then((res) => {
+    getLeavlNumber().then(res => {
       console.log(res);
       this.qjlist = res.data;
     });
@@ -1231,14 +1238,14 @@ export default {
   mounted() {
     this.$forceUpdate();
     //各单位在位情况
-    gedanweizaiweiqingkaung().then((res) => {
+    gedanweizaiweiqingkaung().then(res => {
       if (res.code == 200) {
         this.zwqklist = res.data;
         this.center2();
       }
     });
     //外出人员占比
-    waichurenyuanzhanbi().then((res) => {
+    waichurenyuanzhanbi().then(res => {
       this.wclist = res.data;
       this.center3();
     });
@@ -1267,7 +1274,7 @@ export default {
 
       var className = [];
       var datav = [];
-      this.zwqklist.map((item) => {
+      this.zwqklist.map(item => {
         for (var i in item) {
           className.push(i);
           datav.push(item[i]);
@@ -1301,7 +1308,7 @@ export default {
           "#39B3FF",
           "#39B3FF",
           "#39B3FF",
-          "#39B3FF",
+          "#39B3FF"
         ];
         const option4 = {
           dataZoom: [
@@ -1316,28 +1323,28 @@ export default {
               left: "95%",
               handleColor: "#39B3FF",
               startValue: z, //数据窗口范围的起始百分比
-              endValue: s,
+              endValue: s
             },
             {
               type: "inside",
               yAxisIndex: [0],
               startValue: z, //数据窗口范围的起始百分比
-              endValue: s,
-            },
+              endValue: s
+            }
           ],
           grid: {
             left: 10,
             right: 30,
             bottom: 10,
             top: 1,
-            containLabel: true,
+            containLabel: true
           },
           tooltip: {
             trigger: "axis",
             axisPointer: {
-              type: "none",
+              type: "none"
             },
-            formatter: function (params) {
+            formatter: function(params) {
               return (
                 params[0].name +
                 "<br/>" +
@@ -1347,21 +1354,21 @@ export default {
                 " : " +
                 params[0].value
               );
-            },
+            }
           },
           xAxis: {
             position: "top",
             show: false,
             type: "value",
             splitLine: {
-              show: false,
+              show: false
             },
             axisLabel: {
               show: true,
               textStyle: {
-                color: "#fff", //更改坐标轴文字颜色
-              },
-            },
+                color: "#fff" //更改坐标轴文字颜色
+              }
+            }
           },
           yAxis: [
             {
@@ -1370,19 +1377,19 @@ export default {
               axisLabel: {
                 show: true,
                 textStyle: {
-                  color: "#fff",
-                },
+                  color: "#fff"
+                }
               },
               splitLine: {
-                show: false,
+                show: false
               },
               axisTick: {
-                show: false,
+                show: false
               },
               axisLine: {
-                show: false,
+                show: false
               },
-              data: className,
+              data: className
             },
             {
               type: "category",
@@ -1393,14 +1400,14 @@ export default {
               axisLabel: {
                 textStyle: {
                   color: "#ffffff",
-                  fontSize: "12",
-                },
+                  fontSize: "12"
+                }
                 // formatter: function(datav) {
                 //   return datav;
                 // }
               },
-              data: data2,
-            },
+              data: data2
+            }
           ],
           series: [
             {
@@ -1411,18 +1418,18 @@ export default {
               itemStyle: {
                 normal: {
                   barBorderRadius: 0,
-                  color: (params) => {
+                  color: params => {
                     return colorList9[params.dataIndex];
-                  },
-                },
+                  }
+                }
               },
               barWidth: 10,
-              data: datav,
-            },
-          ],
+              data: datav
+            }
+          ]
         };
         myChartv.setOption(option4);
-        window.addEventListener("resize", function () {
+        window.addEventListener("resize", function() {
           myChartv.resize();
         });
       }
@@ -1451,7 +1458,7 @@ export default {
         }
       }
       var n = 0;
-      data1.map((item) => {
+      data1.map(item => {
         n += item;
       });
       // data1=[50,10,60,90,10];
@@ -1462,34 +1469,34 @@ export default {
         grid: {
           left: 70,
           bottom: "25%",
-          top: "15%",
+          top: "15%"
         },
         xAxis: {
           axisLabel: {
             padding: 15,
             interval: 0,
             textStyle: {
-              color: function (param, index) {
+              color: function(param, index) {
                 return myColor[index];
               },
               fontSize: 12,
-              fontWeight: 100,
+              fontWeight: 100
             },
-            margin: 10,
+            margin: 10
           },
           splitLine: {
-            show: false,
+            show: false
           },
           axisLine: {
-            show: false,
+            show: false
           },
           splitArea: {
-            show: false,
+            show: false
           },
           axisTick: {
-            show: false,
+            show: false
           },
-          data: data,
+          data: data
         },
         yAxis: {
           max: n,
@@ -1498,29 +1505,29 @@ export default {
           axisLine: {
             lineStyle: {
               color: "#6e6e6e",
-              width: 1,
-            },
+              width: 1
+            }
           },
           axisLabel: {
             interval: 0,
             formatter: "{value}",
             textStyle: {
               fontSize: 12,
-              color: "#fff",
+              color: "#fff"
             },
-            margin: 20,
+            margin: 20
           },
           splitLine: {
-            show: true,
+            show: true
           },
           axisTick: {
             show: true,
             lineStyle: {
               color: "#fff",
               width: 1,
-              height: 5,
-            },
-          },
+              height: 5
+            }
+          }
         },
         series: [
           {
@@ -1531,103 +1538,103 @@ export default {
             fontSize: 12,
             itemStyle: {
               fontSize: 12,
-              color: function (params) {
+              color: function(params) {
                 const colorList = [
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
-                  ]),
+                      color: "#39b3ff"
+                    }
+                  ])
                 ];
                 return colorList[params.dataIndex];
-              },
+              }
             },
-            data: data1,
+            data: data1
           },
           {
             name: "",
@@ -1639,9 +1646,9 @@ export default {
             symbolPosition: "end",
             itemStyle: {
               color: "#e2e2e2",
-              opacity: 0,
+              opacity: 0
             },
-            data: data1,
+            data: data1
           },
           {
             name: "",
@@ -1652,103 +1659,103 @@ export default {
             z: 12,
             itemStyle: {
               opacity: 1,
-              color: function (params) {
+              color: function(params) {
                 const colorList = [
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
+                      color: "#39b3ff"
+                    }
                   ]),
                   new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                     {
                       offset: 0,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 0.5,
-                      color: "#39b3ff",
+                      color: "#39b3ff"
                     },
                     {
                       offset: 1,
-                      color: "#39b3ff",
-                    },
-                  ]),
+                      color: "#39b3ff"
+                    }
+                  ])
                 ];
                 return colorList[params.dataIndex];
-              },
+              }
             },
-            data: data1,
+            data: data1
           },
           {
             name: "",
@@ -1768,23 +1775,23 @@ export default {
               fontSize: 16,
               textShadowBlur: "0",
               textShadowOffsetX: 1,
-              textShadowOffsetY: 1,
+              textShadowOffsetY: 1
             },
             itemStyle: {
               opacity: 1,
-              color: function (params) {
+              color: function(params) {
                 const colorList = [
                   "#39b3ff",
                   "#39b3ff",
                   "#39b3ff",
                   "#39b3ff",
-                  "#39b3ff",
+                  "#39b3ff"
                 ];
                 return colorList[params.dataIndex];
-              },
+              }
             },
             symbolPosition: "end",
-            data: data1,
+            data: data1
           },
           {
             name: "",
@@ -1792,7 +1799,7 @@ export default {
             rippleEffect: {
               period: 1,
               scale: 5,
-              brushType: "fill",
+              brushType: "fill"
             },
             z: 20,
             symbolPosition: "end",
@@ -1801,17 +1808,17 @@ export default {
             symbolOffset: [0, 9],
             itemStyle: {
               normal: {
-                color: "#fff",
-              },
+                color: "#fff"
+              }
             },
-            data: data1,
-          },
-        ],
+            data: data1
+          }
+        ]
       };
       const backImg = "/asset/get/s/data-1622796959507-HTopachtJ.png";
       myChartss._dom.style.backgroundImage = "url('" + backImg + "')";
       myChartss.setOption(option12);
-      window.addEventListener("resize", function () {
+      window.addEventListener("resize", function() {
         myChartss.resize();
       });
     },
@@ -1820,7 +1827,7 @@ export default {
       var myChart = echarts.init(document.getElementById("center-a-main"));
       var jc = null;
       // 检查督导
-      await getJieCha().then((res) => {
+      await getJieCha().then(res => {
         console.log(res);
         for (var index = 0; index < res.data.score.length; index++) {
           res.data.score[index] = res.data.score[index].slice(0, -3);
@@ -1830,57 +1837,57 @@ export default {
       var option = {
         color: ["#00CCFF"],
         tooltip: {
-          color: "#00CCFF",
+          color: "#00CCFF"
         },
         grid: {
           containLabel: true,
           left: "2%",
           top: 30,
           right: "3%",
-          bottom: "3%",
+          bottom: "3%"
         },
         xAxis: [
           {
             type: "category",
             data: jc.name,
             axisTick: {
-              alignWithLabel: true,
+              alignWithLabel: true
             },
             nameTextStyle: {
-              color: "#fff",
+              color: "#fff"
             },
             axisLine: {
               lineStyle: {
-                color: "#fff",
-              },
+                color: "#fff"
+              }
             },
             axisLabel: {
               textStyle: {
-                color: "#fff",
-              },
-            },
-          },
+                color: "#fff"
+              }
+            }
+          }
         ],
         yAxis: [
           {
             type: "value",
             axisLabel: {
               textStyle: {
-                color: "#fff",
+                color: "#fff"
               },
               formatter: "{value}",
-              color: "#00e4ff",
+              color: "#00e4ff"
             },
             splitLine: {
               lineStyle: {
                 color: "#fff",
-                opacity: 0.3,
-              },
+                opacity: 0.3
+              }
             },
             axisLine: {
-              show: false,
-            },
-          },
+              show: false
+            }
+          }
         ],
         series: [
           {
@@ -1896,10 +1903,10 @@ export default {
                 show: true,
                 position: "top",
                 formatter: "{c}",
-                color: "#ff9000",
-              },
+                color: "#ff9000"
+              }
             },
-            data: jc.score,
+            data: jc.score
           },
           {
             name: "",
@@ -1907,15 +1914,15 @@ export default {
             symbolSize: [30, 10],
             symbolOffset: [0, 5],
             z: 12,
-            data: jc.score,
+            data: jc.score
           },
           {
             type: "bar",
             itemStyle: {
               normal: {
                 color: "#00e4ff",
-                opacity: 0.7,
-              },
+                opacity: 0.7
+              }
             },
             barWidth: "30",
             data: jc.score,
@@ -1924,15 +1931,15 @@ export default {
               symbol: "none",
               label: {
                 position: "middle",
-                formatter: "{b}",
-              },
-            },
+                formatter: "{b}"
+              }
+            }
           },
           {
             type: "effectScatter",
             silent: true,
             tooltip: {
-              show: false,
+              show: false
             },
             zlevel: 3,
             symbolSize: 10,
@@ -1940,18 +1947,18 @@ export default {
             rippleEffect: {
               brushType: "stroke",
               color: "#00e4ff",
-              scale: 5,
+              scale: 5
             },
             itemStyle: {
-              color: "#00e4ff",
+              color: "#00e4ff"
             },
             hoverAnimation: true,
-            data: [0, 0, 0, 0, 0, 0, 0],
-          },
-        ],
+            data: [0, 0, 0, 0, 0, 0, 0]
+          }
+        ]
       };
       myChart.setOption(option);
-      window.addEventListener("resize", function () {
+      window.addEventListener("resize", function() {
         myChart.resize();
       });
     },
@@ -1982,7 +1989,7 @@ export default {
         }
         this.times = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       }, 500); /* 每500毫秒执行一次，实现动态显示时间效果 */
-    },
+    }
   },
   computed: {
     defaultOption() {
@@ -1994,7 +2001,7 @@ export default {
         openWatch: true, // 开启数据实时监控刷新dom
         singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000, // 单步运动停止的时间(默认值1000ms)
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
       };
     },
     defaultOption2() {
@@ -2006,9 +2013,9 @@ export default {
         openWatch: true, // 开启数据实时监控刷新dom
         singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000, // 单步运动停止的时间(默认值1000ms)
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
       };
-    },
+    }
   },
   destroyed() {
     clearInterval(this.timer); // 清除定时器
@@ -2017,8 +2024,8 @@ export default {
     this.timer2 = null;
   },
   components: {
-    vueSeamlessScroll,
-  },
+    vueSeamlessScroll
+  }
 };
 </script>