13937891274
2022-08-04 44dae1108f8bc7134fbbc39a09c581bf3c4e0bb2
数据对接
已修改20个文件
811 ■■■■ 文件已修改
src/api/emergencyDrillEvaluation/index.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/emergencyDrillPlan/index.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/emergencyMaterialsInspection/index.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/emergencyPlan/index.ts 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/maintenanceEmergencyMaterials/index.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/DailogS.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/userCheckbox/index.vue 238 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/contingency/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/openAdd.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/openEdit.vue 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/panManagement/component/abolishLibrary.vue 147 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/contingencyManagement/panManagement/index.vue 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/emergencyDrillEvaluation/index.ts
@@ -36,8 +36,9 @@
        // 应急演练实施评价删除
        deleteEmergencyDrillEvaluation: (params:object) => {
            return request({
                url: `/emergencyDrillEvaluation/batchDelete/${params}`,
                method: 'get',
                url: `/emergencyDrillEvaluation/batchDelete`,
                method: 'post',
                data: params
            });
        },
    }
src/api/emergencyDrillPlan/index.ts
@@ -36,8 +36,9 @@
        // 演练计划发布删除
        deleteReleaseDrillPlan: (params:object) => {
            return request({
                url: `/emergencyDrillPlan/batchDelete/${params}`,
                method: 'get',
                url: `/emergencyDrillPlan/batchDelete`,
                method: 'post',
                data: params
            });
        },
    }
src/api/emergencyMaterialsInspection/index.ts
@@ -36,8 +36,9 @@
        // 应急物资检查删除
        deleteEmergencyMaterialsInspection: (params:object) => {
            return request({
                url: `/emergencySuppliesInspect/batchDelete/${params}`,
                method: 'get',
                url: `/emergencySuppliesInspect/batchDelete`,
                method: 'post',
                data: params
            });
        },
    }
src/api/emergencyPlan/index.ts
@@ -41,5 +41,12 @@
                data: params
            });
        },
        // 应急队伍废止
        EmergencyTeam: (params:object) => {
            return request({
                url: `/emergencyPlan/updateAbolish/${params}/abolishStatus=false`,
                method: 'get',
            });
        },
    }
}
src/api/maintenanceEmergencyMaterials/index.ts
@@ -36,8 +36,9 @@
        // 应急物资保养删除
        deleteMaintenanceEmergencyMaterials: (params:object) => {
            return request({
                url: `/emergencySuppliesMaintain/batchDelete/${params}`,
                method: 'get',
                url: `/emergencySuppliesMaintain/batchDelete`,
                method: 'post',
                data: params
            });
        },
    }
src/components/equipmentDailog/DailogS.vue
@@ -192,7 +192,7 @@
                </el-table>
            </el-tab-pane>
            <el-tab-pane label="检查标准设置" name="fourth"
                >checkContent
                >
                <el-button type="primary" size="default" @click="openStandard('新增', '')">新增</el-button>
                <el-table :data="form.checkStandardeDetailList" style="width: 100%">
                    <el-table-column align="center" type="indexNum" label="序号" width="75" />
src/components/userCheckbox/index.vue
@@ -17,14 +17,15 @@
              :data="data"
              :props="defaultProps"
              default-expand-all
              @node-click="handleNodeClick"
              :filter-node-method="filterNode"
          />
        </el-aside>
        <el-container style="margin: 0 15px;min-width:560px;">
          <el-header style="font-size: 12px">
            <el-form :inline="true" :model="formInline" class="demo-form-inline">
            <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
              <el-form-item>
                <el-input size="default" v-model="formInline.name" placeholder="登录名"> </el-input>
                <el-input size="default" v-model="ruleForm.name" placeholder="登录名"> </el-input>
              </el-form-item>
              <el-form-item>
                <el-button size="default" type="primary" class="ml10" @click="onSubmit">
@@ -40,29 +41,37 @@
            <el-table
                :data="tableData"
                :header-cell-style="{background:'#f6f7fa',color:'#909399',fontWeight:400}"
                @cell-click="checkbox"
            >
              <el-table-column type="selection" width="55"/>
              <el-table-column prop="date" label="登录名" width="100" show-overflow-tooltip sortable />
              <el-table-column prop="name" label="用户名" width="100" show-overflow-tooltip sortable />
              <el-table-column prop="address" label="所属机构" width="115"  show-overflow-tooltip sortable />
              <el-table-column prop="department" label="所属部门" width="115" show-overflow-tooltip sortable/>
              <el-table-column  label="状态"
                                width="80"
                                prop="tag"
                                :filters="[
                     { text: '正常', value: 'Home' },
                     { text: '不正常', value: 'Office' },
                   ]"
                                :filter-method="filterTag"
                                filter-placement="bottom-end">
              <el-table-column type="selection"  width="55">
                <template #default="scope">
                  <el-tag
                      :type="scope.row.tag === 'Home' ? '' : 'success'"
                      disable-transitions
                  >{{ scope.row.tag }}</el-tag
                  >
                  <el-checkbox-group v-model="checkbox1">
                    <el-checkbox :label="scope.row.uid" size="large">{{ null }}</el-checkbox>
                  </el-checkbox-group>
                </template>
              </el-table-column>
              <el-table-column prop="realName" label="登录名" width="100" show-overflow-tooltip sortable />
              <el-table-column prop="username" label="用户名" width="100" show-overflow-tooltip sortable />
              <el-table-column prop="address" label="所属机构" width="115"  show-overflow-tooltip sortable />
              <el-table-column prop="address" label="所属部门" width="115" show-overflow-tooltip sortable/>
              <el-table-column align="center" prop="type" label="状态" />
