From 5e252eccae991e46e64d3dea4726910953a9f3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 26 Sep 2025 17:30:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor(deviceManagement):=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87=E6=9C=AC=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构设备管理相关视图组件，将国际化文本替换为中文显示，优化按钮样式和布局。主要变更包括：
1. 将按钮文本从$t('btn.xxx')替换为中文
2. 调整部分组件的样式和布局
3. 统一使用el-image替换ImagePreview组件
4. 优化树选择组件实现
5. 调整对话框的关闭行为和样式

这些变更加强了用户体验一致性，移除了国际化依赖，使界面更符合中文用户习惯。
---
 .../BaseDeviceAccountTreeSelect/index.vue     |  25 +-
 .../BaseDeviceTypeTreeSelect/index.vue        |  17 +-
 .../components/devicelist_point/index.vue     |  72 +++---
 .../components/devicelist_route/index.vue     |  18 +-
 .../deviceMaintenanceRecord/index.vue         |  10 +-
 .../devicePointInspectionPlan/index.vue       |  55 +++--
 .../TheDeviceMaintenanceHistoryTable.vue      |   4 +-
 .../deviceManagement/deviceRepair/index.vue   |  10 +-
 .../deviceRouteInspectionPlan/index.vue       |  20 +-
 .../TheTaskExecuteFormDialog.vue              |   4 +-
 .../deviceTaskExecute/TheTaskExecuteTable.vue |   2 +-
 .../deviceTaskExecute/index.vue               |  14 +-
 .../deviceTaskExecuteResult/index.vue         |   8 +-
 .../deviceaccount/TheChouseDeviceInspect.vue  |  14 +-
 .../deviceaccount/TheDeviceActionDialog.vue   |   6 +-
 .../deviceaccount/TheDeviceInspectTable.vue   | 109 +++++----
 .../deviceManagement/deviceaccount/index.vue  | 216 +++++++-----------
 .../deviceformconfig/index.vue                |  61 ++---
 .../deviceManagement/deviceinspect/index.vue  |  18 +-
 .../deviceManagement/devicetype/index.vue     |   6 +-
 20 files changed, 336 insertions(+), 353 deletions(-)

diff --git a/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue b/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
index c44fdda..dfb7c63 100644
--- a/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
+++ b/src/views/deviceManagement/components/BaseDeviceAccountTreeSelect/index.vue
@@ -1,24 +1,28 @@
 <template>
   <div>
-    <el-tree-select
+    <Treeselect
       style="width: 240px"
       v-bind="$attrs"
       highlight-current
       filterable
-      :data="deptOptions"
-      :props="{ label: 'label', children: 'children' }"
-      node-key="value"
+      :options="deptOptions"
+      :normalizer="normalizer"
       placeholder="请选择设备"
-      :render-after-expand="false"
       clearable />
   </div>
 </template>
 
 <script>
 import * as deviceAccountApi from '@/api/deviceManagement/deviceaccount'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { handleTree } from '@/utils/ruoyi'
 
 export default {
-  name: 'BaseDeviceTypeTreeSelect',
+  name: 'BaseDeviceAccountTreeSelect',
+  components: {
+    Treeselect
+  },
   data() {
     return {
       deptOptions: []
@@ -33,9 +37,16 @@ export default {
       deviceAccountApi.getSelectTree().then((res) => {
         if (res.code == 200) {
           console.log(res.data)
-          this.deptOptions = this.handleTree(res.data, 'id', 'parentId', 'children')
+          this.deptOptions = handleTree(res.data, 'id', 'parentId', 'children')
         }
       })
+    },
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.label,
+        children: node.children
+      }
     }
   }
 }
diff --git a/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue b/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
index 9116d6c..ca652ee 100644
--- a/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
+++ b/src/views/deviceManagement/components/BaseDeviceTypeTreeSelect/index.vue
@@ -1,14 +1,20 @@
 <template>
 	<div>
-		<el-tree-select v-bind="$attrs" style="width: 240px" :data="deptOptions" :props="{ label: 'name', children: 'children' }" node-key="id" check-strictly placeholder="请选择设备类型" :render-after-expand="false" />
+		<Treeselect v-bind="$attrs" style="width: 240px" :options="deptOptions" :normalizer="normalizer" placeholder="请选择设备类型" :clearable="true" />
 	</div>
 </template>
 
 <script>
 	import * as API_devicetype from '@/api/deviceManagement/devicetype'
