完成Banner,设备管理模块，进行中水电表

2026-04-24 17:52:50 +08:00
parent 290db6ba5d
commit ab736fa15f
36 changed files with 2314 additions and 636 deletions
--- a/src/views/system/inspection/Plan/addInspectionPlan.vue
+++ b/src/views/system/inspection/Plan/addInspectionPlan.vue
@@ -10,22 +10,8 @@
          <el-form-item label="巡检计划名称" prop="planName">
            <el-input v-model="form.planName" placeholder="请输入"></el-input>
          </el-form-item>
-          <el-form-item label="执行周期">
-            <el-date-picker
-              @update:model-value="handleTime"
-              v-model="taskDate"
-              type="daterange"
-              range-separator="到"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              start-placeholder="开启日期"
-              end-placeholder="结束日期"
-            />
-          </el-form-item>
+
          <el-form-item label="任务时间">
-            <el-select v-model="form.taskTime" placeholder="选择任务时间段" style="width: 100%">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
            <div flex flex-wrap>
              <div
                class="week-items"
@@ -43,6 +29,12 @@
              </div>
            </div>
          </el-form-item>
+          <el-form-item label="任务时间">
+            <el-select v-model="form.taskTime" placeholder="选择任务时间段" style="width: 100%">
+              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+
          <el-form-item label="提醒时间">
            <el-select v-model="form.remindTime" placeholder="请选择" style="width: 100%">
              <el-option v-for="item in com_inspection_remind_tiime" :key="item.value" :label="item.label" :value="item.value" />
@@ -72,7 +64,6 @@

 <script setup lang="ts">
 import { listRoute } from '@/api/system/InspectionRoute';
-import RepairUser from '@/components/Holder/repairUser.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { numToWeek } from '@/utils/time';
 import { Delete } from '@element-plus/icons-vue';
@@ -92,7 +83,6 @@ const form = ref({
  planName: '', // 巡检计划名称
  inspectorIds: '', // 巡检人员
  taskTime: '', // 任务时间段
-  executeCycle: '', // 执行周期
  executeDay: '', // 执行周期具体的周几
  remindTime: '', // 提醒时间
  routeIds: '', // 计划路线id
@@ -101,17 +91,9 @@ const form = ref({
 const rules = ref({
  planName: [{ required: true, message: '请输入巡检计划名称', trigger: 'blur' }],
  inspectorIds: [{ required: true, message: '请选择巡检人员', trigger: 'blur' }],
-  executeCycle: [{ required: true, message: '请输入执行周期', trigger: 'blur' }],
  routeIds: [{ required: true, message: '请选择路线', trigger: 'blur' }]
 });

-//  执行周期
-const taskDateSplit = ' - ';
-const taskDate = ref([]);
-function handleTime(val: string[]) {
-  taskDate.value = val;
-  form.value.executeCycle = `${val[0]}${taskDateSplit}${val[1]}`;
-}
 // 选择周几
 const checkoutWeek = ref([]);
 function checkoutWeekFun(val: number) {
@@ -132,21 +114,6 @@ const options = ref([
 ]);
 // 提醒时间

-const remindTimeoptions = ref([
-  {
-    value: 10,
-    label: '任务开始前10分钟'
-  },
-  {
-    value: 15,
-    label: '任务开始前15分钟'
-  },
-  {
-    value: 20,
-    label: '任务开始前30分钟'
-  }
-]);
-
 // 巡检计划id
 const editid = ref(null);

@@ -164,13 +131,11 @@ async function init() {
        planName: res.data.planName, // 巡检计划名称
        inspectorIds: res.data.inspectorIds, // 巡检人员
        taskTime: res.data.taskTime, // 任务时间段
-        executeCycle: res.data.executeCycle, // 执行周期
        executeDay: res.data.executeDay, // 执行周期具体的周几
        remindTime: res.data.remindTime, // 提醒时间
        routeIds: res.data.routeIds, // 计划路线id
        inspectSetting: String(res.data.inspectSetting) // 巡检设置
      };
-      taskDate.value = res.data.executeCycle.split(taskDateSplit);
      checkoutWeek.value = res.data.executeDay
        .split(',')
        .map((item) => Number(item))
@@ -183,19 +148,6 @@ async function init() {

 init();

-// 选择 巡检人员
-const RepairUserRef = ref<InstanceType<typeof RepairUser>>();
-function handleAddUser() {
-  RepairUserRef.value.open();
-}
-const checkoutUserlist = ref([]);
-function handleUserChange(val) {
-  checkoutUserlist.value = val;
-}
-function handleDelete(id) {
-  checkoutUserlist.value = checkoutUserlist.value.filter((item) => item.userId !== id);
-}
-
 // 返回
 function routeback() {
  router.back();
@@ -275,7 +227,6 @@ const formRef = ref();
 function submit() {
  formRef.value?.validate(async (valid: boolean) => {
    if (valid) {
-      form.value.inspectorIds = checkoutUserlist.value.map((item) => item.userId).join(',');
      if (editid.value) {
        updatePlan(form.value).then(() => {
          ElMessage.success('编辑成功');
--- a/src/views/system/inspection/Plan/index.vue
+++ b/src/views/system/inspection/Plan/index.vue
@@ -38,7 +38,7 @@
      <el-table v-loading="loading" border :data="planList" @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column label="巡检计划名称" align="center" prop="planName" />
-        <el-table-column label="执行周期" align="center" prop="executeCycle" />
+        <!-- <el-table-column label="执行周期" align="center" prop="executeCycle" /> -->
        <el-table-column label="执行星期" align="center">
          <template #default="scope">
            <span v-for="(item, index) in scope.row.executeDayNames" :key="index" class="pl-5px">{{ numToWeek(item) }}</span>
@@ -46,19 +46,15 @@
        </el-table-column>
        <el-table-column label="任务时间" align="center" prop="taskTime" />
        <el-table-column label="计划路线" align="center" prop="routeNames" />
-        <el-table-column label="状态" align="center" prop="status">
+        <el-table-column label="状态" width="150" align="center" prop="status">
          <template #default="scope">
            <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" active-text="关闭" inactive-text="开启"></el-switch>
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column label="操作" width="110" align="center" fixed="right" class-name="small-padding fixed-width">
          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:plan:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:plan:remove']"></el-button>
-            </el-tooltip>
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:plan:edit']">修改</el-button>
+            <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:plan:remove']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>