<!--              <el-table-column  label="状态"-->
<!--                                width="80"-->
<!--                                prop="tag"-->
<!--                                :filters="[-->
<!--                     { text: '正常', value: 'Home' },-->
<!--                     { text: '不正常', value: 'Office' },-->
<!--                   ]"-->
<!--                                :filter-method="filterTag"-->
<!--                                filter-placement="bottom-end">-->
<!--                <template #default="scope">-->
<!--                  <el-tag-->
<!--                      :type="scope.row.tag === 'Home' ? '' : 'success'"-->
<!--                      disable-transitions-->
<!--                  >{{ scope.row.tag }}</el-tag-->
<!--                  >-->
<!--                </template>-->
<!--              </el-table-column>-->
            </el-table>
            <div class="pages">
              <el-pagination
@@ -70,11 +79,8 @@
                  v-model:page-size="pageSize"
                  :page-sizes="[10, 20, 30]"
                  :pager-count="5"
                  :small="small"
                  :disabled="disabled"
                  :background="background"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="40"
                  :total="total"
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
              />
@@ -82,9 +88,19 @@
          </el-main>
        </el-container>
        <div style="width: 200px;">
          <el-tag v-for="tag in dynamicTags" :key="tag" class="mx-1" style="margin:5px" closable :disable-transitions="false" @close="handleClose(tag)">
            {{ tag }}
          <div v-if="dynamicTags[0]==''?false:true">
            <el-tag
                v-for="tag in dynamicTags"
                :key="tag"
                class="mx-1"
                style="margin: 5px"
                closable
                :disable-transitions="false"
                @close="handleClose(tag)"
            >
              {{ tag.realName }}
          </el-tag>
          </div>
        </div>
      </el-container>
      <template #footer>