+	import Treeselect from '@riophae/vue-treeselect'
+	import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+	import { handleTree } from '@/utils/ruoyi'
 
 export default {
 	name: 'BaseDeviceTypeTreeSelect',
+	components: {
+		Treeselect
+	},
 	data() {
 		return {
 			deptOptions: [],
@@ -24,9 +30,16 @@ export default {
 		getlist() {
 			API_devicetype.getList(this.queryParams).then((res) => {
 				if (res.code == 200) {
-					this.deptOptions = this.handleTree(res.data, 'id', 'parentId', 'children');
+					this.deptOptions = handleTree(res.data, 'id', 'parentId', 'children');
 				}
 			})
+		},
+		normalizer(node) {
+			return {
+				id: node.id,
+				label: node.name,
+				children: node.children
+			}
 		}
 	}
 }
diff --git a/src/views/deviceManagement/components/devicelist_point/index.vue b/src/views/deviceManagement/components/devicelist_point/index.vue
index 939f9e3..812dc9e 100644
--- a/src/views/deviceManagement/components/devicelist_point/index.vue
+++ b/src/views/deviceManagement/components/devicelist_point/index.vue
@@ -4,7 +4,7 @@
     <el-row :gutter="15" class="mb10">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="plus" @click="handleAdd">
-          {{ $t('btn.add') }}
+          添加
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -24,11 +24,11 @@
           <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
         </template>
       </el-table-column>
-      <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
-      <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
-      <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
-      <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
-      <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+      <el-table-column prop="deviceName" label="设备名称" align="center"  v-if="columns.showColumn('deviceName')" />
+      <el-table-column prop="workshop" label="所属车间" align="center"  v-if="columns.showColumn('workshop')" />
+      <el-table-column prop="workline" label="所属产线" align="center"  v-if="columns.showColumn('workline')" />
+      <el-table-column prop="purchaseTime" label="购买时间"  v-if="columns.showColumn('purchaseTime')" />
+      <el-table-column prop="supplier" label="设备厂商" align="center"  v-if="columns.showColumn('supplier')" />
       <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
         <template #default="scope">
           <dict-tag :options="options.statusOptions" :value="scope.row.status" />
@@ -36,27 +36,27 @@
       </el-table-column>
       <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
         <template #default="scope">
-          <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+          <el-image :src="scope.row.deviceImage"></el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+      <el-table-column prop="deviceFile" label="设备文件" align="center"  v-if="columns.showColumn('deviceFile')" />
       <el-table-column
         prop="deviceSpecification"
         label="设备规格"
         align="center"
-        :show-overflow-tooltip="true"
+        
         v-if="columns.showColumn('deviceSpecification')" />
       <el-table-column
         prop="responsiblePerson"
         label="设备负责人"
         align="center"
-        :show-overflow-tooltip="true"
+        
         v-if="columns.showColumn('responsiblePerson')" />
-      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
-      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
-      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+      <el-table-column prop="remark" label="备注" align="center"  v-if="columns.showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center"  v-if="columns.showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间"  v-if="columns.showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center"  v-if="columns.showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间"  v-if="columns.showColumn('updatedTime')" />
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
@@ -66,7 +66,7 @@
     <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 选择设备台账 -->
-    <el-dialog title="选择设备台账" :lock-scroll="false" v-model="open" width="900">
+    <el-dialog title="选择设备台账" :lock-scroll="false" :close-on-click-modal="false" append-to-body :visible.sync="open" width="900">
       <el-form :model="queryParams2" label-position="right" inline ref="queryRef2" v-show="showSearch2" @submit.prevent>
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model.trim="queryParams2.deviceName" placeholder="请输入设备名称" clearable />
@@ -82,15 +82,15 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item>
-          <el-button icon="search" type="primary" @click="handleQuery2">{{ $t('btn.search') }}</el-button>
-          <el-button icon="refresh" @click="resetQuery2">{{ $t('btn.reset') }}</el-button>
+          <el-button icon="search" type="primary" @click="handleQuery2">查询</el-button>
+          <el-button icon="refresh" @click="resetQuery2">刷新</el-button>
         </el-form-item>
       </el-form>
       <!-- 工具区域 -->
       <el-row :gutter="15" class="mb10">
         <el-col :span="1.5">
           <el-button type="success" plain icon="plus" @click="handleBind">
-            {{ $t('btn.add') }}
+            新增
           </el-button>
         </el-col>
         <right-toolbar v-model:showSearch="showSearch2" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -112,17 +112,17 @@
             <dict-tag :options="options.fkDeviceTypeOptions" :value="scope.row.fkDeviceType" />
           </template>
         </el-table-column>
-        <el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+        <el-table-column prop="deviceName" label="设备名称" align="center"  v-if="columns.showColumn('deviceName')" />
         <el-table-column
           prop="deviceCode"
           label="设备编号（二维码）"
           align="center"
-          :show-overflow-tooltip="true"
+          
           v-if="columns.showColumn('deviceCode')" />
-        <el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
-        <el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
-        <el-table-column prop="purchaseTime" label="购买时间" :show-overflow-tooltip="true" v-if="columns.showColumn('purchaseTime')" />
-        <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplier')" />
+        <el-table-column prop="workshop" label="所属车间" align="center"  v-if="columns.showColumn('workshop')" />
+        <el-table-column prop="workline" label="所属产线" align="center"  v-if="columns.showColumn('workline')" />
+        <el-table-column prop="purchaseTime" label="购买时间"  v-if="columns.showColumn('purchaseTime')" />
+        <el-table-column prop="supplier" label="设备厂商" align="center"  v-if="columns.showColumn('supplier')" />
         <el-table-column prop="status" label="设备状态" align="center" v-if="columns.showColumn('status')">
           <template #default="scope">
             <dict-tag :options="options.statusOptions" :value="scope.row.status" />
@@ -130,33 +130,33 @@
         </el-table-column>
         <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
           <template #default="scope">
-            <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+            <el-image :src="scope.row.deviceImage"></el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
+        <el-table-column prop="deviceFile" label="设备文件" align="center"  v-if="columns.showColumn('deviceFile')" />
         <el-table-column
           prop="deviceSpecification"
           label="设备规格"
           align="center"
-          :show-overflow-tooltip="true"
+          
           v-if="columns.showColumn('deviceSpecification')" />
         <el-table-column
           prop="responsiblePerson"
           label="设备负责人"
           align="center"
-          :show-overflow-tooltip="true"
+          
           v-if="columns.showColumn('responsiblePerson')" />
-        <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
-        <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />
-        <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-        <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
-        <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+        <el-table-column prop="remark" label="备注" align="center"  v-if="columns.showColumn('remark')" />
+        <el-table-column prop="createdBy" label="创建人" align="center"  v-if="columns.showColumn('createdBy')" />
+        <el-table-column prop="createdTime" label="创建时间"  v-if="columns.showColumn('createdTime')" />
+        <el-table-column prop="updatedBy" label="更新人" align="center"  v-if="columns.showColumn('updatedBy')" />
+        <el-table-column prop="updatedTime" label="更新时间"  v-if="columns.showColumn('updatedTime')" />
       </el-table>
       <pagination :total="total2" v-model:page="queryParams2.pageNum" v-model:limit="queryParams2.pageSize" @pagination="getList_nobind" />
 
       <template #footer v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/deviceManagement/components/devicelist_route/index.vue b/src/views/deviceManagement/components/devicelist_route/index.vue
index 16875df..5c5aaf0 100644
--- a/src/views/deviceManagement/components/devicelist_route/index.vue
+++ b/src/views/deviceManagement/components/devicelist_route/index.vue
@@ -4,7 +4,7 @@
     <el-row :gutter="15" class="mb10">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="plus" @click="handleAdd">
-          {{ $t('btn.add') }}
+          新增
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
         <template #default="scope">
-          <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+          <el-image :src="scope.row.deviceImage"></el-image>
         </template>
       </el-table-column>
       <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
@@ -66,7 +66,7 @@
     <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 选择设备台账 -->
-    <el-dialog title="选择设备台账" :lock-scroll="false" v-model="open" width="900">
+    <el-dialog title="选择设备台账" :lock-scroll="false" :close-on-click-modal="false" append-to-body :visible.sync="open" width="900">
       <el-form :model="queryParams2" label-position="right" inline ref="queryRef2" v-show="showSearch2" @submit.prevent>
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model.trim="queryParams2.deviceName" placeholder="请输入设备名称" clearable />
@@ -82,15 +82,15 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item>
-          <el-button icon="search" type="primary" @click="handleQuery2">{{ $t('btn.search') }}</el-button>
-          <el-button icon="refresh" @click="resetQuery2">{{ $t('btn.reset') }}</el-button>
+          <el-button icon="search" type="primary" @click="handleQuery2">查询</el-button>
+          <el-button icon="refresh" @click="resetQuery2">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 工具区域 -->
       <el-row :gutter="15" class="mb10">
         <el-col :span="1.5">
           <el-button type="success" plain icon="plus" @click="handleBind">
-            {{ $t('btn.add') }}
+            新增
           </el-button>
         </el-col>
         <right-toolbar v-model:showSearch="showSearch2" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -126,7 +126,7 @@
         </el-table-column>
         <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
           <template #default="scope">
-            <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+            <el-image :src="scope.row.deviceImage"></el-image>
           </template>
         </el-table-column>
         <el-table-column prop="deviceFile" label="设备文件" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceFile')" />
@@ -156,8 +156,8 @@
       <pagination :total="total2" v-model:page="queryParams2.pageNum" v-model:limit="queryParams2.pageSize" @pagination="getList_nobind" />
 
       <template #footer v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/deviceManagement/deviceMaintenanceRecord/index.vue b/src/views/deviceManagement/deviceMaintenanceRecord/index.vue
index cf2c81f..ed50229 100644
--- a/src/views/deviceManagement/deviceMaintenanceRecord/index.vue
+++ b/src/views/deviceManagement/deviceMaintenanceRecord/index.vue
@@ -2,15 +2,15 @@
   <div>
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
       <el-form-item>
-        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
     <el-row :gutter="15" class="mb10">
       <el-col :span="1.5">
         <el-button type="primary" v-hasPermi="['business:devicemaintenancerecord:add']" plain icon="el-icon-plus" @click="handleAdd">
-          {{ $t('btn.add') }}
+          新增
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -96,8 +96,8 @@
         </el-row>
       </el-form>
       <template slot="footer" v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </template>
     </el-dialog>
   </div>
diff --git a/src/views/deviceManagement/devicePointInspectionPlan/index.vue b/src/views/deviceManagement/devicePointInspectionPlan/index.vue
index 9d9541c..2032043 100644
--- a/src/views/deviceManagement/devicePointInspectionPlan/index.vue
+++ b/src/views/deviceManagement/devicePointInspectionPlan/index.vue
@@ -1,21 +1,21 @@
 <template>
-	<div>
+	<div class="app-container">
 		<el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
 			<el-form-item label="点检名称" prop="deviceName">
 				<el-input v-model.trim="queryParams.name" placeholder="请输入点检名称" clearable />
 			</el-form-item>
 			<el-form-item label="点检状态" prop="status">
 				<el-radio-group v-model="queryParams.status" @change="handleQuery">
-					<el-radio-button label="全部" :value="-1" />
-					<el-radio-button label="停用" :value="0" />
-					<el-radio-button label="启用" :value="1" />
+					<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 label="类别" prop="innerType">
 				<el-radio-group v-model="queryParams.innerType" @change="handleQuery">
-					<el-radio-button label="全部" :value="-1" />
-					<el-radio-button label="检查" :value="1" />
-					<el-radio-button label="保养" :value="2" />
+					<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>
 
@@ -28,15 +28,22 @@
 			</el-form-item>
 
 			<el-form-item>
-				<el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-				<el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				<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:devicepointinspectionplan:add']" plain icon="el-icon-plus" @click="handleAdd">
-					{{ $t('btn.add') }}
+				<el-button type="primary" 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>
@@ -51,12 +58,14 @@
 			</el-table-column>
 			<el-table-column label="添加设备" align="center">
 				<template slot-scope="scope">
-					<el-button type="primary" size="small" icon="el-icon-message-box" title="添加设备" @click="AddDevice(scope.row)"></el-button>
+					<el-button type="primary" icon="el-icon-folder-add" size="small" title="添加设备" @click="AddDevice(scope.row)">
+					</el-button>
 				</template>
 			</el-table-column>
 			<el-table-column label="立刻派发" align="center">
 				<template slot-scope="scope">
-					<el-button type="success" size="small" icon="el-icon-promotion" @click="dispatch(scope.row)"></el-button>
+					<el-button type="success" icon="el-icon-position" size="small" @click="dispatch(scope.row)">
+					</el-button>
 				</template>
 			</el-table-column>
 			<el-table-column prop="fkPersonId" label="执行人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('fkPersonId')" />
@@ -70,15 +79,19 @@
 
 			<el-table-column label="操作" width="160">
 				<template slot-scope="scope">
-					<el-button type="success" size="small" icon="el-icon-edit" title="编辑" v-hasPermi="['deviceManagement:devicepointinspectionplan:edit']" @click="handleUpdate(scope.row)"></el-button>
-					<el-button type="danger" size="small" icon="el-icon-delete" title="删除" v-hasPermi="['deviceManagement:devicepointinspectionplan:delete']" @click="handleDelete(scope.row)"></el-button>
+					<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" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改点检任务对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" v-model="open">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
 			<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
 				<el-row :gutter="20">
 					<el-col :lg="12">
@@ -117,16 +130,16 @@
 				</el-row>
 			</el-form>
 			<template slot="footer" v-if="opertype != 3">
-				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+				<el-button text @click="cancel">取消</el-button>
+				<el-button type="primary" @click="submitForm">提交</el-button>
 			</template>
 		</el-dialog>
 
-		<el-dialog title="添加设备" :lock-scroll="false" v-model="open_device">
+		<el-dialog title="添加设备" :lock-scroll="false" :visible.sync="open_device">
 			<Devicelist :message="messageFromParent" :flag="point"></Devicelist>
 			<template slot="footer">
-				<el-button text @click="open_device = false">{{ $t('btn.cancel') }}</el-button>
-				<el-button type="primary" @click="open_device = false">{{ $t('btn.submit') }}</el-button>
+				<el-button text @click="open_device = false">取消</el-button>
+				<el-button type="primary" @click="open_device = false">提交</el-button>
 			</template>
 		</el-dialog>
 	</div>
diff --git a/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
index f94900f..ea821f2 100644
--- a/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
+++ b/src/views/deviceManagement/deviceRepair/TheDeviceMaintenanceHistoryTable.vue
@@ -75,8 +75,8 @@
 				</el-row>
 			</el-form>
 			<template slot="footer" v-if="opertype != 3">
-				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+				<el-button text @click="cancel">取消</el-button>
+			<el-button type="primary" @click="submitForm">提交</el-button>
 			</template>
 		</el-dialog>
 	</div>
diff --git a/src/views/deviceManagement/deviceRepair/index.vue b/src/views/deviceManagement/deviceRepair/index.vue
index 0e04c24..b2913e4 100644
--- a/src/views/deviceManagement/deviceRepair/index.vue
+++ b/src/views/deviceManagement/deviceRepair/index.vue
@@ -45,15 +45,15 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label=" ">
-                <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+                <el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" @click="resetQuery">重置</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:devicerepair:add']" plain icon="el-icon-plus" @click="handleAdd">
-                    {{ $t('btn.add') }}
+                    新增
                 </el-button>
             </el-col>
             <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -177,8 +177,8 @@
                 </el-row>
             </el-form>
             <template slot="footer" v-if="opertype != 3">
-                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+                <el-button text @click="cancel">取消</el-button>
+				<el-button type="primary" @click="submitForm">提交</el-button>
             </template>
         </el-dialog>
     </div>
diff --git a/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
index 33b6271..cba3eb2 100644
--- a/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
+++ b/src/views/deviceManagement/deviceRouteInspectionPlan/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<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 />
@@ -32,15 +32,15 @@
 				</el-radio-group>
 			</el-form-item>
 			<el-form-item>
-				<el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-				<el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+				<el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
+				<el-button icon="refresh" @click="resetQuery">重置</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 icon="plus" @click="handleAdd">
-					{{ $t('btn.add') }}
+					新增
 				</el-button>
 			</el-col>
 			<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -89,8 +89,8 @@
 
 			<el-table-column label="操作" width="160">
 				<template slot="default" slot-scope="scope">
-					<el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['deviceManagement:devicerouteinspectionplan:edit']" @click="handleUpdate(scope.row)"></el-button>
-					<el-button type="danger" size="small" icon="delete" title="删除" v-hasPermi="['deviceManagement:devicerouteinspectionplan:delete']" @click="handleDelete(scope.row)"></el-button>
+					<el-button type="success" size="small" icon="edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+					<el-button type="danger" size="small" icon="delete" title="删除" @click="handleDelete(scope.row)"></el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -178,16 +178,16 @@
 				</el-row>
 			</el-form>
 			<template slot="footer" v-if="opertype != 3">
-				<el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-				<el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+				<el-button text @click="cancel">取消</el-button>
+				<el-button type="primary" @click="submitForm">提交</el-button>
 			</template>
 		</el-dialog>
 
 		<el-dialog title="添加设备" :lock-scroll="false" v-model="open_device">
 			<Devicelist :message="messageFromParent"></Devicelist>
 			<template slot="footer">
-				<el-button text @click="open_device = false">{{ $t('btn.cancel') }}</el-button>
-				<el-button type="primary" @click="open_device = false">{{ $t('btn.submit') }}</el-button>
+				<el-button text @click="open_device = false">取消</el-button>
+				<el-button type="primary" @click="open_device = false">提交</el-button>
 			</template>
 		</el-dialog>
 	</div>
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
index 5474e40..e194835 100644
--- a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteFormDialog.vue
@@ -19,8 +19,8 @@
 			</el-form>
 			<template slot="footer">
 				<div class="dialog-footer">
-					<el-button text @click="close">{{ $t('btn.cancel') }}</el-button>
-					<el-button type="primary" @click="save()">{{ $t('btn.save') }}</el-button>
+					<el-button text @click="close">取消</el-button>
+					<el-button type="primary" @click="save()">保存</el-button>
 				</div>
 			</template>
 		</el-dialog>
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
index 859afa7..65051c3 100644
--- a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteTable.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-button style="margin-bottom: 10px;" icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+		<el-button style="margin-bottom: 10px;" icon="refresh" @click="resetQuery">重置</el-button>
 		<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row>
 			<el-table-column type="index" align="center" />
 			<el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
diff --git a/src/views/deviceManagement/deviceTaskExecute/index.vue b/src/views/deviceManagement/deviceTaskExecute/index.vue
index 18f1ec6..2a35cb0 100644
--- a/src/views/deviceManagement/deviceTaskExecute/index.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/index.vue
@@ -30,8 +30,8 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
@@ -39,19 +39,19 @@
       <el-col :span="1.5">
         <el-button type="primary" v-hasPermi="['deviceManagement:devicetaskexecute:add']" plain icon="RefreshRight"
           @click="handleSynchronize">
-          {{ $t('btn.synchronize') }}
+          同步
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" v-hasPermi="['deviceManagement:devicetaskexecute:delete']" plain icon="delete"
           @click="handleClear">
-          {{ $t('btn.clean') }}
+          清理
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="download" @click="handleExport"
           v-hasPermi="['deviceManagement:devicetaskexecute:export']">
-          {{ $t('btn.export') }}
+          导出
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -171,8 +171,8 @@
         </el-row>
       </el-form>
       <template #footer v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </template>
     </el-dialog>
     <TheTaskExecuteDialog v-model="open2" :executeKey="executeKey" :fkPlanId="fkPlanId" :planType="planType">
diff --git a/src/views/deviceManagement/deviceTaskExecuteResult/index.vue b/src/views/deviceManagement/deviceTaskExecuteResult/index.vue
index 8290fc9..107a2f6 100644
--- a/src/views/deviceManagement/deviceTaskExecuteResult/index.vue
+++ b/src/views/deviceManagement/deviceTaskExecuteResult/index.vue
@@ -28,8 +28,8 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
@@ -211,8 +211,8 @@
         </el-row>
       </el-form>
       <div slot="footer" v-if="opertype != 3">
-        <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button text @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>
   </div>
diff --git a/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue b/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
index 0714da6..0dad2e1 100644
--- a/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
+++ b/src/views/deviceManagement/deviceaccount/TheChouseDeviceInspect.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="绑定检查项" width="800">
+    <el-dialog v-bind="$attrs" @open="onOpen" @close="close" :close-on-click-modal="false" append-to-body title="绑定检查项" width="800">
       <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 />
@@ -11,8 +11,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+          <el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
           <template slot-scope="scope">
-            <ImagePreview :src="scope.row.image"></ImagePreview>
+            <el-image :src="scope.row.image"></el-image>
           </template>
         </el-table-column>
         <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('descride')" />
@@ -40,8 +40,8 @@
       </el-table>
       <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
       <div slot="footer" class="dialog-footer">
-        <el-button @click="close">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="save">{{ $t('btn.save') }}</el-button>
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="save">保存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -113,7 +113,7 @@ export default {
     ,
     
     close() {
-      this.$emit('update:modelValue', false)
+      this.$emit('update:visible', false)
     },
     
     save() {
diff --git a/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue b/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
index 4149dc2..adbe312 100644
--- a/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
+++ b/src/views/deviceManagement/deviceaccount/TheDeviceActionDialog.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<!-- 设备操作弹框 -->
-		<el-dialog v-bind="$attrs" @open="onOpen" @close="onClose" :close-on-click-modal="false" title="设备操作" width="900">
+		<el-dialog v-bind="$attrs" @open="onOpen" @close="close" append-to-body title="设备操作" width="1000">
 			<el-tabs v-model="activeName" type="border-card">
 				<el-tab-pane label="设备检查项" name="first">
 					<TheDeviceInspectTable :actionDialogId="actionDialogId"></TheDeviceInspectTable>
@@ -11,7 +11,7 @@
 				<el-tab-pane label="设备维修" name="fourth">Task</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
-				<!-- <el-button text @click="close">{{ $t('btn.cancel') }}</el-button> -->
+				<el-button text @click="close">关闭</el-button>
 				<!-- <el-button v-if="activeName === 'first'" type="primary" @click="save(1)">{{ $t('btn.save') }}</el-button> -->
 			</div>
 		</el-dialog>
@@ -48,7 +48,7 @@ export default {
     ,
     
     close() {
-      this.$emit('update:modelValue', false)
+      this.$emit('update:visible', false)
     }
   }
 }
diff --git a/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue b/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
index 200d1cc..c6c2fdd 100644
--- a/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
+++ b/src/views/deviceManagement/deviceaccount/TheDeviceInspectTable.vue
@@ -10,8 +10,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
@@ -22,51 +22,58 @@
 		</el-button>
 	</el-col> -->
       <el-col :span="1.5">
-        <el-button type="success" v-hasPermi="['deviceManagement:deviceinspect:add']" plain icon="el-icon-plus" @click="handleChouse">
+        <el-button type="success" plain icon="el-icon-plus"
+          @click="handleChouse">
           绑定检查项
         </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>
+    <el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell"
+      highlight-current-row>
       <el-table-column type="index" align="center" />
-      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('name')" />
+      <el-table-column prop="name" label="名称" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('name')" />
       <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
         <template slot-scope="scope">
-          <ImagePreview :src="scope.row.image"></ImagePreview>
+          <el-image :src="scope.row.image"></el-image>
         </template>
       </el-table-column>
-      <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('descride')" />
-      <el-table-column prop="type" label="类别" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('type')">
+      <el-table-column prop="descride" label="描述" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('descride')" />
+      <el-table-column prop="type" label="类别" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('type')">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.type == 1">检查</el-tag>
           <el-tag type="primary" v-else-if="scope.row.type == 2">保养</el-tag>
           <el-tag type="danger" v-else>异常</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
-      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
-      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns_showColumn('createdTime')" />
-      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
-      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedTime')" />
-      <el-table-column label="操作" width="160">
+      <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('remark')" />
+      <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('createdBy')" />
+      <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('createdTime')" />
+      <el-table-column prop="updatedBy" label="更新人" align="center" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('updatedBy')" />
+      <el-table-column prop="updatedTime" label="更新时间" :show-overflow-tooltip="true"
+        v-if="columns_showColumn('updatedTime')" />
+      <el-table-column label="操作" width="180">
         <template slot-scope="scope">
-          <el-button
-            type="danger"
-            size="small"
-            icon="el-icon-delete"
-            title="取消关联"
-            v-hasPermi="['deviceManagement:deviceinspect:delete']"
-            @click="handleRemoveBind(scope.row.id)"></el-button>
-          <el-button type="primary" size="small" icon="el-icon-arrow-up" title="上移" @click="handleSortUp(scope.row.id, scope.$index)"></el-button>
-          <el-button type="primary" size="small" icon="el-icon-arrow-down" title="下移" @click="handleSortDown(scope.row.id, scope.$index)"></el-button>
+          <el-button type="danger" size="mini" icon="el-icon-delete" title="取消关联" @click="handleRemoveBind(scope.row.id)"></el-button>
+          <el-button type="primary" size="mini" icon="el-icon-arrow-up" title="上移"
+            @click="handleSortUp(scope.row.id, scope.$index)"></el-button>
+          <el-button type="primary" size="mini" icon="el-icon-arrow-down" title="下移"
+            @click="handleSortDown(scope.row.id, scope.$index)"></el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    <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" :lock-scroll="false" :close-on-click-modal="false" :visible.sync="open" append-to-body>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :lg="12">
@@ -89,7 +96,8 @@
           <el-col :lg="12">
             <el-form-item label="检查项类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择检查项类型">
-                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                <el-option v-for="item in options.typeOptions" :key="item.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -106,11 +114,12 @@
         </el-row>
       </el-form>
       <div slot="footer" v-if="opertype != 3">
-        <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>
-    <TheChouseDeviceInspect v-model="TheChouseDeviceInspectShow" :actionDialogId="actionDialogId" @refresh="getList()"></TheChouseDeviceInspect>
+    <TheChouseDeviceInspect :visible.sync="TheChouseDeviceInspectShow" :actionDialogId="actionDialogId" @refresh="getList()">
+    </TheChouseDeviceInspect>
   </div>
 </template>
 
@@ -220,23 +229,23 @@ export default {
         }
       })
     },
