“yueshang” 1 år sedan
förälder
incheckning
36642d9808

+ 1 - 1
src/api/backend/taskInfo.js

@@ -69,7 +69,7 @@ export function getTaskInfoPage2(data) {
     return request({
         url: "/backend/task-info/page2",
         method: "POST",
-        params: data,
+        data: data,
     });
 }
 //根据id获取除了周期性任务外的详情

+ 7 - 7
src/views/backend/activeInspect/index.vue

@@ -17,8 +17,8 @@
                         :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="检查日期" prop="inspectTime">
-                <el-date-picker v-model="queryParams.inspectTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+            <el-form-item label="检查日期" prop="inspectTimes">
+                <el-date-picker v-model="queryParams.inspectTimes" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
                     type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                     :default-time="['00:00:00', '23:59:59']" />
             </el-form-item>
@@ -91,11 +91,11 @@
             @pagination="getList" />
 
         <!-- 对话框(添加 / 修改) -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                <el-form-item label="检查项id" prop="inspId">
+        <el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+                <!-- <el-form-item label="检查项id" prop="inspId">
                     <el-input v-model="form.inspId" placeholder="请输入检查项id" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="检查项名称" prop="inspName">
                     <el-input v-model="form.inspName" placeholder="请输入检查项名称" />
                 </el-form-item>
@@ -175,7 +175,7 @@ export default {
                 inspCode: null,
                 inspType: null,
                 inspContent: null,
-                inspectTime: [],
+                inspectTimes: [],
                 isdenger: null,
                 isreport: null,
             },

+ 349 - 275
src/views/backend/mine/info.vue

@@ -1,8 +1,15 @@
 <template>
-    <div class="app-container">
-        <!-- 搜索工作栏 -->
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-            <!-- <el-form-item label="任务名称" prop="task_name">
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <!-- <el-form-item label="任务名称" prop="task_name">
                 <el-input v-model="queryParams.task_name" placeholder="请输入任务名称" clearable
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
@@ -12,7 +19,7 @@
                         :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item> -->
-            <!-- <el-form-item label="任务状态" prop="taskStatus">
+      <!-- <el-form-item label="任务状态" prop="taskStatus">
                 <el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable size="small">
                     <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
                         :label="dict.label" :value="dict.value" />
@@ -27,7 +34,7 @@
                     type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                     :default-time="['00:00:00', '23:59:59']" />
             </el-form-item> -->
-            <!-- <el-form-item label="所属单位" prop="orgId">
+      <!-- <el-form-item label="所属单位" prop="orgId">
                 <el-input v-model="queryParams.orgId" placeholder="请输入所属单位" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="检查结果" prop="inspResult">
@@ -36,55 +43,83 @@
                         :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="是否隐患" prop="isdenger">
-                <el-select v-model="queryParams.isdenger" placeholder="请选择是否隐患" clearable size="small">
-                    <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value"
-                        :label="dict.label" :value="dict.value" />
-                </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="状态" prop="status">
+      <el-form-item label="是否隐患" prop="isdenger">
+        <el-select
+          v-model="queryParams.isdenger"
+          placeholder="请选择是否隐患"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="parseInt(dict.value)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="状态" prop="status">
                 <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
                     <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
                         :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item> -->
-            <!-- <el-form-item label="检查项名称" prop="inspectName">
+      <!-- <el-form-item label="检查项名称" prop="inspectName">
                 <el-input v-model="queryParams.inspectName" placeholder="请输入检查项名称" clearable
                     @keyup.enter.native="handleQuery" />
             </el-form-item> -->
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
-        <!-- 操作工具栏 -->
-        <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                     v-hasPermi="['backend:inspect-his:create']">新增</el-button>
             </el-col> -->
-            <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                    :loading="exportLoading" v-hasPermi="['backend:inspect-his:export']">导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-        <!-- 列表 -->
-        <el-table v-loading="loading" :data="list">
-            <el-table-column label="ID" align="center" prop="id" />
-            <!-- <el-table-column label="任务名称" align="center" prop="task_name" />
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['backend:inspect-his:export']"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column
+        label="检查项名称"
+        align="center"
+        prop="insp_name"
+        width="200"
+      />
+      <!-- <el-table-column label="任务名称" align="center" prop="task_name" />
             <el-table-column label="任务类型" align="center" prop="task_type">
                 <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.task_type" />
                 </template>
             </el-table-column> -->
-            <el-table-column label="任务内容" align="center" prop="description" />
-            <!-- <el-table-column label="任务状态" align="center" prop="taskStatus">
+    
+      <!-- <el-table-column label="任务状态" align="center" prop="taskStatus">
                 <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.taskStatus" />
                 </template>
             </el-table-column> -->
