From 117a610fabed1ed4b2b78d0ab672b1e95bfb2f05 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期三, 20 七月 2022 10:08:14 +0800
Subject: [PATCH] 添加修改页面,设置修改时默认显示日期范围
---
src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue | 28 --------------
src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue | 76 +++++++++++++++++++++++++++++--------
src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue | 1
3 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
index 156c37e..0ef9dc1 100644
--- a/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
+++ b/src/views/IntelligentXjSys/inspectionTaskManagement/inspectionTask/index.vue
@@ -111,43 +111,85 @@
</el-scrollbar>
<el-dialog v-model="dialogDetails" title="巡检任务">
<el-form :model="details" label-width="120px">
- <el-form-item label="名称">
+ <el-form-item label="任务名称">
<el-input
v-model="details.name"
readonly
/>
</el-form-item>
- <el-form-item label="排班类型">
+ <el-form-item label="任务类型">
<el-input
v-model="details.type"
readonly
/>
</el-form-item>
- <el-form-item label="自定义循环班" v-if="JSON.parse(JSON.stringify(details.type)) == '循环班'">
- <div>
+ <el-form-item label="执行巡检人员">
+ <el-input
+ v-model="details.inspector"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="检查频次">
+ <el-input
+ v-model="details.inspector"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="检查频次" prop="frequency">
+ <el-input
+ v-model="details.frequency"
+ readonly
+ >
+ <template #append>
+ <el-input
+ v-model="details.unit"
+ readonly
+ />
+ </template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="周期开始时间">
+ <el-input
+ v-model="details.startTime"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="周期有效时间">
+ <el-input
+ v-model="details.validTime"
+ readonly
+ />
+ </el-form-item>
+ <el-form-item label="巡检链">
+ <div style="width: 100%;margin-left: -30px">
<div v-for="(item,index) in details.shiftSteps" class="stepItem">
<div class="stepNum">{{index+1}}</div>
<div class="stepCard">
<el-card class="box-card" shadow="hover">
<template #header>
<div class="card-header">
- <div>第<span>{{index+1}}</span>班</div>
+ <div>{{item.name}}</div>
</div>
</template>
- <div class="text item">排班名称：<span>{{item.name}}</span></div>
- <div class="text item">工作天数：<span>{{item.days}}</span></div>
- <div class="text item">休息天数：<span>{{item.rest}}</span></div>
- <div class="text item">工作时段：<span>{{item.timeRange}}</span></div>
+ <div>
+ <el-table
+ :data="item.inspectorData"
+ style="width: 100%"
+ :default-sort="{ prop: 'sort', order: 'ascending' }"
+ :header-cell-style="{background: '#fafafa',padding: '5px'}"
+ >
+ <el-table-column property="sort" sortable label="排序"/>
+ <el-table-column property="name" label="巡检点名称"/>
+ <el-table-column property="section" label="所属设备区域"/>
+ <el-table-column property="rfid" label="关联RFID"/>
+ <el-table-column property="norm" label="巡检指标"/>
+ <el-table-column property="reference" label="数据参考值"/>
+ </el-table>
+ </div>
</el-card>
</div>
</div>
</div>
- </el-form-item>
- <el-form-item label="工作时段" prop="timeRange" v-if="JSON.parse(JSON.stringify(details.type)) == '固定班'">
- <el-input
- v-model="details.timeRange"
- readonly
- />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="dialogDetails = false" size="default">确认</el-button>
@@ -547,7 +589,7 @@
if(chosenIndex.value == -1){
if(!addRecord.value.shiftSteps || addRecord.value.shiftSteps.length == 0){
ElMessage({
- message: '请先设置自定义排班后再提交',
+ message: '请先设置巡检链后再提交',
type: 'warning',
})
return
@@ -560,7 +602,7 @@
}else{
if(addRecord.value.shiftSteps.length == 0){
ElMessage({
- message: '请先设置自定义排班后再提交',
+ message: '请先设置巡检链后再提交',
type: 'warning',
})
return
diff --git a/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue b/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
index a763fc0..6e43c0a 100644
--- a/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
+++ b/src/views/basicRightsManagement/personnelShiftManagement/personnelManagement/index.vue
@@ -261,6 +261,7 @@
dialogAddRecord.value = true
chosenIndex.value = index
addRecord.value = JSON.parse(JSON.stringify(row))
+ addRecord.value.timeRange= [addRecord.value.startTime,addRecord.value.endTime]
}
// 折线图
const renderMenu = async (value: string) => {
diff --git a/src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue b/src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue
index ee5228a..9421d04 100644
--- a/src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue
+++ b/src/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue
@@ -118,9 +118,6 @@
interface type {
}
- // export default defineComponent({
- // name: 'workCheckinRecord',
- // setup() {
const userInfo = useUserInfo()
const { userInfos } = storeToRefs(userInfo);
const state = reactive<stateType>({});
@@ -206,31 +203,6 @@
userInfos.value.projectId = value
await initBackEndControlRoutes();
};
- // return {
- // renderMenu,
- // multipleTableRef,
- // tableData,
- // currentPage,
- // pageSize,
- // dialogDetails,
- // details,
- // deleteDialog,
- // dialogAddRecord,
- // viewRecord,
- // deleteRecord,
- // handleSizeChange,
- // handleCurrentChange,
- // Plus,
- // Edit,
- // Delete,
- // Search,
- // Download,
- // handleSelectionChange,
- // Refresh,
- // ...toRefs(state),
- // };
- // },
- // });
</script>
<style scoped lang="scss">
--
Gitblit v1.9.2