-    
+
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
     },
-    
+
     resetQuery() {
-      this.resetFields('queryRef')
+      this.resetForm('queryRef')
       this.handleQuery()
     },
-    
+
     handleRemoveBind(inspect_id) {
       const data = {
         account_id: this.actionDialogId,
         inspect_id
       }
-      
+
       this.$confirm('是否确认取消关联？')
         .then(() => {
           return removeBind(data)
@@ -245,14 +254,14 @@ export default {
           this.getList()
           this.$modal.msgSuccess('取消成功！')
         })
-        .catch(() => {})
+        .catch(() => { })
     },
-    
+
     cancel() {
       this.open = false
       this.reset()
     },
-    
+
     reset() {
       this.form = {
         id: null,
@@ -269,20 +278,20 @@ export default {
         updatedBy: null,
         updatedTime: null
       }
-      this.resetFields('formRef')
+      this.resetForm('formRef')
     },
-    
+
     handleAdd() {
       this.reset()
       this.open = true
       this.title = '添加设备检查项'
       this.opertype = 1
     },
-    
+
     handleChouse() {
       this.TheChouseDeviceInspectShow = true
     },
-    
+
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
@@ -296,7 +305,7 @@ export default {
         }
       })
     },
-    
+
     submitForm() {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
@@ -316,7 +325,7 @@ export default {
         }
       })
     },