-            <!-- <el-table-column label="任务积分" align="center" prop="taskScore" />
+      <!-- <el-table-column label="任务积分" align="center" prop="taskScore" />
             <el-table-column label="检查日期" align="center" prop="inspectTime" width="180">
                 <template v-slot="scope">
                     <span>{{ parseTime(scope.row.inspectTime) }}</span>
@@ -96,64 +131,92 @@
                     <dict-tag :type="DICT_TYPE.DENGER_HANDLE" :value="scope.row.inspResult" />
                 </template>
             </el-table-column> -->
-            <!-- <el-table-column label="检查频次" align="center" prop="inspectFrequency">
+      <!-- <el-table-column label="检查频次" align="center" prop="inspectFrequency">
                 <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.CHECK_FRE" :value="scope.row.inspectFrequency" />
                 </template>
             </el-table-column> -->
-            <el-table-column label="是否隐患" align="center" prop="isdenger">
-                <template v-slot="scope">
-                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isdenger" />
-                </template>
-            </el-table-column>
-            <!-- <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="是否隐患" align="center" prop="isdenger">
+        <template v-slot="scope">
+          <dict-tag
+            :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+            :value="scope.row.isdenger"
+          />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="状态" align="center" prop="status">
                 <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
                 </template>
             </el-table-column> -->
-            <el-table-column label="检查项名称" align="center" prop="insp_name" width="200" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template v-slot="scope">
-                    <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
-                    <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+
+      <el-table-column label="任务内容" align="center" prop="description" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template v-slot="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleSee(scope.row)"
+            >查看</el-button
+          >
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['backend:inspect-his:update']">修改</el-button>
                     <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                         v-hasPermi="['backend:inspect-his:delete']">删除</el-button> -->
-                </template>
-            </el-table-column>
-        </el-table>
-        <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
-        <!-- 对话框(查看) -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-                <el-form-item label="任务名称" prop="task_name">
-                    <strong>{{ form.task_name }}</strong>
-                    <!-- <el-input v-model="form.taskName" placeholder="请输入任务名称" /> -->
-                </el-form-item>
-                <el-form-item label="任务类型" prop="task_type">
-                    <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="form.task_type" />
-                    <!-- <el-select v-model="form.taskType" placeholder="请选择任务类型">
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 对话框(查看) -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      v-dialogDrag
+      append-to-body
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="检查项名称" prop="insp_name">
+          <strong>{{ form.insp_name }}</strong>
+          <!-- <el-input v-model="form.taskName" placeholder="请输入任务名称" /> -->
+        </el-form-item>
+        <!-- <el-form-item label="任务类型" prop="task_type">
+          <dict-tag
+            :type="DICT_TYPE.INFRA_CONFIG_TYPE"
+            :value="form.task_type"
+          /> -->
+          <!-- <el-select v-model="form.taskType" placeholder="请选择任务类型">
                         <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-form-item>
-                <el-form-item label="任务内容">
-                    <strong>{{ form.description }}</strong>
-                    <!-- <editor v-model="form.description" :min-height="192" /> -->
-                </el-form-item>
-                <el-form-item label="任务状态" prop="taskStatus">
-                    <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="form.taskStatus" />
-                    <!-- <el-radio-group v-model="form.taskStatus">
+        <!-- </el-form-item> -->
+        <el-form-item label="任务内容">
+          <strong>{{ form.description }}</strong>
+          <!-- <editor v-model="form.description" :min-height="192" /> -->
+        </el-form-item>
+        <!-- <el-form-item label="任务状态" prop="taskStatus">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="form.taskStatus" /> -->
+          <!-- <el-radio-group v-model="form.taskStatus">
                         <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
                             :label="dict.value">{{ dict.label }}</el-radio>
                     </el-radio-group> -->
-                </el-form-item>
-                <!-- <el-form-item label="任务积分" prop="taskScore">
+        <!-- </el-form-item> -->
+        <!-- <el-form-item label="任务积分" prop="taskScore">
                     <el-input v-model="form.taskScore" placeholder="请输入任务积分" />
                 </el-form-item> -->
-                <!-- <el-form-item label="检查日期" prop="inspectTime">
+        <!-- <el-form-item label="检查日期" prop="inspectTime">
                     <el-date-picker clearable v-model="form.inspectTime" type="date" value-format="timestamp"
                         placeholder="选择检查日期" />
                 </el-form-item>
@@ -166,233 +229,244 @@
                             :label="dict.label" :value="dict.value" />
                     </el-select>
                 </el-form-item> -->
-                <!-- <el-form-item label="检查频次" prop="inspectFrequency">
+        <!-- <el-form-item label="检查频次" prop="inspectFrequency">
                     <el-checkbox-group v-model="form.inspectFrequency">
                         <el-checkbox v-for="dict in this.getDictDatas(DICT_TYPE.CHECK_FRE)" :key="dict.value"
                             :label="dict.value">{{ dict.label }}</el-checkbox>
                     </el-checkbox-group>
                 </el-form-item> -->
