修改bug

src/views/backend/inspectHis/index.vue

@@ -7,9 +7,12 @@
           <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="任务类型" prop="taskType">
-          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
+          <!-- <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TASK_TYPE)" :key="dict.value" :label="dict.label"
               :value="dict.value" />
+          </el-select> -->
+          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
+            <el-option v-for="dict in this.filteredDataType" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="任务状态" prop="taskStatus">
@@ -47,11 +50,11 @@
                                 :value="dict.value" />
                             </el-select>
                           </el-form-item> -->
-        <el-form-item prop="inspectName">
+        <el-form-item prop="inspName">
           <template #label>
             <div style="min-width: auto;">检查项名称</div>
           </template>
-          <el-input v-model="queryParams.inspectName" placeholder="请输入检查项名称" clearable
+          <el-input v-model="queryParams.inspName" placeholder="请输入检查项名称" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item>
@@ -354,6 +357,7 @@ export default {
         isdenger: null,
         status: null,
         inspectName: null,
+        inspName:null
       },
       // 表单参数
       // 表单参数
@@ -373,6 +377,7 @@ export default {
       searchType: "",
       // searchName:"",
       // searchMisson:'',
+      filteredDataType:[]
     };
   },
   props: ["orgId", "taskType"],
@@ -392,7 +397,13 @@ export default {
     // }
   },
   mounted() {
-
+    this.filteredDataType = this.getDictDatas(DICT_TYPE.TASK_TYPE).filter(
+      ({ label }) =>
+        label === "周期性检查" ||
+        label === "临时性任务" ||
+        label == "隐患复查" ||
+        label == "消防巡查"
+    );
     console.log(typeof 'this.taskType :>> ', typeof this.taskType);
     //挂载window.onresize事件(动态设置table高度)
     window.addEventListener("resize", () => {
@@ -419,7 +430,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.orgId = this.orgId
-      this.queryParams.taskType = this.taskType
+      // this.queryParams.taskType = this.taskType
       // 执行查询
       getInspectHisPage(this.queryParams).then((response) => {
         this.list = response.data.list;
@@ -552,10 +563,11 @@ export default {
     typeChange(e) {
       // console.log(e,'change');
       this.searchType = e
-      getInspectHisPage({ pageNo: 1, pageSize: 10, taskType: e }).then(res => {
-        this.list = res.data.list
-        // console.log(res,'ooo');
-      })
+      this.queryParams.taskType=e
+      // getInspectHisPage({ pageNo: 1, pageSize: 10, taskType: e }).then(res => {
+      //   this.list = res.data.list
+      //   // console.log(res,'ooo');
+      // })
     }
   },
 };

src/views/backend/meeting/index.vue

@@ -25,14 +25,14 @@
                 @keyup.enter.native="handleQuery" />
             </el-form-item> -->
         <el-form-item label="会议类型" prop="meetingType">
-          <!-- <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
+          <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CONFIG_TYPE)" :key="dict.value"
               :label="dict.label" :value="dict.value" />
-          </el-select> -->
-          <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
+          </el-select>
+          <!-- <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
             <el-option key="1" value="1" label="工作会议"></el-option>
             <el-option key="2" value="2" label="培训会议"></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
@@ -75,8 +75,8 @@
       <el-table-column label="会议主题" align="center" prop="meetingSubject" />
       <el-table-column label="会议类型" align="center" prop="meetingType">
         <template v-slot="scope">
-          <!-- <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.meetingType" /> -->
-          <span>{{ scope.row.meetingType === '1' ? '工作会议' : '培训会议' }}</span>
+          <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.meetingType" />
+          <!-- <span>{{ scope.row.meetingType === '1' ? '工作会议' : '培训会议' }}</span> -->
         </template>
       </el-table-column>
       <!-- <el-table-column label="状态" align="center" prop="status">
@@ -101,7 +101,7 @@
               <el-dropdown-item command="handleOrg" size="mini" type="text"
                 icon="el-icon-circle-check">分配单位</el-dropdown-item>
               <el-dropdown-item command="handPublish" size="mini" type="text"
-                icon="el-icon-circle-check">发布</el-dropdown-item>
+                icon="el-icon-circle-check">{{scope.row.status==1?'发布':'已发布'}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="lookMes(scope.row)">查看详情</el-button>
@@ -300,7 +300,7 @@ export default {
     // 更多操作
     handleCommand(command, index, row) {
       const id = row.id
-      getMeeting(id).then(response => {
+      getMeeting({ id: id, pageNo: 1, pageSize: 10 }).then(response => {
         this.form = response.data
       })
       switch (command) {
@@ -526,7 +526,7 @@ export default {
     handPublish(row) {
       if (row.id) {
         broadMeeting({ mid: row.id }).then(response => {
-          // this.$modal.msgSuccess("分配角色成功");
+          this.$modal.msgSuccess("发布成功");
 
           this.getList()
         });

src/views/backend/taskInfo/index.vue

@@ -59,9 +59,7 @@
         <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
           <el-table-column label="ID" align="center" prop="id" />
           <el-table-column label="任务名称" align="center">
-            <template v-slot="scope">{{
-               scope.row.taskInfoDO.taskName
-            }}</template>
+            <template v-slot="scope">   {{scope.row.taskInfoDO!=null ?scope.row.taskInfoDO.taskName:"" }}</template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
             <template v-slot="scope">
@@ -128,7 +126,7 @@
           <el-table-column label="ID" align="center" prop="id" />
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
-              {{ scope.row.taskInfoDO.taskName }}
+              {{ scope.row.taskInfoDO!=null ?scope.row.taskInfoDO.taskName:"" }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
@@ -197,7 +195,7 @@
           <el-table-column label="ID" align="center" prop="id" />
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
-              {{ scope.row.taskInfoDO.taskName }}
+              {{scope.row.taskInfoDO!=null ?scope.row.taskInfoDO.taskName:"" }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
@@ -268,7 +266,7 @@
           <el-table-column label="ID" align="center" prop="id" />
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
-              {{scope.row.taskInfoDO.taskName  }}
+              {{scope.row.taskInfoDO!=null ?scope.row.taskInfoDO.taskName:'' }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
@@ -444,7 +442,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="持续时间" prop="time">
+        <el-form-item label="持续时间" prop="time" v-if="form.time">
           <el-date-picker clearable v-model="form.time" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
             range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"
             placeholder="请选择任务持续时间" />
@@ -646,6 +644,7 @@ export default {
         status: 0,
         time: "",
         orgTypes: [],
+        startTime:null
       },
       defaultProps: {},
       // 表单校验
@@ -700,9 +699,9 @@ export default {
   },
   created() { },
   mounted() {
-    this.filteredData = this.getDictDatas(DICT_TYPE.TASK_TYPE).filter(
-      ({ label }) => label === "周期性检查" || label === "临时性任务"
-    );
+    // this.filteredData = this.getDictDatas(DICT_TYPE.TASK_TYPE).filter(
+    //   ({ label }) => label === "周期性检查" || label === "临时性任务"
+    // );
     this.filteredDataType = this.getDictDatas(DICT_TYPE.TASK_TYPE).filter(
       ({ label }) =>
         label === "周期性检查" ||
@@ -751,6 +750,7 @@ export default {
       console.log(e._props.name, "e._props.name;e._props.name;");
       const name = e._props.name;
       this.queryParams.iscycle = "";
+      this.list=[]
       switch (name) {
         case "type1":
           this.queryParams.taskStatus = "1";
@@ -851,7 +851,7 @@ export default {
       this.queryParams.taskStatus = this.taskStatus;
       this.loading = true;
       if (this.selectedTab == "type0") {
-        this.queryParams.creator = this.$store.state.user.i;
+        this.queryParams.creator = this.$store.state.user.id;
       } else {
         this.queryParams.creator = undefined;
       }
@@ -867,9 +867,9 @@ export default {
         });
       } else {
         // 执行查询
-        console.log(this.queryParams, 'query1');
         getNoPeriodicityPage(this.queryParams).then((response) => {
           this.list = response.data.list;
+          console.log(response.data.list, 'query1');
           this.total = response.data.total;
           this.loading = false;
         });
@@ -906,10 +906,11 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
-      getTaskInfoPage({ taskType: this.queryParams.taskType, taskStatus: this.queryParams?.taskStatus, taskName: this.queryParams?.taskName, pageNo: 1, pageSize: 10 }).then(res => {
-        this.list = res.data.list;
-        this.total = res.data.total;
-      })
+      this.getList()
+      // getTaskInfoPage({ taskType: this.queryParams.taskType, taskStatus: this.queryParams?this.queryParams.taskStatus:0, taskName: this.queryParams?this.queryParams.taskName, pageNo: 1, pageSize: 10 }).then(res => {
+      //   this.list = res.data.list;
+      //   this.total = res.data.total;
+      // })
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -939,23 +940,22 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id;
+      const id = row.taskId?row.taskId:row.id;
       getTaskInfo(id).then((response) => {
-        this.form = response.data;
+        this.form = response.data!=null?response.data:{};
         this.open = true;
         this.title = "修改任务信息管理";
         const arr = [];
-        arr.push(this.form.startTime, this.form.endTime);
-        this.$set(this.form, "time", arr);
+        if(this.form.startTime!=null){
+          arr.push(this.form.startTime, this.form.endTime);
+          this.$set(this.form, "time", arr);
+        }
+       
         // this.togetOneInspgList(this.form.id)
         // this.getTaskBroadPageList(this.form.id)
       });
       getcycletask(id).then((response) => {
         response.data.orgType.map((i) => this.form.orgTypes.push(i.org_type));
-        console.log(
-          this.form.orgTypes,
-          "啊啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦"
-        );
       });
     },
     /** 提交按钮 */
@@ -988,15 +988,19 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.id;
+      const id = row.taskId?row.taskId:row.id;
+      console.log('row', row)
+      let name=row.taskInfoDO!=null?row.taskInfoDO.taskName:(row.taskName?row.taskName:'')
+      let that=this
       this.$modal
-        .confirm('是否确认删除名称为"' + row.taskName + '"的数据项?')
+        .confirm('是否确认删除名称为"' + name + '"的数据项?')
         .then(function () {
           return deleteTaskInfo({ id: id });
         })
         .then(() => {
-          this.getList();
           this.$modal.msgSuccess("删除成功");
+          console.log('first', first, this.selectedTab)
+          that.getList();
         })
         .catch(() => { });
     },
@@ -1141,7 +1145,7 @@ export default {
     handleInsp(row) {
       this.inspreset();
       if (row.id) {
-        this.form.id = row.id;
+        this.form.id = row.taskId?row.taskId:row.id;
       }
       // 打开弹窗
       this.openinsp = true;
@@ -1190,7 +1194,7 @@ export default {
     // ===============已分检查项========================
     handleSelectedInsp(row) {
       if (row.id) {
-        this.form.id = row.id;
+        this.form.id = row.taskId?row.taskId:row.id;
       }
       // 打开弹窗
       this.openSelectedInsp = true;

src/views/unitorg/microStation/index.vue

@@ -11,8 +11,11 @@
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="建站日期" prop="builtOn">
-          <el-date-picker clearable v-model="queryParams.builtOn" type="date" value-format="yyyy-MM-dd"
-            placeholder="建站日期" />
+          <el-date-picker v-model="queryParams.builtOn" style="width: 240px" value-format="yyyy-MM-dd"
+            type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']" />
+          <!-- <el-date-picker clearable v-model="queryParams.builtOn" type="date" value-format="yyyy-MM-dd"
+            placeholder="建站日期" /> -->
           <!-- <el-input v-model="queryParams.builtOn" placeholder="请输入建站日期" clearable @keyup.enter.native="handleQuery" /> -->
         </el-form-item>
         <el-form-item label="负责人（站长）" prop="charger">
@@ -109,7 +112,7 @@
             </el-form-item></el-col>
           <el-col :span="11">
             <el-form-item label="建站日期" prop="builtOn">
-              <el-date-picker clearable v-model="form.builtOn" type="date" value-format="date" placeholder="建站日期"
+              <el-date-picker clearable v-model="form.builtOn" type="date" value-format="yyyy-MM-dd" placeholder="建站日期"
                 style="width: 100%;" />
             </el-form-item></el-col>
         </el-row>