From 01bfe12fea0b779a203c9021e5e232fb14f96fdb Mon Sep 17 00:00:00 2001 From: 13937891274 <kxc0822> Date: 星期一, 08 八月 2022 16:47:17 +0800 Subject: [PATCH] 页面修改 --- src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue | 7 /dev/null | 425 ----------------------------------------------- src/views/contingencyManagement/panManagement/index.vue | 17 + src/views/contingencyManagement/panManagement/component/openAdd.vue | 14 src/views/contingencyManagement/contingency/index.vue | 16 + src/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue | 3 src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue | 16 + src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue | 1 src/views/contingencyManagement/contingency/component/openAdd.vue | 6 9 files changed, 52 insertions(+), 453 deletions(-) diff --git a/src/views/contingencyManagement/contingency/component/dialog.vue b/src/views/contingencyManagement/contingency/component/dialog.vue deleted file mode 100644 index add861a..0000000 --- a/src/views/contingencyManagement/contingency/component/dialog.vue +++ /dev/null @@ -1,200 +0,0 @@ -<template> - <div class="system-add-user-container"> - <el-dialog title="查看应急队伍管理" v-model="isShowDialog" width="769px"> - <el-form :model="ruleForm" size="default" label-width="90px"> - <el-row :gutter="35"> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="账户名称"> - <el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></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.userNickname" placeholder="请输入用户昵称" clearable></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-select v-model="ruleForm.roleSign" placeholder="请选择" clearable class="w100"> - <el-option label="超级管理员" value="admin"></el-option> - <el-option label="普通用户" value="common"></el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="部门"> - <el-cascader - :options="deptData" - :props="{ checkStrictly: true, value: 'deptName', label: 'deptName' }" - placeholder="请选择部门" - clearable - class="w100" - v-model="ruleForm.department" - > - <template #default="{ node, data }"> - <span>{{ data.deptName }}</span> - <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span> - </template> - </el-cascader> - </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.phone" placeholder="请输入手机号" clearable></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.email" placeholder="请输入" clearable></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-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100"> - <el-option label="男" value="男"></el-option> - <el-option label="女" value="女"></el-option> - </el-select> - </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.password" placeholder="请输入" type="password" clearable></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-date-picker v-model="ruleForm.overdueTime" type="date" placeholder="请选择" class="w100"> </el-date-picker> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="用户状态"> - <el-switch v-model="ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> - <el-form-item label="用户描述"> - <el-input v-model="ruleForm.describe" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input> - </el-form-item> - </el-col> - </el-row> - </el-form> - <template #footer> - <span class="dialog-footer"> - <el-button @click="onCancel" size="default">取 消</el-button> - <el-button type="primary" @click="onSubmit" size="default">新 增</el-button> - </span> - </template> - </el-dialog> - </div> -</template> - -<script lang="ts"> -import { reactive, toRefs, onMounted, defineComponent } from 'vue'; - -// 定义接口来定义对象的类型 -interface DeptData { - deptName: string; - createTime: string; - status: boolean; - sort: number | string; - describe: string; - id: number; - children?: DeptData[]; -} -interface UserState { - isShowDialog: boolean; - ruleForm: { - userName: string; - userNickname: string; - roleSign: string; - department: any; - phone: string; - email: string; - sex: string; - password: string; - overdueTime: string; - status: boolean; - describe: string; - }; - deptData: Array<DeptData>; -} - -export default defineComponent({ - name: 'systemAddUser', - setup() { - const state = reactive<UserState>({ - isShowDialog: false, - ruleForm: { - userName: '', // 账户名称 - userNickname: '', // 用户昵称 - roleSign: '', // 关联角色 - department: [], // 部门 - phone: '', // 手机号 - email: '', // 邮箱 - sex: '', // 性别 - password: '', // 账户密码 - overdueTime: '', // 账户过期 - status: true, // 用户状态 - describe: '', // 用户描述 - }, - deptData: [], // 部门数据 - }); - // 打开弹窗 - const openDialog = () => { - state.isShowDialog = true; - }; - // 关闭弹窗 - const closeDialog = () => { - state.isShowDialog = false; - }; - // 取消 - const onCancel = () => { - closeDialog(); - }; - // 新增 - const onSubmit = () => { - closeDialog(); - }; - // 初始化部门数据 - const initTableData = () => { - state.deptData.push({ - deptName: 'vueNextAdmin', - createTime: new Date().toLocaleString(), - status: true, - sort: Math.random(), - describe: '顶级部门', - id: Math.random(), - children: [ - { - deptName: 'IT外包服务', - createTime: new Date().toLocaleString(), - status: true, - sort: Math.random(), - describe: '总部', - id: Math.random(), - }, - { - deptName: '资本控股', - createTime: new Date().toLocaleString(), - status: true, - sort: Math.random(), - describe: '分部', - id: Math.random(), - }, - ], - }); - }; - // 页面加载时 - onMounted(() => { - initTableData(); - }); - return { - openDialog, - closeDialog, - onCancel, - onSubmit, - ...toRefs(state), - }; - }, -}); -</script> diff --git a/src/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue b/src/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue deleted file mode 100644 index 3effe20..0000000 --- a/src/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue +++ /dev/null @@ -1,240 +0,0 @@ -<template> - <div class="system-edit-user-container"> - <el-dialog - title="修改应急队伍人员" - v-model="isShowDialog" - width="769px" - 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="90px"> - <el-row :gutter="35"> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="选择人员" prop="selectPeople"> - <el-input - v-model="ruleForm.selectPeople" - placeholder="请选择" - class="input-with-select" - > - <template #append> - <el-button :icon="Search"/> - </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="jobNumber"> - <el-input v-model="ruleForm.jobNumber" 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="personnelName"> - <el-input v-model="ruleForm.personnelName" 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="personnelGender"> - <el-radio-group v-model="ruleForm.personnelGender"> - <el-radio label="男" /> - <el-radio label="女" /> - </el-radio-group> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="手机号码" prop="phone"> - <el-input v-model="ruleForm.phone" 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="position"> - <el-input v-model="ruleForm.position" placeholder="请填写职位"></el-input> - </el-form-item> - </el-col> - </el-row> - </el-form> - <template #footer> - <span class="dialog-footer"> - <el-button size="default" type="primary" @click="submitForm(ruleFormRef)">继续添加</el-button> - <el-button size="default" @click="onCancel">关闭</el-button> - <el-button size="default" type="primary" @click="submitForm(ruleFormRef)">确定</el-button> - </span> - </template> - </el-dialog> - </div> -</template> - -<script lang="ts"> -import { - ref, - reactive, - toRefs, - defineComponent -} from 'vue'; - -import type { - FormRules, - FormInstance, -} from 'element-plus' - -import { - Search, - FullScreen, -} from '@element-plus/icons-vue' -// 定义接口来定义对象的类型 -interface DeptData { - deptName: string; - createTime: string; - status: boolean; - sort: number | string; - describe: string; - id: number; - children?: DeptData[]; -} - -interface RuleFormRow { - // teamName: string; - // teamLevel: string; - // teamLeader: string; - // responsibleDepartment: any - // teamPhone: string; - // telephone: string; - // describe: string; - // selectPeople: string -} -interface UserState { - isShowDialog: boolean; - ruleForm: RuleFormRow; - deptData: Array<DeptData>; -} -export default defineComponent({ - name: 'editTeamLeader', - components: { - // Search, - }, - setup() { - const state = reactive<UserState>({ - isShowDialog: false, - ruleForm: { - selectPeople:'', //选择人员 - jobNumber: '', // 人员工号 - phone: '', // 手机号码 - personnelGender: '', //人员性别 - position: '', //职位 - personnelName: '', // 人员名称 - }, - deptData: [], // 部门数据 - }); - // const isShowDialog = ref(false) - const ruleFormRef = ref<FormInstance>() - // 打开弹窗 - const openDialog = (row: RuleFormRow) => { - // isShowDialog.value = true; - state.ruleForm = row; - state.isShowDialog = true; - }; - // 关闭弹窗 - const closeDialog = () => { - // isShowDialog.value = false; - state.isShowDialog = false; - }; - // 取消 - const onCancel = () => { - closeDialog(); - }; - const rules = reactive<FormRules>({ - selectPeople:[ - { - required: true, - message: '人员不能为空', - trigger: 'change', - }, - ], - jobNumber: [ - { - required: true, - message: '人员工号不能为空', - trigger: 'change', - }, - ], - personnelName: [ - { - required: true, - message: '人员名称不能为空', - trigger: 'change', - }, - ], - personnelGender: [ - { - required: true, - message: '人员性别不能为空', - trigger: 'change', - }, - ], - phone: [ - { - required: true, - message: '手机号码不能为空', - trigger: 'change', - }, - ], - position: [ - { - required: true, - message: '职位不能为空', - trigger: 'change', - }, - ], - }) - const submitForm = async (formEl: FormInstance | undefined) => { - if (!formEl) return - await formEl.validate((valid, fields) => { - if (valid) { - console.log('submit!') - } else { - console.log('error submit!', fields) - } - }) - } - //全屏 - const full = ref(false); - const toggleFullscreen = () => { - if (full.value == false) { - full.value = true; - } else { - full.value = false; - } - }; - return { - openDialog, - closeDialog, - // isShowDialog, - ruleFormRef, - submitForm, - onCancel, - rules, - Search, - ...toRefs(state), - toggleFullscreen, - FullScreen, - full, - }; - }, -}); -</script> -<style scoped lang="scss"> -.textarea{ - height: 168px!important; -} -.textarea ::v-deep .el-textarea__inner{ - height: 168px!important; -} -::v-deep .el-table__cell { - font-weight: 400; -} -</style> \ No newline at end of file diff --git a/src/views/contingencyManagement/contingency/component/openAdd.vue b/src/views/contingencyManagement/contingency/component/openAdd.vue index 4ae9379..e853358 100644 --- a/src/views/contingencyManagement/contingency/component/openAdd.vue +++ b/src/views/contingencyManagement/contingency/component/openAdd.vue @@ -13,9 +13,9 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="队伍级别" prop="teamLevel"> <el-select v-model="ruleForm.teamLevel" class="w100" placeholder="请选择"> - <el-option label="公司" value="公司"></el-option> - <el-option label="分厂-车间" value="分厂-车间"></el-option> - <el-option label="工序-班组等" value="工序-班组等"></el-option> + <el-option label="公司" value="1"></el-option> + <el-option label="分厂-车间" value="2"></el-option> + <el-option label="工序-班组等" value="3"></el-option> </el-select> </el-form-item> </el-col> diff --git a/src/views/contingencyManagement/contingency/component/openSee.vue b/src/views/contingencyManagement/contingency/component/openSee.vue deleted file mode 100644 index 066f66d..0000000 --- a/src/views/contingencyManagement/contingency/component/openSee.vue +++ /dev/null @@ -1,425 +0,0 @@ -<template> - <div class="system-edit-user-container"> - <el-dialog - :title="title" - v-model="isShowDialog" - width="769px" - draggable - :fullscreen="full" - > - <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button> - <el-form - :model="ruleForm" - size="default" - :rules="rules" - label-width="120px" - > - <el-row :gutter="35"> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="队伍名称" prop="teamName"> - <el-input v-model="ruleForm.teamName" :disabled="true"></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="teamLevel"> - <el-select v-model="ruleForm.teamLevel" :disabled="true" class="w100"> - <el-option label="公司" value="admin"></el-option> - <el-option label="分厂-车间" value="common"></el-option> - <el-option label="工序-班组等" value="shang"></el-option> - </el-select> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="队伍负责人" prop="principalUid"> - <el-input - v-model="ruleForm.principalUid" - placeholder="Please input" - class="input-with-select" - :disabled="true" - > - <template #append> - <el-button :icon="Search"/> - </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="principalDepartmentId"> - <el-tree-select v-model="ruleForm.principalDepartmentId" :data="data" :disabled="true" class="w100"/> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> - <el-form-item label="负责人手机" prop="principalPhone"> - <el-input v-model="ruleForm.principalPhone" :disabled="true"></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="telephoneNumber"> - <el-input v-model="ruleForm.telephoneNumber" :disabled="true"></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="队伍描述" prop="teamDesc"> - <el-input class="textarea" v-model="ruleForm.teamDesc" type="textarea" :disabled="true" maxlength="150"></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="相关附件" prop="fileList"> - <el-upload - v-model:file-list="fileList" - class="upload-demo" - action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" - :on-change="handleChange" - > - <el-button type="primary" disabled - >点击上传</el-button> - <template #tip> - <div class="el-upload__tip"> - 添加相关附件 - </div> - </template> - </el-upload> - </el-form-item> - </el-col> - <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> - <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"> - <el-tab-pane label="应急队伍人员" name="first"> - <el-button type="primary" size="default" disabled>新增</el-button> - <el-table - :data="tableData" - style="width: 100%;margin-top: 15px;" - ref="multipleTableRef" - :header-cell-style="{background:'#f6f7fa',color:'#909399'}" - > - <el-table-column prop="jobNo" label="人员工号" show-overflow-tooltip></el-table-column> - <el-table-column prop="personnelName" label="人员名称" show-overflow-tooltip></el-table-column> - <el-table-column prop="phone" label="手机号码" show-overflow-tooltip></el-table-column> - <el-table-column prop="position" label="职位" show-overflow-tooltip></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> - </template> - </el-table-column> - </el-table> - </el-tab-pane> - </el-tabs> - </el-col> - </el-row> - </el-form> - <template #footer> - <span class="dialog-footer"> - <el-button @click="onCancel" size="default">关闭</el-button> - </span> - </template> - </el-dialog> -<!-- <AddTeamLeader ref="addRef" />--> - </div> -</template> - -<script lang="ts"> -import { reactive, toRefs, ref, onMounted, defineComponent } from 'vue'; -import type { - UploadUserFile, - TabsPaneContext, - FormRules, -} from 'element-plus' -import { - Search, - FullScreen -} from '@element-plus/icons-vue' -// import AddTeamLeader from '/@/views/contingency/component/addEmergencyPersonnel.vue'; -// 定义接口来定义对象的类型 -interface MenuDataTree { - id: number; - label: string; - children?: MenuDataTree[]; -} - -// 定义表格数据类型 -interface User { - personnelName: string - jobNo: string - phone: string; - position: string; -} - -interface RoleState { - title:string, - // buttonName:string, - isShowDialog: boolean; - ruleForm: { - teamName: string; - teamLevel: string; - principalUid: number; - principalDepartmentId: number; - principalPhone: string; - telephoneNumber: string; - teamDesc: string; - fileList: string, - }; - menuData: Array<MenuDataTree>; -} -export default defineComponent({ - name: 'openSee', - components: { - // Search, - }, - setup() { - const state = reactive<RoleState>({ - isShowDialog: false, - title:'', - // buttonName:'', - ruleForm: { - teamName: '', // 队伍名称 - teamLevel: '', // 队伍级别 - principalUid: 1, // 队伍负责人 - principalDepartmentId: 2, //负责人部门 - principalPhone: '', // 负责人手机 - telephoneNumber: '', // 固定电话 - teamDesc: '', //队伍描述 - fileList: [], - }, - menuData: [], - }); - // 打开弹窗 - const openDialog = (type: string, value: any) => { - state.isShowDialog = true; - if(type === '查看'){ - state.title = '查看应急队伍管理' - // state.buttonName = '新增' - state.ruleForm = { - teamName: '', // 队伍名称 - teamLevel: '', // 队伍级别 - principalUid: 1, // 队伍负责人 - principalDepartmentId: 2, //负责人部门 - principalPhone: '', // 负责人手机 - telephoneNumber: '', // 固定电话 - teamDesc: '', //队伍描述 - fileList: [], - } - }else{ - // state.title = '修改应急队伍管理' - // // state.buttonName = '确定' - // state.ruleForm = JSON.parse(JSON.stringify(value)) - } - }; - // 关闭弹窗 - const closeDialog = () => { - state.isShowDialog = false; - }; - // 取消 - const onCancel = () => { - closeDialog(); - }; - // // 初始化部门数据 - // const initTableData = () => { - // state.deptData.push({ - // deptName: 'vueNextAdmin', - // createTime: new Date().toLocaleString(), - // status: true, - // sort: Math.random(), - // describe: '顶级部门', - // id: Math.random(), - // children: [ - // { - // deptName: 'IT外包服务', - // createTime: new Date().toLocaleString(), - // status: true, - // sort: Math.random(), - // describe: '总部', - // id: Math.random(), - // }, - // { - // deptName: '资本控股', - // createTime: new Date().toLocaleString(), - // status: true, - // sort: Math.random(), - // describe: '分部', - // id: Math.random(), - // }, - // ], - // }); - // }; - // // 页面加载时 - // onMounted(() => { - // initTableData(); - // }); - // 上传附件 - const fileList = ref<UploadUserFile[]>([]) - - //定义树形下拉框 - const responsibleDepartment = ref() - const data = [ - { - value: '1', - label: '广汇能源综合物流发展有限责任公司', - children: [ - { - value: '1-1', - label: '经营班子', - children: [], - }, - ], - }, - { - value: '2', - label: '生产运行部', - children: [ - { - value: '2-1', - label: '灌装一班', - children: [] - }, - { - value: '2-2', - label: '工艺四班', - children: [], - }, - ], - }, - { - value: '3', - label: '设备部', - children: [ - { - value: '3-1', - label: '仪表班', - children: [], - }, - { - value: '3-2', - label: '机修班', - children: [], - }, - ], - }, - ] - //定义tabs切换 - const activeName = ref('first') - - const handleClick = (tab: TabsPaneContext, event: Event) => { - console.log(tab, event) - } - - //定义表格数据 - const multipleSelection = ref<User[]>([]) - const tableData: User[] = [ - { - personnelName: '张志刚', - jobNo: '1037', - position: '副组长', - phone: '13673321356', - }, - { - personnelName: '张志刚', - jobNo: '1037', - position: '副组长', - phone: '13673321356', - }, - { - personnelName: '张志刚', - jobNo: '1037', - position: '副组长', - phone: '13673321356', - }, - { - personnelName: '张志刚', - jobNo: '1037', - position: '副组长', - phone: '13673321356', - } - ] - - // 必填项提示 - const rules = reactive<FormRules>({ - teamName: [ - { - required: true, - message: '队伍名称不能为空', - trigger: 'change', - }, - ], - teamLevel: [ - { - required: true, - message: '队伍级别不能为空', - trigger: 'change', - }, - ], - principalUid: [ - { - required: true, - message: '队伍负责人不能为空', - trigger: 'change', - }, - ], - principalDepartmentId: [ - { - required: true, - message: '负责人部门不能为空', - trigger: 'change', - }, - ], - principalPhone: [ - { - required: true, - message: '负责人手机不能为空', - trigger: 'change', - }, - ], - telephoneNumber: [ - { - required: true, - message: '固定电话不能为空', - trigger: 'change', - }, - ], - }) - //全屏 - const full = ref(false); - const toggleFullscreen = () => { - if(full.value == false) { - full.value = true; - } else { - full.value = false; - } - }; - return { - openDialog, - closeDialog, - onCancel, - fileList, - responsibleDepartment, - data, - activeName, - handleClick, - tableData, - multipleSelection, - Search, - // addRef, - // onAddTeamLeader, - ...toRefs(state), - toggleFullscreen, - FullScreen, - full, - rules, - }; - }, -}); -</script> -<style scoped lang="scss"> -.textarea{ - height: 168px!important; -} -.textarea ::v-deep .el-textarea__inner{ - height: 168px!important; -} -::v-deep .el-table__cell { - font-weight: 400; -} -</style> \ No newline at end of file diff --git a/src/views/contingencyManagement/contingency/index.vue b/src/views/contingencyManagement/contingency/index.vue index 1be771a..2196936 100644 --- a/src/views/contingencyManagement/contingency/index.vue +++ b/src/views/contingencyManagement/contingency/index.vue @@ -8,9 +8,9 @@ </el-form-item> <el-form-item> <el-select size="default" v-model="listQuery.searchParams.teamType" placeholder="请选择队伍级别"> - <el-option label="公司" value="shanghai"></el-option> - <el-option label="分厂-车间" value="beijing"></el-option> - <el-option label="工序-班组等" value="beijing"></el-option> + <el-option label="公司" value="1"></el-option> + <el-option label="分厂-车间" value="2"></el-option> + <el-option label="工序-班组等" value="3"></el-option> </el-select> </el-form-item> <el-form-item> @@ -70,7 +70,13 @@ width="55" /> <el-table-column prop="teamName" label="队伍名称" show-overflow-tooltip sortable></el-table-column> - <el-table-column prop="teamLevel" label="队伍级别" show-overflow-tooltip sortable></el-table-column> + <el-table-column prop="teamLevel" label="队伍级别" show-overflow-tooltip sortable> + <template #default="scope"> + <span v-if="scope.row.teamLevel == 1">公司</span> + <span v-if="scope.row.teamLevel == 2">分厂-车间</span> + <span v-if="scope.row.teamLevel == 3">工序-班组等</span> + </template> + </el-table-column> <el-table-column prop="teamDesc" label="队伍描述" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="principalPhone" label="负责人手机" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="attachments" label="相关附件" show-overflow-tooltip sortable></el-table-column> @@ -137,8 +143,6 @@ View, EditPen, } from '@element-plus/icons-vue' -// import OpenAdd from '/@/views/contingencyManagement/contingency/component/openAdd.vue'; -// import OpenSee from '/@/views/contingencyManagement/contingency/component/openSee.vue'; import OpenAdd from '../../contingencyManagement/contingency/component/openAdd.vue' import UpData from '../../contingencyManagement/contingency/component/upData.vue'; diff --git a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue index 094d1b1..15f3892 100644 --- a/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue +++ b/src/views/contingencyManagement/emergencyDrill/implementationOfEmergencyDrill/component/openAdd.vue @@ -55,7 +55,6 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="演练方式" prop="drillWay"> <el-select :disabled="true" v-model="drillRuleForm.drillWay" class="w100" placeholder="请选择"> - <el-option label="综合" value="0"></el-option> <el-option label="桌面" value="1"></el-option> <el-option label="专项" value="2"></el-option> diff --git a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue index 2e903f9..a1a8412 100644 --- a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue +++ b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue @@ -42,10 +42,9 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="演练方式" prop="drillWay"> <el-select v-model="ruleForm.drillWay" class="w100" placeholder="请选择"> - - <el-option label="综合" value="0"></el-option> - <el-option label="桌面" value="1"></el-option> - <el-option label="专项" value="2"></el-option> + <el-option label="综合" value="1"></el-option> + <el-option label="桌面" value="2"></el-option> + <el-option label="专项" value="3"></el-option> </el-select> </el-form-item> </el-col> diff --git a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue index 5f85b72..b1a7099 100644 --- a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue +++ b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/index.vue @@ -44,8 +44,20 @@ /> <el-table-column prop="drillName" 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="drillWay" label="演练方式" show-overflow-tooltip sortable> + <template #default="scope"> + <span v-if="scope.row.drillWay == 1">综合</span> + <span v-if="scope.row.drillWay == 2">桌面</span> + <span v-if="scope.row.drillWay == 3">专项</span> + </template> + </el-table-column> + <el-table-column prop="drillLevel" label="演练级别" show-overflow-tooltip sortable> + <template #default="scope"> + <span v-if="scope.row.drillLevel == 1">公司级</span> + <span v-if="scope.row.drillLevel == 2">分厂级</span> + <span v-if="scope.row.drillLevel == 3">车间级</span> + </template> + </el-table-column> <el-table-column prop="drillPlanDate" label="计划演练日期" show-overflow-tooltip sortable></el-table-column> <el-table-column prop="gmtModitify" label="修改时间" show-overflow-tooltip sortable></el-table-column> <el-table-column label="操作" width="260" align="center"> diff --git a/src/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue b/src/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue index afc2ebf..e550b77 100644 --- a/src/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue +++ b/src/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue @@ -52,7 +52,6 @@ </el-dialog> <DailogSearchUser ref="userRef" @SearchUser="onUser"/> <AddEmergencyPersonnel ref="addRef" /> - <EditEmergencyPersonnel ref="editRef" /> </div> </template> @@ -71,7 +70,6 @@ } from '@element-plus/icons-vue' import DailogSearchUser from "/@/components/DailogSearchUser/index.vue" import AddEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue"; -import EditEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue"; import {emergencyPlanLogApi} from "/@/api/contingencyManagement/emergencyPlanLog"; export default defineComponent({ @@ -79,7 +77,6 @@ components: { DailogSearchUser, AddEmergencyPersonnel, - EditEmergencyPersonnel }, setup(props, { emit }) { const isShowDialog = ref(false); diff --git a/src/views/contingencyManagement/panManagement/component/openAdd.vue b/src/views/contingencyManagement/panManagement/component/openAdd.vue index c0b0ced..02c44c0 100644 --- a/src/views/contingencyManagement/panManagement/component/openAdd.vue +++ b/src/views/contingencyManagement/panManagement/component/openAdd.vue @@ -29,10 +29,10 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="预案类型" prop="type"> <el-select v-model="ruleForm.type" class="w100" placeholder="请选择"> - <el-option label="综合应急预案" value="综合应急预案"></el-option> - <el-option label="现场处置方案" value="现场处置方案"></el-option> - <el-option label="专项应急预案" value="专项应急预案"></el-option> - <el-option label="其他预案" value="其他预案"></el-option> + <el-option label="综合应急预案" value="1"></el-option> + <el-option label="现场处置方案" value="2"></el-option> + <el-option label="专项应急预案" value="3"></el-option> + <el-option label="其他预案" value="4"></el-option> </el-select> </el-form-item> </el-col> @@ -47,9 +47,9 @@ <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="预案级别" prop="level"> <el-select v-model="ruleForm.level" class="w100" placeholder="请选择"> - <el-option label="公司级" value="公司级"></el-option> - <el-option label="分厂级" value="分厂级"></el-option> - <el-option label="车间级" value="车间级"></el-option> + <el-option label="公司级" value="1"></el-option> + <el-option label="分厂级" value="2"></el-option> + <el-option label="车间级" value="3"></el-option> </el-select> </el-form-item> </el-col> diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue index 0daee03..cc2ec1b 100644 --- a/src/views/contingencyManagement/panManagement/index.vue +++ b/src/views/contingencyManagement/panManagement/index.vue @@ -60,8 +60,21 @@ <el-table :data="tableData" style="width: 100%" ref="multipleTableRef" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" /> <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="level" label="预案级别" show-overflow-tooltip sortable></el-table-column> + <el-table-column prop="type" label="预案类型" show-overflow-tooltip sortable> + <template #default="scope"> + <span v-if="scope.row.type == 1">综合应急预案</span> + <span v-if="scope.row.type == 2">现场处置方案</span> + <span v-if="scope.row.type == 3">专项应急预案</span> + <span v-if="scope.row.type == 4">其他预案</span> + </template> + </el-table-column> + <el-table-column prop="level" label="预案级别" show-overflow-tooltip sortable> + <template #default="scope"> + <span v-if="scope.row.level == 1">综合应急预案</span> + <span v-if="scope.row.level == 2">现场处置方案</span> + <span v-if="scope.row.level == 3">专项应急预案</span> + </template> + </el-table-column> <el-table-column prop="releaseDate" label="发布实施日期" show-overflow-tooltip sortable></el-table-column> <el-table-column label="操作" width="260" align="center" fixed="right"> <template #default="scope"> -- Gitblit v1.9.2