From eb757d1c203089d083aa2ed16cada41e497b94a0 Mon Sep 17 00:00:00 2001
From: 17630416519 <qazwsx123>
Date: Sat, 13 Dec 2025 15:48:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceRouteInspectionPlan/index.vue       | 469 ++++++++++--------
 .../deviceTaskExecute/index.vue               |  16 +-
 .../deviceManagement/deviceaccount/index.vue  |  50 +-
 .../deviceManagement/deviceinspect/index.vue  |   2 +-
 4 files changed, 301 insertions(+), 236 deletions(-)

diff --git a/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
index 60dc388..4ed7020 100644
--- a/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
+++ b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
@@ -1,224 +1,248 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-			<el-form-item label="巡检名称" prop="name">
-				<el-input v-model="queryParams.name" placeholder="请输入巡检名称" clearable />
-			</el-form-item>
+  <div class="app-container">
+    <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+      <el-form-item label="巡检名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入巡检名称" clearable />
+      </el-form-item>
 
-			<el-form-item label="开始时间" prop="lifeCycleStart">
-				<el-date-picker v-model="queryParams.lifeCycleStart" type="datetime" placeholder="请输入开始时间" />
-			</el-form-item>
+      <el-form-item label="开始时间" prop="lifeCycleStart">
+        <el-date-picker v-model="queryParams.lifeCycleStart" type="datetime" placeholder="请输入开始时间" />
+      </el-form-item>
 
-			<el-form-item label="结束时间" prop="lifeCycleEnd">
-				<el-date-picker v-model="queryParams.lifeCycleEnd" type="datetime" placeholder="请输入结束时间" />
-			</el-form-item>
-			<el-form-item label="类别" prop="innerType">
-				<el-radio-group v-model="queryParams.innerType" @change="handleQuery">
-					<el-radio-button :label="-1">全部</el-radio-button>
-					<el-radio-button :label="1">检查</el-radio-button>
-					<el-radio-button :label="2">保养</el-radio-button>
-				</el-radio-group>
-			</el-form-item>
-			<el-form-item label="巡检类型" prop="excuteCycleType">
-				<el-select v-model="queryParams.excuteCycleType" placeholder="请选择巡检类型" @change="handleQuery">
-					<el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
-				</el-select>
-			</el-form-item>
-			<el-form-item label="巡检状态" prop="status">
-				<el-radio-group v-model="queryParams.status" @change="handleQuery">
-					<el-radio-button :label="-1">全部</el-radio-button>
-					<el-radio-button :label="0">停用</el-radio-button>
-					<el-radio-button :label="1">启用</el-radio-button>
-				</el-radio-group>
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" @click="handleQuery">
-					<i class="el-icon-search"></i>
-					<span>搜索</span>
-				</el-button>
-				<el-button @click="resetQuery">
-					<i class="el-icon-refresh"></i>
-					<span>重置</span>
-				</el-button>
-			</el-form-item>
-		</el-form>
-		<!-- 工具区域 -->
-		<el-row :gutter="15" class="mb10">
-			<el-col :span="1.5">
-				<el-button type="primary" v-hasPermi="['deviceManagement:devicerouteinspectionplan:add']" plain @click="handleAdd">
-					<i class="el-icon-plus"></i>
-					<span>新增</span>
-				</el-button>
-			</el-col>
-			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-		</el-row>
+      <el-form-item label="结束时间" prop="lifeCycleEnd">
+        <el-date-picker v-model="queryParams.lifeCycleEnd" type="datetime" placeholder="请输入结束时间" />
+      </el-form-item>
+      <el-form-item label="类别" prop="innerType">
+        <el-radio-group v-model="queryParams.innerType" @change="handleQuery">
+          <el-radio-button :label="-1">全部</el-radio-button>
+          <el-radio-button :label="1">检查</el-radio-button>
+          <el-radio-button :label="2">保养</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="巡检类型" prop="excuteCycleType">
+        <el-select v-model="queryParams.excuteCycleType" placeholder="请选择巡检类型" @change="handleQuery">
+          <el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel"
+            :value="parseInt(item.dictValue)"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="巡检状态" prop="status">
+        <el-radio-group v-model="queryParams.status" @change="handleQuery">
+          <el-radio-button :label="-1">全部</el-radio-button>
+          <el-radio-button :label="0">停用</el-radio-button>
+          <el-radio-button :label="1">启用</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleQuery">
+          <i class="el-icon-search"></i>
+          <span>搜索</span>
+        </el-button>
+        <el-button @click="resetQuery">
+          <i class="el-icon-refresh"></i>
+          <span>重置</span>
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 工具区域 -->
+    <el-row :gutter="15" class="mb10">
+      <el-col :span="1.5">
+        <el-button type="primary" v-hasPermi="['deviceManagement:devicerouteinspectionplan:add']" plain
+          @click="handleAdd">
+          <i class="el-icon-plus"></i>
+          <span>新增</span>
+        </el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
 