-    
+
     handleSortUp(id, index) {
       let newList = []
       const lastSort = index + 1
@@ -331,7 +340,7 @@ export default {
           sort: index + 1
         }
       })
-      
+
       let upSort = list[index - 1].sort
       list[index - 1].sort = list[index].sort
       list[index].sort = upSort
@@ -339,7 +348,7 @@ export default {
         this.getList()
       })
     },
-    
+
     handleSortDown(id, index) {
       const lastSort = index + 1
       const lastList = this.dataList
@@ -354,7 +363,7 @@ export default {
           sort: index + 1
         }
       })
-      
+
       let upSort = list[index + 1].sort
       list[index + 1].sort = list[index].sort
       list[index].sort = upSort
@@ -362,15 +371,15 @@ export default {
         this.getList()
       })
     },
-    
-    handleChangeSort() {},
-    
+
+    handleChangeSort() { },
+
     columns_showColumn(prop) {
       const column = this.columns.find(item => item.prop === prop)
       return column ? column.visible : false
     }
   },
-  
+
   mounted() {
     this.handleQuery()
   }
diff --git a/src/views/deviceManagement/deviceaccount/index.vue b/src/views/deviceManagement/deviceaccount/index.vue
index 6b32eea..009681a 100644
--- a/src/views/deviceManagement/deviceaccount/index.vue
+++ b/src/views/deviceManagement/deviceaccount/index.vue
@@ -4,7 +4,7 @@
  * @Date: (2024-05-20)
 -->
 <template>
