From a39031776b70e546098701ec9b92fad171a7a360 Mon Sep 17 00:00:00 2001 From: batman <978517621@qq.com> Date: 星期三, 08 三月 2023 10:46:38 +0800 Subject: [PATCH] 新修改添加页面 --- src/views/facilityManagement/facilityIndex/index.vue | 266 +++++++++++++++++++++++++++------------------------- 1 files changed, 137 insertions(+), 129 deletions(-) diff --git a/src/views/facilityManagement/facilityIndex/index.vue b/src/views/facilityManagement/facilityIndex/index.vue index 0e011e8..4f10dde 100644 --- a/src/views/facilityManagement/facilityIndex/index.vue +++ b/src/views/facilityManagement/facilityIndex/index.vue @@ -41,18 +41,13 @@ </div> </div> <div class="chart" style="margin-top: 10px"> - <el-table ref="multipleTableRef" :data="warningData" style="width: 100%" :header-cell-style="{ background: '#fafafa' }"> - <el-table-column property="name" label="姓名" align="center"/> - <el-table-column property="depName" label="所属部门" align="center"/> - <el-table-column property="applyUname" label="异常报警次数" align="center"/> - <el-table-column property="operators" label="角色" align="center"/> - <el-table-column label="是否持证" align="center"> - <template #default="scope"> - - </template> - </el-table-column> + <el-table ref="multipleTableRef" :data="rankData" style="width: 100%" :header-cell-style="{ background: '#fafafa' }"> + <el-table-column property="num" label="设备位号" align="center"/> + <el-table-column property="name" label="设备名称" align="center"/> + <el-table-column property="dep" label="所属部门" align="center"/> + <el-table-column property="count" label="关联次数" align="center"/> </el-table> - <el-button type="text" size="small">查看所有设计特殊作业的设备>></el-button> + <el-button type="text" size="small" style="margin-top: 10px">查看所有涉及殊作业的设备>></el-button> </div> <!-- <div class="chart" :id="ycqs"></div>--> </div> @@ -67,18 +62,20 @@ </div> <div class="chart" style="margin-top: 10px"> <el-table :data="wdsbData" style="width: 100%" stripe border :header-cell-style="{ background: '#fafafa' }"> - <el-table-column label="设备位号" align="center"/> - <el-table-column label="设备名称" align="center"/> - <el-table-column label="所属事业部" align="center"/> - <el-table-column label="温度敏感范围" align="center"/> - <el-table-column label="当前气温" align="center"/> - <el-table-column label="状态" align="center" width="180"> + <el-table-column prop="num" label="设备位号" align="center"/> + <el-table-column prop="name" label="设备名称" align="center"/> + <el-table-column prop="dep" label="所属事业部" align="center"/> + <el-table-column prop="temRange" label="温度敏感范围" align="center"/> + <el-table-column prop="tem" label="当前气温" align="center"/> + <el-table-column prop="status" label="状态" align="center" width="180"> <template #default="scope"> - <span :style="{color: scope.row.taskStatus == 1 ? '#999' : scope.row.taskStatus == 2 ? '#44b100' : scope.row.taskStatus == 3 ? '#409eff' : 'red'}">{{ scope.row.taskStatus == 1 ? '待巡检' : scope.row.taskStatus == 2 ? '巡检中' : scope.row.taskStatus == 3 ? '已巡检' : '超期未巡检' }}</span> + <el-tag :type="scope.row.status == 0 ? 'success' : scope.row.status == 1 ? '' : 'danger'">{{ scope.row.status == 0 ? '正常' : scope.row.status == 1 ? '低温警报' : '高温警报' }}</el-tag> </template> </el-table-column> </el-table> - <el-pagination v-model:currentPage="chartSearch4.pageIndex" v-model:page-size="chartSearch4.pageSize" :page-sizes="[10, 15]" small="false" background layout="total, sizes, prev, pager, next, jumper" :total="totalSize" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> + <div class="pageBtn"> + <el-pagination v-model:currentPage="pageIndex1" v-model:page-size="pageSize1" :page-sizes="[3]" small="false" background layout="total, sizes, prev, pager, next, jumper" :total="totalSize1" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" /> + </div> </div> </div> <div class="chart-item chart-item2"> @@ -89,15 +86,9 @@ </div> </div> <div class="chart" style="margin-top: 10px;display: flex;align-items: center"> - <div class="c-item" :id="aqxj"> - - </div> - <div class="c-item" :id="aqby"> - - </div> - <div class="c-item" :id="yhxh"> - - </div> + <div class="c-item" :id="aqxj"></div> + <div class="c-item" :id="aqby"></div> + <div class="c-item" :id="yhxh"></div> </div> </div> </div> @@ -139,19 +130,14 @@ chartSearch2: object; chartSearch3: object; chartSearch4: object; - searchDep2: number | null; - searchDep: number | null; - searchDate: Array<any>, totalSize1: number; details: {}; workType: Array<type>; workType1: Array<type>; dialogType: number | null; departmentList: Array<any>; - departmentRecursionList: Array<DepartmentState>; - workStatus: Array<status>; - reviewForm: object; - reviewRules: object; + rankData: Array<any>; + wdsbData: Array<any>; } interface type { id: number; @@ -177,7 +163,6 @@ const userInfo = useUserInfo(); const { userInfos } = storeToRefs(userInfo); const router = useRouter(); - const reviewFormRef = ref<FormInstance>() const sbzt = ref("eChartSbzt" + Date.now() + Math.random()) const ycqs = ref("eChartYcqs" + Date.now() + Math.random()) const aqxj = ref("eChartAqxj" + Date.now() + Math.random()) @@ -185,12 +170,11 @@ const yhxh = ref("eChartYhxh" + Date.now() + Math.random()) const state = reactive<stateType>({ pageIndex1: 1, - pageSize1: 10, - totalSize1: 0, + pageSize1: 3, + totalSize1: 3, dialogType: null, dialogReview: false, departmentList: [], - departmentRecursionList: [], chosenIndex: null, searchWord: null, searchStatus: null, @@ -208,9 +192,6 @@ chartSearch4: { searchDep: null }, - searchDep2: null, - searchDep: null, - searchDate: [], applyData: [], workTimeList: [], multipleSelection: [], @@ -248,34 +229,68 @@ { id: 7, name: '临时用电作业' }, { id: 8, name: '盲板抽堵作业' } ], - workStatus: [ + rankData: [ { - name: '作业进行中', - value: 0 + num: '111', + name: '设备1', + dep: '事业部1', + count: 58 }, { - name: '作业终止', - value: 1 + num: '222', + name: '设备2', + dep: '事业部2', + count: 58 }, { - name: '作业结束待验收', - value: 2 + num: '333', + name: '设备3', + dep: '事业部3', + count: 58 }, { - name: '作业完成', - value: 3 + num: '444', + name: '设备4', + dep: '事业部4', + count: 58 + }, + { + num: '555', + name: '设备5', + dep: '事业部5', + count: 58 } ], - reviewForm: { - advice: '' - }, - reviewRules:{ - advice: [{ required: true, message: '请填写验收意见', trigger: 'blur' }] - } + wdsbData: [ + { + num: '111', + name: '设备1', + dep: '事业部1', + temRange: '>=35摄氏度', + tem: '38摄氏度', + status: '2' + }, + { + num: '222', + name: '设备1', + dep: '事业部1', + temRange: '<=55摄氏度', + tem: '38摄氏度', + status: '1' + }, + { + num: '333', + name: '设备1', + dep: '事业部1', + temRange: '>=55摄氏度', + tem: '38摄氏度', + status: '0' + } + ] }); // 页面载入时执行方法 onMounted(() => { - getListByPage(); + // getListByPage(); getAllDepartment(); initSbzt() initYcqs() @@ -294,9 +309,7 @@ trigger: 'item' }, legend: { - orient: 'vertical', - left: 'left', - top: 'center' + bottom: '10%' }, series: [ { @@ -531,7 +544,7 @@ } // 刷新 const reLoadData = async () => { - getListByPage(); + // getListByPage(); }; // 填写表单 @@ -556,29 +569,29 @@ }; // 分页获取列表 - const getListByPage = async () => { - const dateRange = JSON.parse(JSON.stringify(state.searchDate)) - if(dateRange[1]){dateRange[1] = dateRange[1].replace('00:00:00','23:59:59')} - const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord, applyDepId: state.searchDep,applyStartTime: dateRange[0],applyEndTime: dateRange[1]} }; - let res = await workApplyApi().getApplyList(data); - if (res.data.code === '200') { - state.applyData = JSON.parse(JSON.stringify(res.data.data)); - state.applyData = state.applyData.map((item) => { - if (item.operators == null || item.operators == []) { - item.operators = []; - } else { - item.operators = Array.from(item.operators, ({ operatorUname }) => operatorUname); - } - return item; - }); - state.totalSize1 = res.data.total; - } else { - ElMessage({ - type: 'warning', - message: res.data.msg - }); - } - }; + // const getListByPage = async () => { + // const dateRange = JSON.parse(JSON.stringify(state.searchDate)) + // if(dateRange[1]){dateRange[1] = dateRange[1].replace('00:00:00','23:59:59')} + // const data = { pageSize: state.pageSize1, pageIndex: state.pageIndex1, searchParams: { workType: state.searchWord, applyDepId: state.searchDep,applyStartTime: dateRange[0],applyEndTime: dateRange[1]} }; + // let res = await workApplyApi().getApplyList(data); + // if (res.data.code === '200') { + // state.applyData = JSON.parse(JSON.stringify(res.data.data)); + // state.applyData = state.applyData.map((item) => { + // if (item.operators == null || item.operators == []) { + // item.operators = []; + // } else { + // item.operators = Array.from(item.operators, ({ operatorUname }) => operatorUname); + // } + // return item; + // }); + // state.totalSize1 = res.data.total; + // } else { + // ElMessage({ + // type: 'warning', + // message: res.data.msg + // }); + // } + // }; // 表格数据格式化 const toNames = (row, column, cellValue, index) => { @@ -598,32 +611,32 @@ }; // 关键词查询记录 - const searchRecord = async () => { - if (state.searchWord == null && state.searchStatus == null && state.searchDep == null && state.searchDate == []) { - ElMessage({ - type: 'warning', - message: '请输入查询关键词' - }); - } else { - getListByPage(); - } - }; + // const searchRecord = async () => { + // if (state.searchWord == null && state.searchStatus == null && state.searchDep == null && state.searchDate == []) { + // ElMessage({ + // type: 'warning', + // message: '请输入查询关键词' + // }); + // } else { + // getListByPage(); + // } + // }; // 重置搜索 - const clearSearch = async () => { - state.searchWord = null; - state.searchDep = null; - state.searchDate = [] - getListByPage(); - }; - - const handleSizeChange1 = (val: number) => { - state.pageSize1 = val; - getListByPage(); - }; - const handleCurrentChange1 = (val: number) => { - state.pageIndex1 = val; - getListByPage(); - }; + // const clearSearch = async () => { + // state.searchWord = null; + // state.searchDep = null; + // state.searchDate = [] + // getListByPage(); + // }; + // + // const handleSizeChange1 = (val: number) => { + // state.pageSize1 = val; + // getListByPage(); + // }; + // const handleCurrentChange1 = (val: number) => { + // state.pageIndex1 = val; + // getListByPage(); + // }; const handleReview = (row)=>{ state.dialogReview = true @@ -656,7 +669,6 @@ Finished, Download, FolderChecked, - reviewFormRef, sbzt, ycqs, aqxj, @@ -667,11 +679,11 @@ reLoadData, toApply, toNames, - searchRecord, - clearSearch, - getListByPage, - handleSizeChange1, - handleCurrentChange1, + // searchRecord, + // clearSearch, + // getListByPage, + // handleSizeChange1, + // handleCurrentChange1, ...toRefs(state) }; } @@ -768,6 +780,15 @@ width: calc((100% - 20px)/3); height: 100%; } + .pageBtn { + display: flex; + align-items: center; + justify-content: right; + + .demo-pagination-block .demonstration { + margin-bottom: 16px; + } + } } .el-radio-group{ width: 20%; @@ -850,19 +871,6 @@ } } } - } - .pageBtn { - height: 60px; - display: flex; - align-items: center; - justify-content: right; - - .demo-pagination-block + .demo-pagination-block { - margin-top: 10px; - } - .demo-pagination-block .demonstration { - margin-bottom: 16px; - } } } } -- Gitblit v1.9.2