Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/emergencyPlanStartRecord/index.vue

@@ -61,7 +61,7 @@
            type="selection"
            width="55"
        />
        <el-table-column prop="planId" label="应急预案" min-width="120" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="planName" label="应急预案" min-width="120" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="userName" label="启动人"  min-width="120" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="startCreate" label="启动时间"  min-width="120" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip sortable></el-table-column>
@@ -128,8 +128,8 @@
} from '@element-plus/icons-vue'
import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue';
import SelectEmergencyPlan from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/selectEmergencyPlan.vue'
import {emergencyPlanLogApi} from "/@/api/emergencyPlanLog";
import {contingencyApi} from "/@/api/contingency";
import {emergencyPlanLogApi} from "/@/api/contingencyManagement/emergencyPlanLog";
import {contingencyApi} from "/@/api/contingencyManagement/contingency";

export default defineComponent({
  name: 'systemUser',
@@ -170,6 +170,7 @@
    //重置
    const submitReset = () => {
      listQuery.searchParams.planId = '';
      listQuery.searchParams.planName = '';
      onSubmit();
    };
    const warning = ref(true);