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

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/emergencyPlanStartRecord/index.vue

@@ -9,7 +9,7 @@
        >
          <el-form-item prop="telephone" >
            <el-input
                v-model="listQuery.searchParams.planId"
                v-model="listQuery.searchParams.planName"
                placeholder="请选择应急预案"
                class="input-with-select"
            >
@@ -61,8 +61,8 @@
            type="selection"
            width="55"
        />
        <el-table-column prop="planId" label="应急预案" min-width="120" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="userId" 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>
        <el-table-column label="操作" width="200" align="center" fixed="right">
@@ -72,11 +72,11 @@
                <View />
              </el-icon>查看
            </el-button>
            <el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">
              <el-icon style="margin-right: 5px;">
                <EditPen />
              </el-icon>修改
            </el-button>
<!--            <el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">-->
<!--              <el-icon style="margin-right: 5px;">-->
<!--                <EditPen />-->
<!--              </el-icon>修改-->
<!--            </el-button>-->
            <el-button size="small" text type="primary" @click="onRowDel(scope.row.id)">
              <el-icon>
                <Delete />
@@ -99,7 +99,7 @@
        />
      </div>
    </el-card>
    <SelectEmergencyPlan ref="showRef"/>
    <SelectEmergencyPlan ref="showRef" @SearchUser="onUser"/>
    <OpenSee ref="editRef" @myAdd="onMyAdd" />
  </div>
</template>
@@ -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);
@@ -181,7 +182,7 @@
      for (let i = 0; i < valId.length; i++) {
        arr.push(valId[i].id);
      }
      deleteAll.value = arr.toString();
      deleteAll.value = arr;
      if (val.length == 1) {
        warning.value = false;
        danger.value = false;
@@ -216,6 +217,11 @@
    const daiInpt=()=>{
      showRef.value.openDailog()
    }
    const onUser = (e:any) => {
      console.log(e)
      listQuery.searchParams.planId=e.id
      listQuery.searchParams.planName=e.name
    };
    // 删除用户
    const onRowDel = (data: any) => {
      ElMessageBox.confirm('确定删除所选项吗?', '提示',{
@@ -224,7 +230,7 @@
        type: 'warning',
      }).then(() => {
        emergencyPlanLogApi()
            .deleteEmergencyPlanLog(data)
            .deleteEmergencyPlanLog([data])
            .then((res) => {
              if (res.data.code == 200) {
                ElMessage({
@@ -321,6 +327,8 @@
      deleteAll,
      warning,
      danger,
      total,
      onUser,
      handleSelectionChange,
    };
  },