-  <div>
+  <div class="app-container">
     <el-row>
       <el-col :span="4">
         <div style="margin-right: 10px">
@@ -13,7 +13,8 @@
       </el-col>
       <el-col :span="20">
         <div>
-          <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
+          <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch"
+            @submit.prevent>
             <el-form-item label="设备名称" prop="deviceName">
               <el-input v-model.trim="queryParams.deviceName" placeholder="请输入设备名称" clearable />
             </el-form-item>
@@ -22,8 +23,11 @@
             </el-form-item>
             <el-form-item label="设备状态" prop="status">
               <el-radio-group v-model="queryParams.status" @change="handleQuery">
-                <el-radio-button :value="-1"> 全部 </el-radio-button>
-                <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue" :value="parseInt(item.dictValue)">
+                <el-radio-button :label="-1">
+                  全部
+                </el-radio-button>
+                <el-radio-button v-for="item in options.statusOptions" :key="item.dictValue"
+                  :label="parseInt(item.dictValue)">
                   {{ item.dictLabel }}
                 </el-radio-button>
               </el-radio-group>
@@ -36,148 +40,84 @@
           <!-- 工具区域 -->
           <el-row :gutter="15" class="mb10">
             <el-col :span="1.5">
-              <el-button type="primary" v-hasPermi="['deviceManagement:deviceaccount:add']" plain icon="el-icon-plus" @click="handleAdd">
+              <el-button type="primary" v-hasPermi="['deviceManagement:deviceaccount:add']" plain icon="el-icon-plus"
+                @click="handleAdd">
                 新增
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="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="deviceName"
-              label="设备名称"
-              align="center"
-              min-width="120px"
-              :show-overflow-tooltip="true"
+          <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="deviceName" label="设备名称" align="center" min-width="120px"
               v-if="columns_showColumn('deviceName')" />