@@ -103,6 +119,7 @@
  defineComponent,
  watch,
  reactive,
  onMounted,
} from 'vue';
import type {
@@ -110,8 +127,12 @@
  // ElTable,
} from 'element-plus'
import {
  ElMessage,
} from 'element-plus';
import {
  FullScreen
} from '@element-plus/icons-vue'
import {goalManagementApi} from "/@/api/goalManagement";
interface Tree {
  id: number
  label: string
@@ -127,10 +148,11 @@
  components: {
    // Search,
  },
  setup() {
  setup(props, { emit }) {
    const isShowDialog = ref(false)
    // 打开弹窗
    const openDialog = () => {
    const openDialog = (type:any) => {
      types.value=type
      isShowDialog.value = true;
    };
    // 关闭弹窗
@@ -142,68 +164,62 @@
      closeDialog();
    };
    //部门树
    const department = () => {
      goalManagementApi()
          .getTreedepartment()
          .then((res) => {
            if (res.data.code == 200) {
              data.value = res.data.data;
            } else {
              ElMessage.error(res.data.msg);
            }
          });
    };
    const defaultProps = {
      label: 'depName',
      children: 'children',
      value: 'depId',
    }
    //部门树查询
    const filterText = ref('')
    const treeRef = ref<InstanceType<typeof ElTree>>()  //实例化
    const defaultProps = {
      children: 'children',
      label: 'label',
    watch(filterText, (val) => {
      treeRef.value!.filter(val);
    });
    // 节点过滤模糊搜索
    const filterNode = (depName: string, data: Tree) => {
      if (!depName) return true
      return data.depName.includes(depName)
    }
    onMounted(() => {
      department();
    });
    //左边树形部分点击获取回调
    const names = ref<any>();
    const handleNodeClick = (data: Tree) => {
      goalManagementApi()
          .getManName(data.depId)
          .then((res) => {
            if (res.data.code == 200) {
              tableData.value=res.data.data
            }else{
              ElMessage.error(res.data.msg);
            }
          });
    };
    // 监听搜索关键字改变
    watch(filterText, (val) => {
      treeRef.value!.filter(val)
    })
    // 节点过滤模糊搜索
    const filterNode = (value: string, data: Tree) => {
      if (!value) return true
      return data.label.includes(value)
    }
    // 树形结构内容
    const data: Tree[] = [
      {
        id: 1,
        label: '广汇能源综合物流发展有限责任公司',
        children: [
          {
            id: 4,
            label: '经营班子',
            children: []
          },
        ],
      },
      {
        id: 2,
        label: '生产运行部',
        children: [
          {
            id: 5,
            label: '工艺二班',
          },
          {
            id: 6,
            label: '灌装一班',
          },
        ],
      },
      {
        id: 3,
        label: '设备部',
        children: [
          {
            id: 7,
            label: '仪表班',
          },
          {
            id: 8,
            label: '机修班',
          },
        ],
      },
    ]
    const data = ref()
    // const item = {
    //   date: '孙刚',
    //   name: '龚赛健',
@@ -211,52 +227,31 @@
    //   tag: '正常',
    // }
    // const tableData = ref(Array.from({ length: 7 }).fill(item))
    const tableData = [
      {
        date: '孙刚',
        name: '孙刚',
        address: '',
        department: '经营班子',
        tag: '正常',
      },
      {
        date: '谭柏',
        name: '谭柏',
        address: '',
        department: '经营班子',
        tag: '正常',
      },
      {
        date: '倪威',
        name: '倪威',
        address: '',
        department: '经营班子',
        tag: '正常',
      },
      {
        date: '倪玲婕',
        name: '倪玲婕',
        address: '',
        department: '经营班子',
        tag: '正常',
      },
    ];
    // 定义表单搜索
    const formInline = reactive({
    const ruleForm = reactive({
      name: '',
    })
    const types=ref()
    // 搜索按钮
    const onSubmit = () => {
      console.log('submit!')
      let obj = JSON.parse(JSON.stringify(dynamicTags.value));
      emit('SearchUser', obj[0],types.value);
      isShowDialog.value = false;
    }
    // const multipleTableRef = ref<InstanceType<typeof ElTable>>()
    // 右方点击添加后显示标签
    const dynamicTags = ref(['Tag 1', 'Tag 2', 'Tag 3']);
    const handleClose = (tag: string) => {
      dynamicTags.value.splice(dynamicTags.value.indexOf(tag), 1);
    const dynamicTags = ref(['']);
    const handleClose = () => {
      dynamicTags.value.push(checkbox1.value)
      // dynamicTags.value.splice(dynamicTags.value.indexOf(tag), 1);
      checkbox1.value = '';
    };
    const checkbox1 = ref('');
    const checkbox = (event: any) => {
      dynamicTags.value[0] = event;
    };
    const tableData = ref();
    // 分页
    const pageIndex = ref(4);
    const pageSize = ref(10);
@@ -286,7 +281,7 @@
      filterNode,
      data,
      tableData,
      formInline,
      ruleForm,
      onSubmit,
      // multipleTableRef,
      handleClose,
@@ -298,6 +293,11 @@
      toggleFullscreen,
      FullScreen,
      full,
      names,
      handleNodeClick,
      types,
      checkbox1,
      checkbox,
    };
  },
});
src/views/contingencyManagement/contingency/index.vue
@@ -142,7 +142,7 @@
import OpenAdd from '../../contingencyManagement/contingency/component/openAdd.vue'
import UpData from '../../contingencyManagement/contingency/component/upData.vue';
import {contingencyApi} from "/@/api/contingency";
import {contingencyApi} from "../../../api/contingency";
export default defineComponent({
  name: 'systemUser',
src/views/contingencyManagement/emergencyDrill/drillImplementationEvaluation/index.vue
@@ -86,7 +86,90 @@
            />
          </div>
        </el-tab-pane>
        <el-tab-pane label="已评价" name="second">Config</el-tab-pane>
        <el-tab-pane label="已评价" name="second">
          <div class="button_Line mb15">
            <div class="button_Left">
              <el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
                <el-icon>
                  <Delete />
                </el-icon>删除
              </el-button>
            </div>
            <!--            <div class="button_Right">-->
            <!--              <el-button @click="upButton">-->
            <!--                <el-icon>-->
            <!--                  <Upload />-->
            <!--                </el-icon>-->
            <!--              </el-button>-->
            <!--              <el-button>-->
            <!--                <el-icon>-->
            <!--                  <Download />-->
            <!--                </el-icon>-->
            <!--              </el-button>-->
            <!--              <el-button>-->
            <!--                <el-icon>-->
            <!--                  <Refresh />-->
            <!--                </el-icon>-->
            <!--              </el-button>-->
            <!--            </div>-->
          </div>
          <el-table
              :data="tableData"
              style="width: 100%"
              ref="multipleTableRef"
              @selection-change="handleSelectionChange"
          >
            <el-table-column
                type="selection"
                width="55"
            />
            <el-table-column prop="emergencyPlanName" label="演练名称" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="drillAddress" label="演练地点" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="drillWay" label="演练方式" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="drillPlanDate" label="计划演练日期" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="drillRecordDate" label="演练记录日期" show-overflow-tooltip sortable></el-table-column>
            <!--            <el-table-column prop="attachments" label="应急预案" show-overflow-tooltip sortable></el-table-column>-->
            <el-table-column label="操作" width="260" align="center" fixed="right">
              <template #default="scope">
                <el-button size="small" text disabled>
                  <el-icon style="margin-right: 5px;">
                    <EditPen />
                  </el-icon>评价
                </el-button>
                <!--                <el-button size="small" text type="primary" @click="onFlowChart(scope.row.id)">-->
                <!--                  审批进度-->
                <!--                </el-button>-->
                <el-button size="small" text type="primary" @click="onApprovalProgress('详情',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 disabled @click="onOpenEdit(scope.row)">
                  查看整改
                </el-button>
              </template>
            </el-table-column>
          </el-table>
          <div class="pages">
            <el-pagination
                v-if="tableData.length == 0 ? false : true"
                v-model:currentPage="pageIndex"
                v-model:page-size="pageSize"
                :page-sizes="[10, 20, 30]"
                :pager-count="5"
                layout="total, sizes, prev, pager, next, jumper"
                :total="total"
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
            />
          </div>
        </el-tab-pane>
      </el-tabs>
    </el-card>
    <ApprovalProgress ref="approvalRef" @myAdd="onMyAdd" />
@@ -272,7 +355,7 @@
      for (let i = 0; i < valId.length; i++) {
        arr.push(valId[i].id);
      }
      deletAll.value = arr.toString();
      deletAll.value = arr;
      // console.log(deletAll.value);
      if (val.length == 1) {
        danger.value = false;
src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue
@@ -85,9 +85,9 @@
                </span>
      </template>
    </el-dialog>
    <UserSelect ref="Shows"/>
    <DailogSearchUser ref="Shows" @SearchUser="onUser"/>
    <UserCheckbox ref="userRef"/>
    <RegionsDialog ref="openRef" @SearchUser="onUser"/>
    <RegionsDialog ref="openRef" @SearchUser="onUsers"/>
  </div>
</template>
@@ -108,14 +108,14 @@
  FullScreen
} from '@element-plus/icons-vue'
import UserCheckbox from "/@/components/userCheckbox/index.vue"
import UserSelect from '/@/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/userSelect.vue'
import DailogSearchUser from '/@/components/DailogSearchUser/index.vue'
import RegionsDialog from '/@/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/regionsDialog.vue'
import {emergencyDrillExecuteApi} from "/@/api/emergencyDrillExecute";
export default defineComponent({
  name: 'openAdd',
  components: {
    UserSelect,
    DailogSearchUser,
    UserCheckbox,
    RegionsDialog,
  },
@@ -240,23 +240,28 @@
      if (!formEl) return;
      formEl.resetFields();
    };
    // 应急队伍弹窗
    const Shows=ref()
    const daiInpt=()=>{
      Shows.value.openDialog()
    }
    // 演练名称弹窗
    const openRef=ref()
    const regionsDialog = () => {
      openRef.value.openDailog()
    }
    const onUser = (e:any) => {
    const onUsers = (e:any) => {
      ruleForm.value.drillPlanId=e.id
    };
    // 实际到场人员弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDialog();
    };
    // 演练记录人弹窗
    const Shows=ref()
    const daiInpt=()=>{
      Shows.value.openDailog()
    }
    const onUser = (e:any) => {
      ruleForm.value.recordUserUid=e.uid
    };
    //全屏
    const full = ref(false);
@@ -281,6 +286,7 @@
      openUser,
      userRef,
      regionsDialog,
      onUsers,
      onUser,
      openRef,
      toggleFullscreen,
src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/index.vue
@@ -188,7 +188,6 @@
    const onRowDel = (id: number) => {
      let arr = [];
      arr.push(id)
      console.log(arr)
      ElMessageBox.confirm('确定删除所选项吗?', '提示',{
        confirmButtonText: '确认',
        cancelButtonText: '取消',
src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue
@@ -86,7 +86,7 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="计划定制人" prop="makingUserUid">
              <el-input v-model="ruleForm.makingUserUid" placeholder="请填写计划定制人"></el-input>
              <el-input v-model="ruleForm.makingUserUid" placeholder="请填写计划定制人" disabled></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue
@@ -200,14 +200,16 @@
    //   flowRef.value.openDialog(row);
    // };
    // 删除
    const onRowDel = (data: any) => {
    const onRowDel = (id: number) => {
      let arr = [];
      arr.push(id)
      ElMessageBox.confirm('确定删除所选项吗?', '提示',{
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
      }).then(() => {
        releaseDrillPlanApi()
            .deleteReleaseDrillPlan(data)
            .deleteReleaseDrillPlan(arr)
            .then((res) => {
              if (res.data.code == 200) {
                ElMessage({
@@ -280,7 +282,7 @@
      for (let i = 0; i < valId.length; i++) {
        arr.push(valId[i].id);
      }
      deletAll.value = arr.toString();
      deletAll.value = arr;
      // console.log(deletAll.value);
      if (val.length == 1) {
        danger.value = false;
src/views/contingencyManagement/emergencyResources/emergencyMaterialsInspection/index.vue
@@ -193,7 +193,7 @@
      for (let i = 0; i < valId.length; i++) {
        arr.push(valId[i].id);
      }
      deletAll.value = arr.toString();
      deletAll.value = arr;
      if (val.length == 1) {
        warning.value = false;
        danger.value = false;
@@ -227,7 +227,9 @@
      }
    };
    // 删除
    const onRowDel = (data: any) => {
    const onRowDel = (id: number) => {
      let arr = [];
      arr.push(id)
      ElMessageBox.confirm('确定删除所选项吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -235,7 +237,7 @@
      })
          .then(() => {
            emergencyMaterialsInspectionApi()
                .deleteEmergencyMaterialsInspection(data)
                .deleteEmergencyMaterialsInspection(arr)
                .then((res) => {
                  if (res.data.code == 200) {
                    ElMessage({
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/maintain.vue
@@ -70,7 +70,7 @@
      </template>
    </el-dialog>
    <EmergencySupplies ref="showRef" @SearchUser="onUser"/>
    <userSelections ref="userRef"/>
    <DailogSearchUser ref="userRef"  @SearchUser="onUsers"/>
  </div>
</template>
@@ -89,13 +89,13 @@
  FullScreen
} from '@element-plus/icons-vue'
import EmergencySupplies from '/@/components/emergencySupplies/index.vue'
import UserSelections from "/@/components/userSelections/index.vue"
import DailogSearchUser from "../../../../../components/DailogSearchUser/index.vue"
import {maintenanceEmergencyMaterialsApi} from "/@/api/maintenanceEmergencyMaterials";
export default defineComponent({
  name: 'maintain',
  components: {
    UserSelections,
    DailogSearchUser,
    EmergencySupplies,
  },
  setup(props, { emit }) {
@@ -107,14 +107,7 @@
      suppliesId: '', // 物资ID
      maintainResult: '', //保养结果
      maintainTime: '', // 创建时间
      userList: [
        {
          userUid: ''
        },
        {
          userUid: ''
        }
      ]
      userList: []
    });
    const titles = ref();
    const disabled = ref();
@@ -177,7 +170,10 @@
    // 编写人弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDialog();
      userRef.value.openDailog();
    };
    const onUsers = (e:any) => {
      ruleForm.value.userUid=e.uid
    };
    //全屏
    const full = ref(false);
@@ -196,6 +192,7 @@
      ruleForm,
      value1,
      daiInpt,
      onUsers,
      showRef,
      ruleFormRef,
      onUser,
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/openAdd.vue
@@ -32,15 +32,15 @@
                            <el-input v-model="ruleForm.use" placeholder="请填写物资用途"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="所属区域">
                            <el-input v-model="ruleForm.areaId" placeholder="请选择" class="input-with-select">
                                <template #append>
                                    <el-button :icon="Search" @click="regionsDialog" />
                                </template>
                            </el-input>
                        </el-form-item>
                    </el-col>
<!--                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
<!--                        <el-form-item label="所属区域">-->
<!--                            <el-input v-model="ruleForm.areaId" placeholder="请选择" class="input-with-select">-->
<!--                                <template #append>-->
<!--                                    <el-button :icon="Search" @click="regionsDialog" />-->
<!--                                </template>-->
<!--                            </el-input>-->
<!--                        </el-form-item>-->
<!--                    </el-col>-->
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="物资型号" prop="model">
                            <el-input v-model="ruleForm.model" placeholder="请填写物资型号"></el-input>
src/views/contingencyManagement/emergencyResources/emergencySupplies/component/openEdit.vue
@@ -1,21 +1,8 @@
<template>
  <div class="system-edit-user-container">
    <el-dialog
        :title="titles"
        v-model="isShowDialog"
        width="50%"
        draggable
        :fullscreen="full"
    >
        <el-dialog :title="titles" v-model="isShowDialog" width="50%" draggable :fullscreen="full">
      <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
      <el-form
          ref="ruleFormRef"
          :rules="rules"
          :model="ruleForm"
          size="default"
          label-width="120px"
          :disabled="disabled"
      >
            <el-form ref="ruleFormRef" :rules="rules" :model="ruleForm" size="default" label-width="120px" :disabled="disabled">
        <el-row :gutter="35">
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="物资名称" prop="name">
@@ -99,23 +86,12 @@
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="检查周期月" prop="inspectPeiod">
              <el-input
                  v-model.number="ruleForm.inspectPeiod"
                  type=""
                  maxlength="4"
                  placeholder="请填写使用期限"
              ></el-input>
                            <el-input v-model.number="ruleForm.inspectPeiod" type="" maxlength="4" placeholder="请填写使用期限"></el-input>
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
            <el-form-item label="投用日期" prop="useDate">
              <el-date-picker
                  v-model="ruleForm.useDate"
                  type="datetime"
                  class="w100"
                  placeholder="选择日期时间"
                  value-format="YYYY-MM-DD HH:mm:ss"
              />
                            <el-date-picker v-model="ruleForm.useDate" type="datetime" class="w100" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss" />
            </el-form-item>
          </el-col>
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
@@ -164,26 +140,22 @@
              </el-input>
            </el-form-item>
          </el-col>
<!--          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">-->
<!--            <el-form-item label="保养记录">-->
<!--              <el-table-->
<!--                  :data="dataList"-->
<!--                  style="width: 100%"-->
<!--                  highlight-current-row>-->
<!--                <el-table-column label="保养结果" prop="maintainResult" width="170">-->
<!--                  <template slot-scope="scope">-->
<!--                    <el-select size="mini">-->
<!--                      <el-option value="is_hot_tag" label="热门标签"></el-option>-->
<!--                      <el-option value="is_latest_track_tag" label="最新赛道"></el-option>-->
<!--                      <el-option value="is_new_subhangye_tag" label="新体系子行业"></el-option>-->
<!--                    </el-select>-->
<!--                  </template>-->
<!--                </el-table-column>-->
<!--                <el-table-column label="创建人" prop="suppliesId" width="170"></el-table-column>-->
<!--                <el-table-column label="创建时间" prop="maintainTime" width="170"></el-table-column>-->
<!--              </el-table>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
                        <el-form-item label="保养记录">
                            <el-table :data="dataList" style="width: 100%" highlight-current-row>
                                <el-table-column label="保养结果" prop="maintainResult" width="170">
                                    <template slot-scope="scope">
                                        <el-select size="mini" v-model="dataList.maintainResult">
                                            <el-option value="正常" label="正常"></el-option>
                                            <el-option value="异常" label="异常"></el-option>
                                        </el-select>
                                    </template>
                                </el-table-column>
                                <el-table-column label="创建人" prop="userUid" width="170"></el-table-column>
                                <el-table-column label="创建时间" prop="maintainTime" width="170"></el-table-column>
                            </el-table>
                        </el-form-item>
                    </el-col>
        </el-row>
      </el-form>
      <template #footer>
@@ -206,10 +178,10 @@
import { ElMessage } from 'element-plus';
import { Search, FullScreen } from '@element-plus/icons-vue';
import UserSelections from '/@/components/userSelections/index.vue';
import PersonInCharge from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/personInCharge.vue';
import RegionsCheckbox from '/@/views/contingencyManagement/emergencyResources/emergencySupplies/component/regionsCheckbox.vue';
import {emergencySuppliesApi} from "/@/api/emergencyResources";
import UserSelections from '../../../../../components/userSelections/index.vue';
import PersonInCharge from '../component/personInCharge.vue';
import RegionsCheckbox from '../component/regionsCheckbox.vue';
import { emergencySuppliesApi } from '../../../../../api/emergencyResources';
export default defineComponent({
  name: 'openAdd',
@@ -525,8 +497,7 @@
            console.log('error submit!', fields);
          }
        });
      }
      else if (title == '修改应急物资代码') {
            } else if (title == '修改应急物资代码') {
        if (!formEl) return;
        await formEl.validate((valid, fields) => {
          if (valid) {
@@ -577,9 +548,9 @@
          areaId: null,
          place: '',
          useExplain: '',
                };
        }
      }
    }
        };
    const resetForm = (formEl: FormInstance | undefined) => {
      isShowDialog.value = false;
      if (!formEl) return;
@@ -600,28 +571,29 @@
    const openUser = () => {
      userRef.value.openDialog();
    };
    const dataList = [
      {
        maintainResult: '',
        suppliesId: 'Tom',
        maintainTime: '2016-05-02',
      },
      {
        maintainResult: '',
        suppliesId: 'Tom',
        maintainTime: '2016-05-02',
      },
      {
        maintainResult: '',
        suppliesId: 'Tom',
        maintainTime: '2016-05-02',
      },
      {
        maintainResult: '',
        suppliesId: 'Tom',
        maintainTime: '2016-05-02',
      },
    ]
    const dataList = ref()
        // const dataList = [
        //     {
        //         maintainResult: '1',
        //         suppliesId: 'Tom',
        //         maintainTime: '2016-05-02',
        //     },
        //     {
        //         maintainResult: '1',
        //         suppliesId: 'Tom',
        //         maintainTime: '2016-05-02',
        //     },
        //     {
        //         maintainResult: '',
        //         suppliesId: 'Tom',
        //         maintainTime: '2016-05-02',
        //     },
        //     {
        //         maintainResult: '',
        //         suppliesId: 'Tom',
        //         maintainTime: '2016-05-02',
        //     },
        // ];
    //全屏
    const full = ref(false);
    const toggleFullscreen = () => {
src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue
@@ -71,7 +71,7 @@
      </template>
    </el-dialog>
    <EmergencySupplies ref="showRef" @SearchUser="onUser"/>
    <userSelections ref="userRef" @SearchUser="onUsers"/>
    <DailogSearchUser ref="userRef" @SearchUser="onUsers"/>
  </div>
</template>
@@ -91,13 +91,13 @@
  FullScreen
} from '@element-plus/icons-vue'
import EmergencySupplies from '../../../../../components/emergencySupplies/index.vue'
import UserSelections from "../../../../../components/userSelections/index.vue"
import DailogSearchUser from "../../../../../components/DailogSearchUser/index.vue"
import {maintenanceEmergencyMaterialsApi} from "../../../../../api/maintenanceEmergencyMaterials";
export default defineComponent({
  name: 'openAdd',
  components: {
    UserSelections,
    DailogSearchUser,
    EmergencySupplies,
  },
  setup(props, { emit }) {
@@ -109,14 +109,7 @@
      suppliesId: '', // 物资ID
      maintainResult: '', //保养结果
      maintainTime: '', // 创建时间
      userList: [
        {
          userUid: ''
        },
        {
          userUid: ''
        }
      ]
      userList: []
    });
    const titles = ref();
    const disabled = ref();
@@ -203,14 +196,7 @@
          suppliesId: '', // 队伍名称
          maintainResult: '', //队伍负责人
          maintainTime: '', // 负责人部门
          userList: [
            {
              userUid: ''
            },
            {
              userUid: ''
            }
          ]
          userList: []
        }
      }
    }
@@ -230,10 +216,10 @@
    // 编写人弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDialog();
      userRef.value.openDailog();
    };
    const onUsers = (e:any) => {
      ruleForm.value.userUid=e.id
      ruleForm.value.userUid=e.uid
    };
    //全屏
    const full = ref(false);
src/views/contingencyManagement/panManagement/component/abolishLibrary.vue
@@ -3,18 +3,11 @@
    <el-dialog
        title="废止库"
        v-model="isShowDialog"
        width="769px"
        width="60%"
        draggable
        :fullscreen="full"
    >
      <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
      <el-form
          ref="ruleFormRef"
          :model="ruleForm"
          size="default"
          :rules="rules"
          label-width="120px"
      >
        <el-row :gutter="35">
          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
                <el-table
@@ -24,50 +17,32 @@
                    :model="formInline"
                    :header-cell-style="{background:'#f6f7fa',color:'#909399'}"
                >
                  <el-table-column prop="jobNo" label="预案名称" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="personnelName" label="预案类型" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="phone" label="编写人" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="position" label="发布实施日期" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="name" label="预案名称" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="authorUid" label="编写人" show-overflow-tooltip sortable></el-table-column>
            <el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column label="操作" width="200" align="center">
                    <template #default="scope">
                      <el-button disabled size="small" text="plain" >查看
                      </el-button>
                      <el-button disabled size="small" text="plain" style="margin-right: 5px;">编辑
                      </el-button>
                      <el-button disabled size="small" text="plain" style="margin-right: 5px;">删除
                <el-button size="small" text type="primary" @click="onReduction(scope.row.id)">还原
                      </el-button>
                    </template>
                  </el-table-column>
                </el-table>
          </el-col>
        </el-row>
      </el-form>
      <div class="pages">
<!--      <el-pagination-->
<!--          @size-change="onHandleSizeChange"-->
<!--          @current-change="onHandleCurrentChange"-->
<!--          class="mt15"-->
<!--          :pager-count="5"-->
<!--          :page-sizes="[10, 20, 30]"-->
<!--          v-model:current-page="formInline.pageIndex"-->
<!--          background-->
<!--          v-model:page-size="formInline.pageSize"-->
<!--          layout="total, sizes, prev, pager, next, jumper"-->
<!--          :total="tableData.total"-->
<!--      >-->
<!--      </el-pagination>-->
        <el-pagination
            v-if="tableData.length == 0 ? false : true"
            v-model:currentPage="pageIndex"
            v-model:page-size="pageSize"
            :page-sizes="[10, 20, 30]"
            :pager-count="5"
            :small="small"
            :disabled="disabled"
            :background="background"
            class="mt15"
            background
            layout="total, sizes, prev, pager, next, jumper"
            :total="40"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
            :total="total"
            @size-change="onHandleSizeChange"
            @current-change="onHandleCurrentChange"
        />
      </div>
      <template #footer>
@@ -89,41 +64,57 @@
import type {
  FormInstance,
} from 'element-plus'
import {
  // ElMessageBox,
  ElMessage,
} from 'element-plus';
import {
  Search,
  FullScreen
} from '@element-plus/icons-vue'
// 定义表格数据类型
interface User {
  personnelName: string
  jobNo: string
  phone: string;
  position: string;
}
// 定义表单搜索
const formInline = reactive({
  pageIndex: 1,
  pageSize: 10,
  searchParams: {
    teamName: "",
    teamType: "",
  }
})
import {emergencyPlanApi} from "/@/api/emergencyPlan";
export default defineComponent({
  name: 'abolishLibrary',
  components: {
  },
  setup() {
  setup(prop, {emit}) {
    // 列表参数
    const listQuery = reactive({
      pageIndex: 1,
      pageSize: 10,
      searchParams: {
        abolishStatus: true,
      }
    })
    // 定义表格数据
    const tableData = ref([]);
    // 列表数据请求
    const openDialog = async () => {
      isShowDialog.value = true;
      let res = await emergencyPlanApi().getEmergencyPlanList(listQuery)
      if(res.data.code === '200'){
        tableData.value = res.data.data;
        pageIndex.value = res.data.pageIndex;
        pageSize.value = res.data.pageSize;
        total.value = res.data.total;
      }else{
        ElMessage({
          showClose: true,
          type:'error',
          message:res.data.msg
        })
      }
    }
    const isShowDialog = ref(false)
    const ruleFormRef = ref<FormInstance>()
    // 打开弹窗
    const openDialog = () => {
      // state.ruleForm = row;
      isShowDialog.value = true;
    };
    // const openDialog = () => {
    //   isShowDialog.value = true;
    // };
    // 关闭弹窗
    const closeDialog = () => {
      isShowDialog.value = false;
@@ -132,30 +123,17 @@
    const onCancel = () => {
      closeDialog();
    };
    // 打开用户选择弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDialog();
    };
    // 分页改变
    // const onHandleSizeChange = (val: number) => {
    //   formInline.pageSize = val;
    // };
    // const onHandleCurrentChange = (val: number) => {
    //   formInline.pageIndex = val;
    // };
    //定义表格数据
    const multipleSelection = ref<User[]>([])
    const tableData: User[] = []
    // 分页
    const pageIndex = ref(4);
    const pageSize = ref(10);
    const pageIndex = ref();
    const pageSize = ref();
    const total = ref();
    // 分页改变
    const handleSizeChange = (val: number) => {
      console.log(`${val} items per page`);
      listQuery.pageSize = val;
    };
    // 分页未改变
    const handleCurrentChange = (val: number) => {
      console.log(`current page: ${val}`);
      listQuery.pageIndex = val;
    };
    //全屏
    const full = ref(false);
@@ -172,15 +150,8 @@
      isShowDialog,
      onCancel,
      tableData,
      multipleSelection,
      Search,
      ruleFormRef,
      // submitForm,
      userRef,
      openUser,
      // onHandleSizeChange,
      // onHandleCurrentChange,
      formInline,
      pageIndex,
      pageSize,
      handleSizeChange,
@@ -188,6 +159,10 @@
      toggleFullscreen,
      FullScreen,
      full,
      listQuery,
      // onSubmit,
      total,
      emit,
    };
  },
});
src/views/contingencyManagement/panManagement/index.vue
@@ -84,11 +84,11 @@
                <VideoPlay />
              </el-icon>启动
            </el-button>
<!--            <el-button size="small" text type="primary" @click="abolish(0)">-->
<!--              <el-icon style="margin-right: 5px;">-->
<!--                <VideoPause />-->
<!--              </el-icon>废止-->
<!--            </el-button>-->
            <el-button size="small" text type="primary" @click="abolish">
              <el-icon style="margin-right: 5px;">
                <VideoPause />
              </el-icon>废止
            </el-button>
            <el-button size="small" text type="primary" @click="onEdit('修改',scope.row.id)">
              <el-icon style="margin-right: 5px;">
                <EditPen />
@@ -127,7 +127,7 @@
      </div>
    </el-card>
    <OpenAdd ref="addRef" @myAdd="onMyAdd"/>
<!--    <AbolishLibrary ref="abolishRef"/>-->
    <AbolishLibrary ref="abolishRef"/>
<!--    <StartUp ref="startRef" @myAdd="startUp"/>-->
    <el-dialog v-model="dialogFormVisible" width="30%" title="启动" :fullscreen="full">
      <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
@@ -176,7 +176,7 @@
} from '@element-plus/icons-vue'
import OpenAdd from '/@/views/contingencyManagement/panManagement/component/openAdd.vue';
// import StartUp from '/@/views/contingencyManagement/panManagement/component/startUp.vue';
// import AbolishLibrary from '/@/views/contingencyManagement/panManagement/component/abolishLibrary.vue';
import AbolishLibrary from '/@/views/contingencyManagement/panManagement/component/abolishLibrary.vue';
// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
import {emergencyPlanApi} from "/@/api/emergencyPlan";
import {emergencyPlanLogApi} from "/@/api/emergencyPlanLog";
@@ -186,7 +186,7 @@
  components: {
    OpenAdd,
    // StartUp,
    // AbolishLibrary,
    AbolishLibrary,
    EditPen,
    Plus,
    Edit,
@@ -207,6 +207,7 @@
      searchParams: {
        name: "",
        type: "",
        abolishStatus: false,
      }
    })
    // 定义表格数据
@@ -276,14 +277,6 @@
          remark: '',
        }
    }
    // 新增后刷新
    // const startUp = (e: boolean) => {
    //   if (e) {
    //     onSubmit();
    //   } else {
    //     onSubmit();
    //   }
    // };
    // 打开新增用户弹窗
    const addRef = ref();
    const onOpenAdd = () => {
@@ -307,10 +300,39 @@
    };
    //打开废止库弹窗
    // const abolishRef = ref();
    // const onabolishLibrary = () => {
    //   abolishRef.value.openDialog();
    // };
    const abolishRef = ref();
    const onabolishLibrary = () => {
      abolishRef.value.openDialog();
    };
    // 废止
    const abolish = (data: any) => {
      ElMessageBox.confirm('确定要废止所选项吗?', '提示', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
      }).then(() => {
        emergencyPlanApi()
            .EmergencyTeam(data)
            .then((res) => {
              if (res.data.code == 200) {
                ElMessage({
                  showClose: true,
                  message: res.data.msg,
                  type: 'success',
                });
                onSubmit();
              } else {
                ElMessage({
                  showClose: true,
                  message: res.data.msg,
                  type: 'error',
                });
                onSubmit();
              }
            });
      }).catch(() => {});
    };
    // 删除用户
    const onRowDel = (id: number) => {
      let arr = [];
@@ -442,9 +464,9 @@
      onSubmit,
      onOpenAdd,  //新增
      addRef,
      // onabolishLibrary,
      // abolishRef,
      // abolish,
      onabolishLibrary,
      abolishRef,
      abolish,
      onRowDel,
      onHandleSizeChange,
      onHandleCurrentChange,