-                <!-- <el-form-item label="单位类型" prop="orgType">
+        <!-- <el-form-item label="单位类型" prop="orgType">
                     <el-select v-model="form.orgType" placeholder="请选择单位类型">
                         <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_inspectitem_kind)" :key="dict.value"
                             :label="dict.label" :value="dict.value" />
                     </el-select>
                 </el-form-item> -->
-                <el-form-item label="是否隐患" prop="isdenger">
-                    <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="form.isdenger" />
-                    <!-- <el-radio-group v-model="form.isdenger">
+        <el-form-item label="是否隐患" prop="isdenger">
+          <dict-tag
+            :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+            :value="form.isdenger"
+          />
+          <!-- <el-radio-group v-model="form.isdenger">
                         <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value"
                             :label="dict.value">{{ dict.label }}</el-radio>
                     </el-radio-group> -->
-                </el-form-item>
-                <!-- <el-form-item label="状态" prop="status">
+        </el-form-item>
+        <!-- <el-form-item label="状态" prop="status">
                     <el-radio-group v-model="form.status">
                         <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
                             :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
                     </el-radio-group>
                 </el-form-item> -->
-                <el-form-item label="检查项名称" prop="insp_name">
-                    <strong>{{ form.insp_name }}</strong>
-                    <!-- <el-input v-model="form.insp_name" placeholder="请输入检查项名称" /> -->
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
-    </div>
+        <el-form-item label="检查项名称" prop="insp_name">
+          <strong>{{ form.insp_name }}</strong>
+          <!-- <el-input v-model="form.insp_name" placeholder="请输入检查项名称" /> -->
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { createInspectHis, updateInspectHis, deleteInspectHis, getInspectHis, getInspectHisPage, getSelfInspectHisPage,exportInspectHisExcel } from "@/api/backend/inspectHis"
-import Editor from '@/components/Editor'
+import {
+  createInspectHis,
+  updateInspectHis,
+  deleteInspectHis,
+  getInspectHis,
+  getInspectHisPage,
+  getSelfInspectHisPage,
+  exportInspectHisExcel,
+} from "@/api/backend/inspectHis";
+import Editor from "@/components/Editor";
 
 export default {
-    name: "InspectHis",
-    components: {
-        Editor,
-    },
+  name: "InspectHis",
+  components: {
+    Editor,
+  },
 
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 导出遮罩层
-            exportLoading: false,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 检查项历史列表
-            list: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示弹出层
-            open: false,
-            // 查询参数
-            queryParams: {
-                pageNo: 1,
-                pageSize: 10,
-                taskName: null,
-                taskType: null,
-                taskStatus: null,
-                taskScore: null,
-                inspectTime: [],
-                orgId: null,
-                inspResult: null,
-                inspectFrequency: null,
-                isdenger: null,
-                status: null,
-                inspectName: null,
-                userId: null,
-            },
-            // 表单参数
-            // 表单参数
-            form: {
-                status: 0
-            },
-            // 表单校验
-            rules: {
-                status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
-            }
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 检查项历史列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        taskName: null,
+        taskType: null,
+        taskStatus: null,
+        taskScore: null,
+        inspectTime: [],
+        orgId: null,
+        inspResult: null,
+        inspectFrequency: null,
+        isdenger: null,
+        status: null,
+        inspectName: null,
+        userId: null,
+      },
+      // 表单参数
+      // 表单参数
+      form: {
+        status: 0,
+      },
+      // 表单校验
+      rules: {
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.queryParams.userId = this.$store.state.user.id;
+    this.getList();
+  },
+  methods: {
+    /** 查看按钮操作 */
+    handleSee(row) {
+      this.reset();
+      const id = row.id;
+      console.log(row, "rowroworowr");
+      // getInspectHisPage(id).then((response) => {
+      //    = response.data;
+      this.open = true;
+      this.title = "检查结果详情";
+      // });
+      this.form = row;
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getSelfInspectHisPage(this.queryParams).then((response) => {
+        this.list = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        taskName: undefined,
+        taskType: undefined,
+        taskContent: undefined,
+        taskStatus: undefined,
+        taskScore: undefined,
+        inspectTime: undefined,
+        orgId: undefined,
+        inspResult: undefined,
+        inspectFrequency: [],
+        orgType: undefined,
+        isdenger: undefined,
+        status: 0,
+        inspectName: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加检查项历史";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getInspectHis(id).then((response) => {
+        this.form = response.data;
+        this.form.inspectFrequency = this.form.inspectFrequency.split(",");
+        this.open = true;
+        this.title = "修改检查项历史";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateInspectHis(this.form).then((response) => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
         }
+        // 添加的提交
+        createInspectHis(this.form).then((response) => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
     },
-    created() {
-        this.queryParams.userId = this.$store.state.user.id
-        this.getList()
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal
+        .confirm('是否确认删除名称为"' + row.task_name + '"的数据项?')
+        .then(function () {
+          return deleteInspectHis(id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    methods: {
-        /** 查看按钮操作 */
-        handleSee(row) {
-            this.reset();
-            const id = row.id;
-            console.log(row,'rowroworowr');
-            // getInspectHisPage(id).then((response) => {
-                // this.form = response.data;
-                this.open = true;
-                this.title = "检查结果详情";
-            // });
-        },
-        /** 查询列表 */
-        getList() {
-            this.loading = true
-            // 执行查询
-            getSelfInspectHisPage(this.queryParams).then(response => {
-                this.list = response.data.records
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        /** 取消按钮 */
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        /** 表单重置 */
-        reset() {
-            this.form = {
-                id: undefined,
-                taskName: undefined,
-                taskType: undefined,
-                taskContent: undefined,
-                taskStatus: undefined,
-                taskScore: undefined,
-                inspectTime: undefined,
-                orgId: undefined,
-                inspResult: undefined,
-                inspectFrequency: [],
-                orgType: undefined,
-                isdenger: undefined,
-                status: 0,
-                inspectName: undefined,
-            }
-            this.resetForm("form")
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNo = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm")
-            this.handleQuery()
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset()
-            this.open = true
-            this.title = "添加检查项历史"
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset()
-            const id = row.id
-            getInspectHis(id).then(response => {
-                this.form = response.data
-                this.form.inspectFrequency = this.form.inspectFrequency.split(",")
-                this.open = true
-                this.title = "修改检查项历史"
-            })
-        },
-        /** 提交按钮 */
-        submitForm() {
-
-            this.$refs["form"].validate((valid) => {
-                if (!valid) {
-                    return
-                }
-                // 修改的提交
-                if (this.form.id != null) {
-                    updateInspectHis(this.form).then((response) => {
-                        this.$modal.msgSuccess("修改成功")
-                        this.open = false
-                        this.getList()
-                    })
-                    return
-                }
-                // 添加的提交
-                createInspectHis(this.form).then((response) => {
-                    this.$modal.msgSuccess("新增成功")
-                    this.open = false
-                    this.getList()
-                })
-            })
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const id = row.id
-            this.$modal
-            .confirm('是否确认删除名称为"' + row.task_name + '"的数据项?')
-                .then(function () {
-                    return deleteInspectHis(id)
-                })
-                .then(() => {
-                    this.getList()
-                    this.$modal.msgSuccess("删除成功")
-                })
-                .catch(() => { })
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            // 处理查询参数
-            let params = { ...this.queryParams }
-            params.pageNo = undefined
-            params.pageSize = undefined
-            // 执行导出
-            this.$modal
-            .confirm("是否确认导出?")
-                .then(() => {
-                    this.exportLoading = true
-                    return exportInspectHisExcel(params)
-                })
-                .then((response) => {
-                    this.$download.excel(response, "检查结果.xls")
-                    this.exportLoading = false
-                })
-                .catch(() => { })
-        },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal
+        .confirm("是否确认导出?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportInspectHisExcel(params);
+        })
+        .then((response) => {
+          this.$download.excel(response, "检查结果.xls");
+          this.exportLoading = false;
+        })
+        .catch(() => {});
     },
-}
+  },
+};
 </script>

+ 3 - 2
src/views/backend/taskInfo/index.vue

@@ -1316,6 +1316,7 @@ export default {
     },
     /** 查询列表 */
     getList() {
+      this.loading=true
       this.queryParams.taskStatus = this.taskStatus;
       if (this.selectedTab == "type0") {
         this.queryParams.creator = this.$store.state.user.id;
@@ -1333,9 +1334,9 @@ export default {
           this.loading = false;
         });
       } else {
-        console.log("this.queryParams", this.queryParams);
         // 执行查询        getNoPeriodicityPage
-        getTaskInfoPage2(JSON.stringify(this.queryParams)).then(
+        const data=JSON.stringify(this.queryParams)
+        getTaskInfoPage2(data).then(
           (response) => {
             this.list = response.data != null ? response.data.list : [];
             console.log(response.data.list, "query1");

+ 1 - 0
src/views/backend/taskInfos/index.vue

@@ -1315,6 +1315,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.queryParams.taskStatus = this.taskStatus;
+
       if (this.selectedTab == "type0") {
         this.queryParams.creator = this.$store.state.user.id;
       } else {