-            <el-table-column
-              prop="deviceCode"
-              label="设备编号"
-              align="center"
-              min-width="140px"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="deviceCode" label="设备编号" align="center" min-width="140px"
               v-if="columns_showColumn('deviceSpecification')" />
-            <el-table-column prop="deviceCode" label="设备二维码" align="center" width="80px" v-if="columns_showColumn('deviceCode')">
+            <el-table-column prop="deviceCode" label="设备二维码" align="center" width="80px"
+              v-if="columns_showColumn('deviceCode')">
               <template slot-scope="scope">
-                <qrcode-vue
-                  style="width: 36px; height: 36px"
-                  :id="scope.row.deviceCode"
-                  :value="scope.row.deviceCode"
-                  @click="downloadQrCode(scope.row.deviceCode)"></qrcode-vue>
+                <vue-qr style="width: 36px; height: 36px" :text="scope.row.deviceCode" :margin="0"
+                  @click="downloadQrCode(scope.row.deviceCode)"></vue-qr>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="workshop"
-              label="所属车间"
-              align="center"
-              min-width="100px"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="workshop" label="所属车间" align="center" min-width="100px"
               v-if="columns_showColumn('workshop')" />
-            <el-table-column
-              prop="workline"
-              label="所属产线"
-              align="center"
-              min-width="100px"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="workline" label="所属产线" align="center" min-width="100px"
               v-if="columns_showColumn('workline')" />
             <el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns_showColumn('deviceImage')">
               <template slot-scope="scope">
-                <ImagePreview :src="scope.row.deviceImage"></ImagePreview>
+                <el-image :src="scope.row.deviceImage"></el-image>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="deviceFile"
-              label="设备文件"
-              align="center"
-              :show-overflow-tooltip="true"
-              v-if="columns_showColumn('deviceFile')">
+            <el-table-column prop="deviceFile" label="设备文件" align="center" v-if="columns_showColumn('deviceFile')">
               <template slot-scope="scope">
-                <el-button type="success" size="small" :disabled="!scope.row.deviceFile" @click="handlerDownloadFile(scope.row.deviceFile)"
-                  >下载文件</el-button
-                >
+                <el-button type="success" size="small" :disabled="!scope.row.deviceFile"
+                  @click="handlerDownloadFile(scope.row.deviceFile)">下载文件</el-button>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="responsiblePerson"
-              label="设备负责人"
-              align="center"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="responsiblePerson" label="设备负责人" align="center"
               v-if="columns_showColumn('responsiblePerson')" />
-            <el-table-column prop="supplier" label="设备厂商" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('supplier')" />
-            <el-table-column
-              prop="purchaseTime"
-              label="购买时间"
-              align="center"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="supplier" label="设备厂商" align="center" v-if="columns_showColumn('supplier')" />
+            <el-table-column prop="purchaseTime" label="购买时间" align="center"
               v-if="columns_showColumn('purchaseTime')" />
-            <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('remark')" />
+            <el-table-column prop="remark" label="备注" align="center" v-if="columns_showColumn('remark')" />
             <el-table-column prop="status" label="设备状态" align="center" v-if="columns_showColumn('status')">
               <template slot-scope="scope">
                 <dict-tag :options="options.statusOptions" :value="scope.row.status" />
               </template>
             </el-table-column>
-            <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('createdBy')" />
-            <el-table-column
-              prop="createdTime"
-              label="创建时间"
-              align="center"
-              :show-overflow-tooltip="true"
-              v-if="columns_showColumn('createdTime')" />
-            <el-table-column prop="updatedBy" label="修改人" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('updatedBy')" />
-            <el-table-column
-              prop="updatedTime"
-              label="修改时间"
-              align="center"
-              :show-overflow-tooltip="true"
-              v-if="columns_showColumn('updatedTime')" />
-            <el-table-column
-              prop="deviceSpecification"
-              label="设备规格"
-              align="center"
-              :show-overflow-tooltip="true"
+            <el-table-column prop="createdBy" label="创建人" align="center" v-if="columns_showColumn('createdBy')" />
+            <el-table-column prop="createdTime" label="创建时间" align="center" v-if="columns_showColumn('createdTime')" />
+            <el-table-column prop="updatedBy" label="修改人" align="center" v-if="columns_showColumn('updatedBy')" />
+            <el-table-column prop="updatedTime" label="修改时间" align="center" v-if="columns_showColumn('updatedTime')" />
+            <el-table-column prop="deviceSpecification" label="设备规格" align="center"
               v-if="columns_showColumn('deviceSpecification')" />
             <el-table-column label="操作" width="240" fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  type="success"
-                  size="small"
-                  icon="el-icon-edit"
-                  title="编辑"
-                  v-hasPermi="['deviceManagement:deviceaccount:edit']"
+                <el-button type="success" size="small" icon="el-icon-edit" title="编辑"
                   @click="handleUpdate(scope.row)"></el-button>
-                <el-button
-                  type="danger"
-                  size="small"
-                  icon="el-icon-delete"
-                  title="删除"
-                  v-hasPermi="['deviceManagement:deviceaccount:delete']"
+                <el-button type="danger" size="small" icon="el-icon-delete" title="删除"
                   @click="handleDelete(scope.row)"></el-button>
-                <el-button type="warning" size="small" icon="el-icon-tickets" title="设备操作" @click="openTheDeviceActionDialog(scope.row.id)"
-                  >设备操作</el-button
-                >
+                <el-button type="warning" size="small" icon="el-icon-tickets" title="设备操作"
+                  @click="openTheDeviceActionDialog(scope.row.id)">设备操作</el-button>
               </template>
             </el-table-column>
           </el-table>