-		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
-			<el-table-column prop="id" label="id" align="center" :show-overflow-tooltip="true" v-if="showColumn('id')" />
-			<el-table-column prop="name" label="巡检名称" align="center" :show-overflow-tooltip="true" v-if="showColumn('name')" />
-			<el-table-column prop="innerType" label="类别"  align="center" v-if="showColumn('innerType')">
-				<template slot="default" slot-scope="scope">
-					<el-tag :type="scope.row.innerType === 1 ? 'success' : 'warning'">{{ scope.row.innerType === 1 ? '检查' : '保养' }}</el-tag>
-				</template>
-			</el-table-column>
-			<!-- <el-table-column prop="fkPersonId" label="执行人" align="center" :show-overflow-tooltip="true" v-if="showColumn('fkPersonId')" /> -->
-			<el-table-column label="添加设备" align="center">
-				<template slot="default" slot-scope="scope">
-					<el-button type="primary" size="small" title="添加设备" @click="AddDevice(scope.row)">
-						<i class="el-icon-folder-add"></i>
-					</el-button>
-				</template>
-			</el-table-column>
-			<el-table-column prop="excuteCycleType" label="执行周期类型" align="center" v-if="showColumn('excuteCycleType')">
-				<template slot="default" slot-scope="scope">
-					<el-tag v-if="scope.row.excuteCycleType === 1" type="primary">按天</el-tag>
-					<el-tag v-else-if="scope.row.excuteCycleType === 2" type="warning">按周</el-tag>
-					<el-tag v-else-if="scope.row.excuteCycleType === 3" type="success">按月</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="dayNum" label="每第几天" align="center" v-if="showColumn('dayNum')" />
-			<el-table-column prop="weekList" label="每周几" align="center" :show-overflow-tooltip="true" v-if="showColumn('weekList')">
-				<template slot="default" slot-scope="scope">
-					<el-tag size="small" v-for="(item, index) in scope.row.weekList" :key="index" effect="dark" round> {{ item }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="monthDayList" label="每月几" align="center" :show-overflow-tooltip="true" v-if="showColumn('monthDayList')" />
-			<el-table-column prop="lifeCycleStart" label="开始时间" :show-overflow-tooltip="true" v-if="showColumn('lifeCycleStart')" />
-			<el-table-column prop="lifeCycleEnd" label="结束时间" :show-overflow-tooltip="true" v-if="showColumn('lifeCycleEnd')" />
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+      highlight-current-row @sort-change="sortChange">
+      <el-table-column prop="id" label="id" align="center" :show-overflow-tooltip="true" v-if="showColumn('id')" />
+      <el-table-column prop="name" label="巡检名称" align="center" :show-overflow-tooltip="true"
+        v-if="showColumn('name')" />
+      <el-table-column prop="innerType" label="类别" align="center" v-if="showColumn('innerType')">
+        <template slot="default" slot-scope="scope">
+          <el-tag :type="scope.row.innerType === 1 ? 'success' : 'warning'">{{ scope.row.innerType === 1 ? '检查' : '保养'
+            }}</el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="fkPersonId" label="执行人" align="center" :show-overflow-tooltip="true" v-if="showColumn('fkPersonId')" /> -->
+      <el-table-column label="添加设备" align="center">
+        <template slot="default" slot-scope="scope">
+          <el-button type="primary" size="small" title="添加设备" @click="AddDevice(scope.row)">
+            <i class="el-icon-folder-add"></i>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="excuteCycleType" label="执行周期类型" align="center" v-if="showColumn('excuteCycleType')">
+        <template slot="default" slot-scope="scope">
+          <el-tag v-if="scope.row.excuteCycleType === 1" type="primary">按天</el-tag>
+          <el-tag v-else-if="scope.row.excuteCycleType === 2" type="warning">按周</el-tag>
+          <el-tag v-else-if="scope.row.excuteCycleType === 3" type="success">按月</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="dayNum" label="每第几天" align="center" v-if="showColumn('dayNum')" />
+      <el-table-column prop="weekList" label="每周几" align="center" :show-overflow-tooltip="true"
+        v-if="showColumn('weekList')">
+        <template slot="default" slot-scope="scope">
+          <el-tag size="small" v-for="(item, index) in scope.row.weekList" :key="index" effect="dark" round> {{ item
+            }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="monthDayList" label="每月几" align="center" :show-overflow-tooltip="true"
+        v-if="showColumn('monthDayList')" />
+      <el-table-column prop="lifeCycleStart" label="开始时间" :show-overflow-tooltip="true"
+        v-if="showColumn('lifeCycleStart')" />
+      <el-table-column prop="lifeCycleEnd" label="结束时间" :show-overflow-tooltip="true"
+        v-if="showColumn('lifeCycleEnd')" />
 
-			<!-- <el-table-column
+      <!-- <el-table-column
         prop="excuteDayStartTime"
         label="执行开始时间"
         :show-overflow-tooltip="true"
         v-if="showColumn('excuteDayStartTime')" /> -->
-			<el-table-column prop="status" label="巡检状态" align="center" v-if="showColumn('status')">
-				<template slot="default" slot-scope="scope">
-					<el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">{{ scope.row.status === 1 ? '启用' : '停用' }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="showColumn('remark')" />
+      <el-table-column prop="status" label="巡检状态" align="center" v-if="showColumn('status')">
+        <template slot="default" slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">{{ scope.row.status === 1 ? '启用' : '停用'
+            }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true"
+        v-if="showColumn('remark')" />
 
-			<el-table-column label="操作" width="160">
-				<template slot="default" slot-scope="scope">
-					<el-button type="success" size="small" title="编辑" @click="handleUpdate(scope.row)">
-						<i class="el-icon-edit"></i>
-					</el-button>
-					<el-button type="danger" size="small" title="删除" @click="handleDelete(scope.row)">
-						<i class="el-icon-delete"></i>
-					</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <el-table-column label="操作" width="160">
+        <template slot="default" slot-scope="scope">
+          <el-button type="success" size="small" title="编辑" @click="handleUpdate(scope.row)">
+            <i class="el-icon-edit"></i>
+          </el-button>
+          <el-button type="danger" size="small" title="删除" @click="handleDelete(scope.row)">
+            <i class="el-icon-delete"></i>
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
 
-		<!-- 添加或修改巡检计划对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :close-on-click-modal="false" :visible.sync="open" width="60%">
-			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-				<el-row :gutter="20">
-					<el-col :lg="12">
-						<el-form-item label="巡检名称" prop="name">
-							<el-input v-model="form.name" placeholder="请输入巡检名称" />
-						</el-form-item>
-					</el-col>
-					<el-col :lg="12">
-						<el-form-item label="类别" prop="innerType">
-							<el-radio-group v-model="form.innerType">
-								<el-radio v-for="item in options.innerTypeOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">
-									{{ item.dictLabel }}
-								</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
+    <!-- 添加或修改巡检计划对话框 -->
+    <el-dialog :title="title" :lock-scroll="false" :close-on-click-modal="false" :visible.sync="open" width="60%">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
 
-					<el-col :lg="12">
-						<el-form-item label="执行人" prop="fkPersonId">
-							<el-input v-model="form.fkPersonId" placeholder="请输入执行人" />
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="巡检名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入巡检名称" />
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="12">
-						<el-form-item label="生命周期开始" prop="lifeCycleStart">
-							<el-date-picker v-model="form.lifeCycleStart" type="datetime" value-format="yyyy-MM-dd hh:mm:ss" :teleported="false" placeholder="选择日期时间"></el-date-picker>
-						</el-form-item>
-					</el-col>
+       
 
-					<el-col :lg="12">
-						<el-form-item label="生命周期结束" prop="lifeCycleEnd">
-							<el-date-picker v-model="form.lifeCycleEnd" type="datetime" value-format="yyyy-MM-dd hh:mm:ss" :teleported="false" placeholder="选择日期时间"></el-date-picker>
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="执行人" prop="fkPersonId">
+              <el-input v-model="form.fkPersonId" placeholder="请输入执行人" />
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="24">
-						<el-form-item label="执行周期类型" prop="excuteCycleType">
-							<el-select v-model="form.excuteCycleType" placeholder="请选择执行周期类型">
-								<el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel" :value="parseInt(item.dictValue)"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="生命周期开始" prop="lifeCycleStart">
+              <el-date-picker v-model="form.lifeCycleStart" type="datetime" value-format="yyyy-MM-dd hh:mm:ss"
+                :teleported="false" placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="24" v-show="form.excuteCycleType == 1">
-						<el-form-item label="每第几天" prop="dayNum">
-							<el-input-number v-model="form.dayNum" :min="1" :max="365" />
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="生命周期结束" prop="lifeCycleEnd">
+              <el-date-picker v-model="form.lifeCycleEnd" type="datetime" value-format="yyyy-MM-dd hh:mm:ss"
+                :teleported="false" placeholder="选择日期时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="24" v-show="form.excuteCycleType == 2">
-						<el-form-item label="每周几" prop="weekList">
-							<el-select v-model="form.weekList" multiple placeholder="请选择">
-								<el-option v-for="item in options.weekList_options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
-								</el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="巡检状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="item in options.statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">
+                  {{ item.dictLabel }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="24" v-show="form.excuteCycleType == 3">
-						<el-form-item label="每月几" prop="monthDayList">
-							<el-input-number v-model="form.monthDayList" :min="1" :max="32" />
-						</el-form-item>
-					</el-col>
+          <el-col :lg="12">
+            <el-form-item label="执行周期类型" prop="excuteCycleType">
+              <el-select v-model="form.excuteCycleType" placeholder="请选择执行周期类型">
+                <el-option v-for="item in options.excuteCycleTypeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="parseInt(item.dictValue)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-					<el-col :lg="12">
-						<el-form-item label="巡检状态" prop="status">
-							<el-radio-group v-model="form.status">
-								<el-radio v-for="item in options.statusOptions" :key="item.dictValue" :label="parseInt(item.dictValue)">
-									{{ item.dictLabel }}
-								</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :lg="12">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark" placeholder="请输入备注" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<template slot="footer" v-if="opertype != 3">
-				<el-button @click="cancel">
-					<i class="el-icon-circle-close"></i>
-					<span>取消</span>
-				</el-button>
-				<el-button type="primary" @click="submitForm">
-					<i class="el-icon-check"></i>
-					<span>提交</span>
-				</el-button>
-			</template>
-		</el-dialog>
+          <el-col :lg="12" v-show="form.excuteCycleType == 1">
+            <el-form-item label="每第几天" prop="dayNum">
+              <el-input-number v-model="form.dayNum" :min="1" :max="365" />
+            </el-form-item>
+          </el-col>
 
-		<el-dialog title="添加设备" :lock-scroll="false" :visible.sync="open_device" width="80%">
-			<Devicelist :message="messageFromParent"></Devicelist>
-			<template slot="footer">
-				<el-button @click="open_device = false">
-					<i class="el-icon-circle-close"></i>
-					<span>取消</span>
-				</el-button>
-				<el-button type="primary" @click="open_device = false">
-					<i class="el-icon-check"></i>
-					<span>提交</span>
-				</el-button>
-			</template>
-		</el-dialog>
-	</div>
+          <el-col :lg="12" v-show="form.excuteCycleType == 2">
+            <el-form-item label="每周几" prop="weekList">
+              <el-select v-model="form.weekList" multiple placeholder="请选择">
+                <el-option v-for="item in options.weekList_options" :key="item.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :lg="12" v-show="form.excuteCycleType == 3">
+            <el-form-item label="每月几" prop="monthDayList">
+              <el-input-number v-model="form.monthDayList" :min="1" :max="32" />
+            </el-form-item>
+          </el-col>
+
+         
+
+          <el-col :lg="12">
+            <el-form-item label="类别" prop="innerType">
+              <el-radio-group v-model="form.innerType">
+                <el-radio v-for="item in options.innerTypeOptions" :key="item.dictValue"
+                  :label="parseInt(item.dictValue)">
+                  {{ item.dictLabel }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :lg="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template slot="footer" v-if="opertype != 3">
+        <el-button @click="cancel">
+          <i class="el-icon-circle-close"></i>
+          <span>取消</span>
+        </el-button>
+        <el-button type="primary" @click="submitForm">
+          <i class="el-icon-check"></i>
+          <span>提交</span>
+        </el-button>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="添加设备" :lock-scroll="false" :visible.sync="open_device" width="80%">
+      <Devicelist :message="messageFromParent"></Devicelist>
+      <template slot="footer">
+        <el-button @click="open_device = false">
+          <i class="el-icon-circle-close"></i>
+          <span>取消</span>
+        </el-button>
+        <el-button type="primary" @click="open_device = false">
+          <i class="el-icon-check"></i>
+          <span>提交</span>
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -275,7 +299,7 @@ export default {
       open_device: false,
       messageFromParent: '',
       form: {
-      
+
         name: null,
         fkPersonId: null,
         innerType: 1,
@@ -285,8 +309,8 @@ export default {
         lifeCycleEnd: null,
         excuteCycleType: 0,
         dayNum: 1,
-        weekList: [],
-        monthDayList: 1,
+        weekList: '',
+        monthDayList:'1',
         excuteDayStartTime: null,
         excuteDayEndTime: null,
         remark: null,
@@ -295,7 +319,26 @@ export default {
         updatedBy: null,
         updatedTime: null
       },
-      rules: {},
+      rules: {
+        name: [
+          { required: true, message: '请输入巡检名称', trigger: 'blur' }
+        ],
+        fkPersonId: [
+          { required: true, message: '请选择执行人', trigger: 'blur' }
+        ],
+        status: [
+          { required: true, message: '请选择巡检状态', trigger: 'blur' }
+        ],
+        innerType: [
+          { required: true, message: '请选择类别', trigger: 'blur' }
+        ],
+        lifeCycleStart: [
+          { required: true, message: '请选择生命周期开始', trigger: 'blur' }
+        ],
+        lifeCycleEnd: [
+          { required: true, message: '请选择生命周期结束', trigger: 'blur' }
+        ],  
+      },
       options: {
         // 巡检状态 选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
         statusOptions: [
@@ -348,7 +391,7 @@ export default {
             } else {
               e.weekList = null
             }
-            
+
             e.monthDayList = parseInt(e.monthDayList)
           })
           this.dataList = data.result
@@ -392,7 +435,6 @@ export default {
     // 重置表单
     reset() {
       this.form = {
-        
         name: null,
         fkPersonId: null,
         innerType: 1,
@@ -402,8 +444,8 @@ export default {
         lifeCycleEnd: null,
         excuteCycleType: 0,
         dayNum: 1,
-        weekList: [],
-        monthDayList: 1,
+        weekList: '',
+        monthDayList:'1',
         excuteDayStartTime: null,
         excuteDayEndTime: null,
         remark: null,
@@ -456,6 +498,11 @@ export default {
     // 添加&修改 表单提交
     submitForm() {
       this.$refs.formRef.validate((valid) => {
+        let data={
+          ...this.form,
+          weekList:this.form.weekList='',
+          monthDayList: this.form.monthDayList.toString()
+        }
         if (valid) {
           if (this.form.weekList != null && this.form.weekList != '') {
             this.form.weekList = this.form.weekList.join(',')
@@ -464,13 +511,13 @@ export default {
           }
 
           if (this.form.id != undefined && this.opertype === 2) {
-            updateDeviceRouteInspectionPlan(this.form).then((res) => {
+            updateDeviceRouteInspectionPlan(data).then((res) => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
               this.getList()
             })
           } else {
-            addDeviceRouteInspectionPlan(this.form).then((res) => {
+            addDeviceRouteInspectionPlan(data).then((res) => {
               this.$modal.msgSuccess('新增成功')
               this.open = false
               this.getList()
diff --git a/src/views/deviceManagement/deviceTaskExecute/index.vue b/src/views/deviceManagement/deviceTaskExecute/index.vue
index 017b724..a22df14 100644
--- a/src/views/deviceManagement/deviceTaskExecute/index.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/index.vue
@@ -6,7 +6,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-      <el-form-item label="任务名称1" prop="taskName">
+      <el-form-item label="任务名称" prop="taskName">
         <el-input clearable v-model.trim="queryParams.taskName" placeholder="请输入任务名称" />
       </el-form-item>
       <el-form-item label="任务派发时间" prop="timeRange">
@@ -156,11 +156,11 @@
           <el-col :lg="24">
             <el-form-item label="状态" prop="status">
               <el-radio-group :disabled="opertype === 3" v-model="form.status">
-                <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue"
-                  :value="parseInt(item.dictValue)">
-                  {{ item.dictLabel }}
-                </el-radio-button>
-              </el-radio-group>
+  <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue"
+    :label="parseInt(item.dictValue)">
+    {{ item.dictLabel }}
+  </el-radio-button>
+</el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :lg="24">
@@ -213,7 +213,7 @@ export default {
         timeStart: null,
         timeEnd: null,
         type: -1,
-        status: -1,
+        status: 0,
         sort: 'createdTime',
         sortType: 'desc'
       },
@@ -473,7 +473,7 @@ export default {
         type: 'warning'
       })
         .then(async () => {
-          await this.downFile('/dev/DeviceTaskExecute/export', { ...this.queryParams })
+          await this.downFile('/mes/deviceManagement/DeviceTaskExecute/export', { ...this.queryParams })
         })
     }
   }
diff --git a/src/views/deviceManagement/deviceaccount/index.vue b/src/views/deviceManagement/deviceaccount/index.vue
index 1fd6f23..c136625 100644
--- a/src/views/deviceManagement/deviceaccount/index.vue
+++ b/src/views/deviceManagement/deviceaccount/index.vue
@@ -110,7 +110,8 @@
       </el-col>
     </el-row>
     <!-- 添加或修改设备台账对话框 -->
-    <el-dialog :title="title" @close="handleClose" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
+    <el-dialog :title="title" @close="handleClose" :lock-scroll="false" :visible.sync="open"
+      :close-on-click-modal="false">
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <!-- 按步骤填写数据 -->
         <el-steps style="margin-bottom: 10px" :active="stepsActive" process-status="process" finish-status="success"
@@ -151,10 +152,11 @@
               <el-form-item label="设备状态" prop="status">
                 <el-radio-group v-model="form.status">
                   <el-radio v-for="item in options.statusOptions" :key="item.dictValue"
-                    :value="parseInt(item.dictValue)">
+                    :label="parseInt(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-radio>
                 </el-radio-group>
+
               </el-form-item>
             </el-col>
 
@@ -184,7 +186,12 @@
 
             <el-col :lg="12">
               <el-form-item label="设备类型" prop="fkDeviceType">
-                <TypeTreeSelect v-model="form.fkDeviceType" @selected="handlerDeviceTypeSelected"></TypeTreeSelect>
+                <el-select v-model="form.fkDeviceType" placeholder="请选择设备类型">
+                  <el-option v-for="item in deviceTypeOptions" :key="item.id" :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <TypeTreeSelect v-model="form.fkDeviceType" @selected="handlerDeviceTypeSelected"></TypeTreeSelect> -->
               </el-form-item>
             </el-col>
             <el-col :lg="24">
@@ -201,10 +208,10 @@
                   :limit="1" /> -->
                 <el-upload list-type="picture-card" :action="uploadImgUrl" :on-success="handleUploadSuccess"
                   :before-upload="handleBeforeUpload" :on-exceed="handleExceed" :on-remove="handleRemove"
-                  ref="uploadimg"
-                  :on-error="handleUploadError" name="file" :show-file-list="true"
+                  ref="uploadimg" :on-error="handleUploadError" name="file" :show-file-list="true"
                   :data="{ uploadType: 1, filePath: 'device/inspect' }" :limit="1" :file-list="fileList"
-                  :on-preview="handlePictureCardPreview" :class="{ hide: this.fileList.length >= 1 }" :headers="headers">
+                  :on-preview="handlePictureCardPreview" :class="{ hide: this.fileList.length >= 1 }"
+                  :headers="headers">
                   <i slot="default" class="el-icon-plus"></i>
                 </el-upload>
               </el-form-item>
@@ -233,15 +240,16 @@
 <script>
 import { listDeviceAccount, addDeviceAccount, delDeviceAccount, updateDeviceAccount, getDeviceAccount } from '@/api/deviceManagement/deviceaccount.js'
 import Typetree from '@/views/deviceManagement/components/BaseDeviceTypeTree'
-import TypeTreeSelect from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect'
+// import TypeTreeSelect from '@/views/deviceManagement/components/BaseDeviceTypeTreeSelect'
 import TheDeviceActionDialog from './TheDeviceActionDialog'
 import { resetForm } from '@/utils/ruoyi.js'
+import * as API_devicetype from '@/api/deviceManagement/devicetype'
 import { getToken } from '@/utils/auth'
 export default {
   name: 'deviceaccount',
   components: {
     Typetree,
-    TypeTreeSelect,
+    // TypeTreeSelect,
     TheDeviceActionDialog
   },
   data() {
@@ -249,6 +257,7 @@ export default {
       ids: [],
       loading: false,
       showSearch: true,
+      deviceTypeOptions:[],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -290,7 +299,7 @@ export default {
       opertype: 0,
       open: false,
       form: {
-        id: null,
+        // id: null,
         fkDeviceType: null,
         deviceName: null,
         deviceCode: null,
@@ -411,7 +420,7 @@ export default {
 
     reset() {
       this.form = {
-        id: null,
+        // id: null,
         fkDeviceType: null,
         deviceName: null,
         deviceCode: null,
@@ -439,6 +448,15 @@ export default {
       this.open = true
       this.title = '添加设备台账'
       this.opertype = 1
+      API_devicetype.getList(this.queryParams).then((res) => {
+				if (res.code == 200) {
+          console.log('类型123',res);
+          this.deviceTypeOptions=res.data.map(item=>{
+            return {label:item.name,value:item.id}
+          })
+					// this.deptOptions = handleTree(res.data, 'id', 'parentId', 'children');
+				}
+			})
     },
 
     handleUpdate(row) {
@@ -493,13 +511,13 @@ export default {
           this.$modal.msgSuccess('删除成功')
         })
     },
-    handleClose(){
+    handleClose() {
       if (this.$refs.uploadimg) {
-    this.$refs.uploadimg.clearFiles()
-  }
-  // 同时清空本地文件列表状态
-  this.fileList = []
-      this.open=false
+        this.$refs.uploadimg.clearFiles()
+      }
+      // 同时清空本地文件列表状态
+      this.fileList = []
+      this.open = false
     },
     stepsNext(max = 2) {
       if (this.stepsActive++ > max) this.stepsActive = max
diff --git a/src/views/deviceManagement/deviceinspect/index.vue b/src/views/deviceManagement/deviceinspect/index.vue
index 45321e8..169afbe 100644
--- a/src/views/deviceManagement/deviceinspect/index.vue
+++ b/src/views/deviceManagement/deviceinspect/index.vue
@@ -83,7 +83,7 @@
     <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改设备检查项对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+    <el-dialog :title="title" :close-on-click-modal="false" :lock-scroll="false" :visible.sync="open">
       <!-- 基本信息 -->
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">