-          <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+          <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
         </div>
       </el-col>
     </el-row>
     <!-- 添加或修改设备台账对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" v-model="open" :close-on-click-modal="false">
+    <el-dialog :title="title" :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" :simple="true">
-            <el-step title="基本信息" />
-            <el-step title="文件上传" />
-          </el-steps>
+        <el-steps style="margin-bottom: 10px" :active="stepsActive" process-status="process" finish-status="success"
+          :simple="true">
+          <el-step title="基本信息" />
+          <el-step title="文件上传" />
+        </el-steps>
         <el-row :gutter="20">
           <!-- 步骤1填写 -->
           <template v-if="stepsActive === 0">
@@ -210,7 +150,8 @@
             <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" :value="parseInt(item.dictValue)">
+                  <el-radio v-for="item in options.statusOptions" :key="item.dictValue"
+                    :value="parseInt(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-radio>
                 </el-radio-group>
@@ -256,13 +197,15 @@
           <template v-if="stepsActive === 1">
             <el-col :lg="24">
               <el-form-item label="设备图片" prop="deviceImage">
-                <UploadImage v-model="form.deviceImage" :data="{ uploadType: 1, filePath: 'device/account/image' }" :limit="1" />
+                <UploadImage v-model="form.deviceImage" :data="{ uploadType: 1, filePath: 'device/account/image' }"
+                  :limit="1" />
               </el-form-item>
             </el-col>
 
             <el-col :lg="24">
               <el-form-item label="设备文件" prop="deviceFile">
-                <UploadFile v-model="form.deviceFile" drag :data="{ uploadType: 1, filePath: 'device/account/file' }" :limit="1"></UploadFile>
+                <UploadFile v-model="form.deviceFile" drag :data="{ uploadType: 1, filePath: 'device/account/file' }"
+                  :limit="1"></UploadFile>
               </el-form-item>
             </el-col>
           </template>
@@ -275,21 +218,16 @@
         <el-button type="primary" @click="submitForm" v-if="stepsActive == 1">提交</el-button>
       </div>
     </el-dialog>
-    <TheDeviceActionDialog v-model="open2" :actionDialogId="actionDialogId"></TheDeviceActionDialog>
+    <TheDeviceActionDialog :visible.sync="open2" :actionDialogId="actionDialogId"></TheDeviceActionDialog>
   </div>
 </template>
 
 <script>
-import {
-  listDeviceAccount,
-  addDeviceAccount,
-  delDeviceAccount,
-  updateDeviceAccount,
-  getDeviceAccount
-} from '@/api/deviceManagement/deviceaccount.js'
+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 TheDeviceActionDialog from './TheDeviceActionDialog'
+import { resetForm } from '@/utils/ruoyi.js'
 
 export default {
   name: 'deviceaccount',
@@ -384,18 +322,18 @@ export default {
         }
       })
     },
-    
+
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
     },
-    
+
     resetQuery() {
-      this.resetFields('queryRef')
+      this.resetForm('queryRef')
       this.queryParams.fkDeviceType = 0
       this.handleQuery()
     },
-    
+
     sortChange(column) {
       let sort = undefined
       let sortType = undefined
@@ -408,12 +346,12 @@ export default {
       this.queryParams.sortType = sortType
       this.handleQuery()
     },
-    
+
     cancel() {
       this.open = false
       this.reset()
     },
-    
+
     reset() {
       this.form = {
         id: null,
@@ -436,16 +374,16 @@ export default {
         updatedTime: null
       }
       this.stepsActive = 0
-      this.resetFields('formRef')
+      this.resetForm('formRef')
     },
-    
+
     handleAdd() {
       this.reset()
       this.open = true
       this.title = '添加设备台账'
       this.opertype = 1
     },
-    
+
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
@@ -461,11 +399,11 @@ export default {
         }
       })
     },
-    
+
     FileUploadSuccess(fileList) {
       console.log(fileList)
     },
-    
+
     submitForm() {
       this.$refs.formRef.validate((valid) => {
         if (valid) {
@@ -485,7 +423,7 @@ export default {
         }
       })
     },
-    
+
     handleDelete(row) {
       const Ids = row.id || this.ids
 
@@ -498,22 +436,22 @@ export default {
           this.$modal.msgSuccess('删除成功')
         })
     },
-    
+
     stepsNext(max = 2) {
       if (this.stepsActive++ > max) this.stepsActive = max
     },
-    
+
     stepsBack(min = 0) {
       if (this.stepsActive-- < min) this.stepsActive = min
     },
-    
+
     handlerGenerateQRCode() {
       const id = this.form.id || '0'
       const title = 'DEV-' + id + '-'
       const str = title + Date.now()
       this.form.deviceCode = str
     },
-    
+
     downloadQrCode(QRCode) {
       this.$confirm('是否下载此二维码？')
         .then(() => {
@@ -526,33 +464,33 @@ export default {
           link.click()
           document.body.removeChild(link)
         })
-        .catch(() => {})
+        .catch(() => { })
     },
-    
+
     handlerDownloadFile(url) {
       this.download(url)
     },
-    
+
     handlerTreeSelected(id) {
       this.queryParams.fkDeviceType = id
       this.handleQuery()
     },
-    
+
     handlerDeviceTypeSelected(id) {
       this.form.fkDeviceType = id
     },
-    
+
     openTheDeviceActionDialog(id) {
       this.open2 = true
       this.actionDialogId = id
     },
-    
+
     columns_showColumn(prop) {
       const column = this.columns.find(item => item.prop === prop)
       return column ? column.visible : false
     }
   },
-  
+
   mounted() {
     this.handleQuery()
   }
diff --git a/src/views/deviceManagement/deviceformconfig/index.vue b/src/views/deviceManagement/deviceformconfig/index.vue
index 3d20720..376706d 100644
--- a/src/views/deviceManagement/deviceformconfig/index.vue
+++ b/src/views/deviceManagement/deviceformconfig/index.vue
@@ -1,17 +1,16 @@
 <template>
-  <div>
+  <div class="app-container">
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
       <el-form-item>
-        <el-button icon="el-icon-search" type="primary" @click="handleQuery" size="small">{{ $t('btn.search') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery" size="small">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery" size="small">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery" size="small">重置</el-button>
       </el-form-item>
     </el-form>
     <!-- 工具区域 -->
     <el-row :gutter="15" class="mb10">
       <el-col :span="1.5">
-        <el-button type="primary" size="small" v-hasPermi="['deviceManagement:deviceformconfig:add']" plain icon="el-icon-plus"
-          @click="handleAdd">
-          {{ $t('btn.add') }}
+        <el-button type="primary" size="small" plain icon="el-icon-plus" @click="handleAdd">
+          新增
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -21,7 +20,9 @@
       highlight-current-row @sort-change="sortChange">
       <el-table-column prop="type" label="表单类型" align="center" v-if="columns_showColumn('type')">
         <template slot-scope="scope">
-          <dict-tag :options="options.typeOptions" :value="scope.row.type + ''" />
+          <el-tag v-for="item in options.typeOptions" v-if="item.dictValue == scope.row.type" :key="item.dictValue" :type="item.type">
+            {{ item.dictLabel }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="title" label="表单标题" align="center" :show-overflow-tooltip="true"
@@ -42,7 +43,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改设备检查项表单配置表对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
+    <el-dialog :title="title" :lock-scroll="false" append-to-body :visible.sync="open">
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :lg="12">
@@ -66,8 +67,8 @@
         </el-row>
       </el-form>
       <div slot="footer" v-if="opertype != 3">
-        <el-button @click="cancel">{{ $t('btn.cancel') }}</el-button>
-        <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">提交</el-button>
       </div>
     </el-dialog>
   </div>
@@ -132,10 +133,10 @@ export default {
       },
       options: {
         typeOptions: [
-          { dictValue: 1, dictLabel: '单选' },
-          { dictValue: 2, dictLabel: '多选' },
-          { dictValue: 3, dictLabel: '图片' },
-          { dictValue: 4, dictLabel: '文本' }
+          { dictValue: 1, dictLabel: '单选', type: 'primary' },
+          { dictValue: 2, dictLabel: '多选', type: 'info' },
+          { dictValue: 3, dictLabel: '图片', type: 'success' },
+          { dictValue: 4, dictLabel: '文本', type: 'warning' }
         ]
       }
     }
@@ -154,17 +155,17 @@ export default {
         }
       })
     },
-    
+
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
     },
-    
+
     resetQuery() {
-      this.resetFields('queryRef')
+      this.resetForm('queryRef')
       this.handleQuery()
     },
-    
+
     sortChange(column) {
       var sort = undefined
       var sortType = undefined
@@ -177,12 +178,12 @@ export default {
       this.queryParams.sortType = sortType
       this.handleQuery()
     },
-    
+
     cancel() {
       this.open = false
       this.reset()
     },
-    
+
     reset() {
       this.form = {
         id: null,
@@ -195,17 +196,17 @@ export default {
         updatedBy: null,
         updatedTime: null
       }
-      this.resetFields('formRef')
+      this.resetForm('formRef')
     },
-    
+
     handleAdd() {
       this.reset()
       this.open = true
       this.title = '添加设备检查项表单配置表'
       this.opertype = 1
-      this.initDict()
+      //this.initDict()
     },
-    
+
     handleUpdate(row) {
       this.reset()
       const id = row.id || this.ids
@@ -215,12 +216,12 @@ export default {
           this.open = true
           this.title = '修改设备检查项表单配置表'
           this.opertype = 2
-          this.initDict()
+          //this.initDict()
           this.form = { ...data }
         }
       })
     },
-    
+
     submitForm() {
       this.$refs.formRef.validate((valid) => {
         this.form.fkDeviceInspectId = this.message
@@ -242,7 +243,7 @@ export default {
         }
       })
     },
-    
+
     handleDelete(row) {
       const Ids = row.id || this.ids
 
@@ -255,15 +256,15 @@ export default {
           this.$modal.msgSuccess('删除成功')
         })
     },
-    
+
     // 初始化字典数据 - 已改为直接定义写死的数据
-    
+
     columns_showColumn(prop) {
       const column = this.columns.find(item => item.prop === prop)
       return column ? column.visible : false
     }
   },
-  
+
   mounted() {
     this.handleQuery()
   }
diff --git a/src/views/deviceManagement/deviceinspect/index.vue b/src/views/deviceManagement/deviceinspect/index.vue
index b4d96ed..c7c256a 100644
--- a/src/views/deviceManagement/deviceinspect/index.vue
+++ b/src/views/deviceManagement/deviceinspect/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <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 />
@@ -17,15 +17,15 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button icon="el-icon-search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
+        <el-button icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</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:deviceinspect:add']" plain icon="el-icon-plus" @click="handleAdd">
-          {{ $t('btn.add') }}
+        <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd">
+          新增
         </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -43,7 +43,7 @@
       <el-table-column prop="name" label="名称" width="480" v-if="columns_showColumn('id')" />
       <el-table-column prop="image" label="图片" align="center" v-if="columns_showColumn('image')">
         <template slot-scope="scope">
-          <ImagePreview :src="scope.row.image"></ImagePreview>
+          <el-image :src="scope.row.image"></el-image>
         </template>
       </el-table-column>
       <el-table-column prop="type" label="类别" align="center" :show-overflow-tooltip="true" v-if="columns_showColumn('type')">
@@ -70,14 +70,12 @@
             size="small"
             icon="el-icon-edit"
             title="编辑"
-            v-hasPermi="['deviceManagement:deviceinspect:edit']"
             @click="handleUpdate(scope.row)"></el-button>
           <el-button
             type="danger"
             size="small"
             icon="el-icon-delete"
             title="删除"
-            v-hasPermi="['deviceManagement:deviceinspect:delete']"
             @click="handleDelete(scope.row)"></el-button>
         </template>
       </el-table-column>
@@ -85,7 +83,7 @@
     <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改设备检查项对话框 -->
-    <el-dialog :title="title" :lock-scroll="false" v-model="open">
+    <el-dialog :title="title" :lock-scroll="false" :visible.sync="open">
       <!-- 基本信息 -->
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
@@ -140,7 +138,7 @@
         <el-button type="success" @click="submitForm">完成</el-button>
       </template>
     </el-dialog>
-    <el-dialog title="检查项表单配置" :lock-scroll="false" v-model="open_form">
+    <el-dialog title="检查项表单配置" :lock-scroll="false" append-to-body :visible.sync="open_form">
       <formconfig v-bind:message="parentMessage"></formconfig>
       <template slot="footer">
         <el-button type="success" @click="open_form = false">完成</el-button>
diff --git a/src/views/deviceManagement/devicetype/index.vue b/src/views/deviceManagement/devicetype/index.vue
index 82357be..09ee3a4 100644
--- a/src/views/deviceManagement/devicetype/index.vue
+++ b/src/views/deviceManagement/devicetype/index.vue
@@ -37,9 +37,9 @@
         <vxe-column title="操作">
           <template slot-scope="scope">
             <el-button-group>
-              <el-button text size="small" icon="el-icon-edit" @click="handleUpdate(scope.row)"></el-button>
-              <el-button text size="small" icon="el-icon-plus" @click="handleAdd(scope.row)"></el-button>
-              <el-button text size="small" icon="el-icon-delete" @click="handleDelete(scope.row)"></el-button>
+              <el-button size="small" type="success" icon="el-icon-edit" @click="handleUpdate(scope.row)"></el-button>
+              <el-button size="small" type="primary" icon="el-icon-plus" @click="handleAdd(scope.row)"></el-button>
+              <el-button size="small" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"></el-button>
             </el-button-group>
           </template>
         </vxe-column>