diff --git a/gear-ui3/src/components/UserSelect/multi.vue b/gear-ui3/src/components/UserSelect/multi.vue
index 80febfd..4573156 100644
--- a/gear-ui3/src/components/UserSelect/multi.vue
+++ b/gear-ui3/src/components/UserSelect/multi.vue
@@ -57,7 +57,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <KLPTable v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -79,13 +79,13 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-        </KLPTable>
+        </el-table>
 
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
       </el-col>
@@ -100,12 +100,12 @@
 <script>
 import { listUser } from "@/api/system/user";
 import { deptTreeSelect as treeselect } from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import Treeselect from "@riophae/vue-treeselect";
+// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "UserMultiSelect",
-  components: { Treeselect },
+  // components: { Treeselect },
   data() {
     return {
       showFlag:false,
diff --git a/gear-ui3/src/components/UserSelect/single.vue b/gear-ui3/src/components/UserSelect/single.vue
index c0805ae..6c17aab 100644
--- a/gear-ui3/src/components/UserSelect/single.vue
+++ b/gear-ui3/src/components/UserSelect/single.vue
@@ -57,7 +57,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <KLPTable v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table v-loading="loading" :data="userList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
             <el-table-column  width="55" align="center" >
                 <template v-slot="scope">
                     <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -82,13 +82,13 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-        </KLPTable>
+        </el-table>
 
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
       </el-col>
@@ -103,12 +103,12 @@
 <script>
 import { listUser } from "@/api/system/user";
 import { deptTreeSelect as treeselect } from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import Treeselect from "@riophae/vue-treeselect";
+// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "UserSingleSelect",
-  components: { Treeselect },
+  // components: { Treeselect },
   data() {
     return {
       showFlag:false,
diff --git a/gear-ui3/src/components/dvplanSelect/index.vue b/gear-ui3/src/components/dvplanSelect/index.vue
index 27b4658..bae8514 100644
--- a/gear-ui3/src/components/dvplanSelect/index.vue
+++ b/gear-ui3/src/components/dvplanSelect/index.vue
@@ -29,7 +29,7 @@
         </el-form-item>
       </el-form>
 
-      <KLPTable v-loading="loading" :data="checkplanList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+      <el-table v-loading="loading" :data="checkplanList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
         <el-table-column  width="55" align="center" >
             <template v-slot="scope">
                 <el-radio v-model="selectedPlanId" :label="scope.row.planId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -94,13 +94,13 @@
             >停用</el-button>
           </template>
         </el-table-column>
-      </KLPTable>
+      </el-table>
 
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
         @pagination="getList"
       />
 
diff --git a/gear-ui3/src/components/dvsubjectSelect/multi.vue b/gear-ui3/src/components/dvsubjectSelect/multi.vue
index dc58f33..edabf30 100644
--- a/gear-ui3/src/components/dvsubjectSelect/multi.vue
+++ b/gear-ui3/src/components/dvsubjectSelect/multi.vue
@@ -29,7 +29,7 @@
       </el-form-item>
     </el-form>
 
-    <KLPTable v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="dvsubjectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目编码" align="center" prop="subjectCode" />
       <el-table-column label="项目类型" align="center" prop="subjectType">
@@ -45,13 +45,13 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-    </KLPTable>
+    </el-table>
 
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
     <div slot="footer" class="dialog-footer">
diff --git a/gear-ui3/src/components/dvsubjectSelect/single.vue b/gear-ui3/src/components/dvsubjectSelect/single.vue
index 1e899e5..9e71423 100644
--- a/gear-ui3/src/components/dvsubjectSelect/single.vue
+++ b/gear-ui3/src/components/dvsubjectSelect/single.vue
@@ -29,7 +29,7 @@
         </el-form-item>
       </el-form>
 
-      <KLPTable v-loading="loading" :data="dvsubjectList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+      <el-table v-loading="loading" :data="dvsubjectList"  @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
         <el-table-column  width="55" align="center" >
             <template v-slot="scope">
                 <el-radio v-model="selectedId" :label="scope.row.subjectId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -40,13 +40,13 @@
         <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
         <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
         <el-table-column label="备注" align="center" prop="remark" />
-      </KLPTable>
+      </el-table>
 
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
         @pagination="getList"
       />
       <div slot="footer" class="dialog-footer">
diff --git a/gear-ui3/src/components/machinerySelect/index.vue b/gear-ui3/src/components/machinerySelect/index.vue
index 3e93494..9d55603 100644
--- a/gear-ui3/src/components/machinerySelect/index.vue
+++ b/gear-ui3/src/components/machinerySelect/index.vue
@@ -57,7 +57,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <KLPTable v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
           </el-table-column>
@@ -75,13 +75,13 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-        </KLPTable>
+        </el-table>
 
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
       </el-col>
@@ -94,18 +94,12 @@
 </template>
 
 <script>
-import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import { listMachinery } from "@/api/mes/dv/machinery";
 import { listMachinerytype } from "@/api/mes/dv/machinerytype";
-// import { listAllWorkshop } from "@/api/mes/md/workshop";
-
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "MachinerySelect",
   dicts: ['sys_yes_no','mes_machinery_status'],
-  components: { Treeselect },
   data() {
     return {
       showFlag: false,
diff --git a/gear-ui3/src/components/machinerySelect/single.vue b/gear-ui3/src/components/machinerySelect/single.vue
index 6997940..a6cb1fd 100644
--- a/gear-ui3/src/components/machinerySelect/single.vue
+++ b/gear-ui3/src/components/machinerySelect/single.vue
@@ -66,7 +66,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <KLPTable v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table v-loading="loading" :data="machineryList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
           <el-table-column width="50" align="center" >
             <template v-slot="scope">
                 <el-radio v-model="selectedMachineryId" :label="scope.row.machineryId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
@@ -88,13 +88,13 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-        </KLPTable>
+        </el-table>
 
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
           @pagination="getList"
         />
       </el-col>
@@ -107,17 +107,12 @@
 </template>
 
 <script>
-import { listMachinery, getMachinery, delMachinery, addMachinery, updateMachinery } from "@/api/mes/dv/machinery";
+import { listMachinery } from "@/api/mes/dv/machinery";
 import { listMachinerytype } from "@/api/mes/dv/machinerytype";
-// import { listAllWorkshop } from "@/api/mes/md/workshop";
-
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "MachinerySelectSingle",
   dicts: ['sys_yes_no','mes_machinery_status'],
-  components: { Treeselect },
   data() {
     return {
       showFlag: false,
diff --git a/gear-ui3/src/views/dv/checkplan/index.vue b/gear-ui3/src/views/dv/checkplan/index.vue
index 1d0daa5..7d5dd51 100644
--- a/gear-ui3/src/views/dv/checkplan/index.vue
+++ b/gear-ui3/src/views/dv/checkplan/index.vue
@@ -88,7 +88,7 @@
     <el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="方案编号" align="center" prop="planCode" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
@@ -97,22 +97,22 @@
       </el-table-column>
       <el-table-column label="方案名称" align="center" prop="planName" />
       <el-table-column label="方案类型" align="center" width="120px" prop="planType">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="dv_plan_type" :value="scope.row.planType"/>
         </template>
       </el-table-column>
       <el-table-column label="开始日期" align="center" prop="startDate" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束日期" align="center" prop="endDate" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="频率" width="100px" align="center" prop="cycleType">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span style="display: inline-flex;">
             {{scope.row.cycleCount}}
             <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
@@ -120,12 +120,12 @@
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/checkplan/machinery.vue b/gear-ui3/src/views/dv/checkplan/machinery.vue
index 72f9606..18f4dfd 100644
--- a/gear-ui3/src/views/dv/checkplan/machinery.vue
+++ b/gear-ui3/src/views/dv/checkplan/machinery.vue
@@ -33,7 +33,7 @@
       <el-table-column label="规格型号" align="center" prop="machinerySpec" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/checkplan/subject.vue b/gear-ui3/src/views/dv/checkplan/subject.vue
index 5af8bcb..f0fa45f 100644
--- a/gear-ui3/src/views/dv/checkplan/subject.vue
+++ b/gear-ui3/src/views/dv/checkplan/subject.vue
@@ -32,7 +32,7 @@
       <el-table-column label="项目内容" align="center" width="350px" prop="subjectContent" :show-overflow-tooltip="true"/>
       <el-table-column label="标准" align="center" width="300px" prop="subjectStandard" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="optType !='view'" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/checkrecord/index.vue b/gear-ui3/src/views/dv/checkrecord/index.vue
index e84dde1..5fe6bf1 100644
--- a/gear-ui3/src/views/dv/checkrecord/index.vue
+++ b/gear-ui3/src/views/dv/checkrecord/index.vue
@@ -83,7 +83,7 @@
     <el-table v-loading="loading" :data="checkrecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备编码" align="center" prop="machineryCode" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
@@ -97,17 +97,17 @@
       <el-table-column label="计划名称" align="center" prop="planName" />
       <el-table-column label="点检人" align="center" prop="nickName" />
       <el-table-column label="点检时间" align="center" prop="checkTime" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
@@ -221,14 +221,18 @@ import CheckplanSelect from "@/components/dvplanSelect/index.vue";
 import CheckRecordLine from "./line.vue";
 import UserSingleSelect from "@/components/userSelect/single.vue"
 import {formatDate} from "@/utils";
+import useUserStore from '@/store/modules/user'
+
 export default {
   name: "Checkrecord",
   components:{ MachinerySelectSingle, CheckplanSelect, CheckRecordLine, UserSingleSelect},
   setup() {
     const { proxy } = getCurrentInstance();
     const { mes_order_status } = proxy.useDict("mes_order_status");
+    const userStore = useUserStore();
     return {
-      mes_order_status
+      mes_order_status,
+      userStore
     }
   },
   data() {
@@ -326,9 +330,9 @@ export default {
         updateBy: null,
         updateTime: null
       };
-      this.form.userId= this.$store.state.user.id;
-      this.form.nickName= this.$store.state.user.nick;
-      this.form.userName= this.$store.state.user.name;
+      this.form.userId= this.userStore.id;
+      this.form.nickName= this.userStore.nickName;
+      this.form.userName= this.userStore.name;
   },
   created() {
     this.getList();
diff --git a/gear-ui3/src/views/dv/checkrecord/line.vue b/gear-ui3/src/views/dv/checkrecord/line.vue
index 582c206..f2efda0 100644
--- a/gear-ui3/src/views/dv/checkrecord/line.vue
+++ b/gear-ui3/src/views/dv/checkrecord/line.vue
@@ -39,13 +39,13 @@
       <el-table-column label="检查内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
       <el-table-column label="标准" align="center" prop="subjectStandard" />
       <el-table-column label="点检结果" align="center" prop="checkStatus" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="dv_cm_result_status" :value="scope.row.checkStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="异常描述" align="center" prop="checkResult" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" v-if="optType !== 'view'" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/machinery/components/Checkplan.vue b/gear-ui3/src/views/dv/machinery/components/Checkplan.vue
index 47c7469..fbac69e 100644
--- a/gear-ui3/src/views/dv/machinery/components/Checkplan.vue
+++ b/gear-ui3/src/views/dv/machinery/components/Checkplan.vue
@@ -5,23 +5,23 @@
       <el-table-column label="计划编码" align="center" prop="planCode" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="计划名称" align="center" width="200px" prop="planName" :show-overflow-tooltip="true"/>
       <el-table-column label="开始日期" align="center" prop="startDate" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束日期" align="center" prop="endDate" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="频率" align="center" prop="cycleType">
-        <template slot-scope="scope">
+        <template #default="scope">
           {{scope.row.cycleCount}}
           <dict-tag :options="mes_cycle_type" :value="scope.row.cycleType"/>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
diff --git a/gear-ui3/src/views/dv/machinery/components/Repair.vue b/gear-ui3/src/views/dv/machinery/components/Repair.vue
index b789db3..f11ae32 100644
--- a/gear-ui3/src/views/dv/machinery/components/Repair.vue
+++ b/gear-ui3/src/views/dv/machinery/components/Repair.vue
@@ -4,41 +4,33 @@
       <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
       <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
       <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="维修结果" align="center" prop="repairResult">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
         </template>
       </el-table-column>
       <el-table-column label="维修人员" align="center" prop="acceptedBy" />
       <el-table-column label="验收人员" align="center" prop="confirmBy" />
       <el-table-column label="单据状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
     </el-table>
-
-    <!--    <pagination-->
-    <!--      v-show="total>0"-->
-    <!--      :total="total"-->
-    <!--      v-model:page="queryParams.pageNum"-->
-    <!--      v-model:limit="queryParams.pageSize"-->
-    <!--      @pagination="getList"-->
-    <!--    />-->
   </div>
 </template>
 
diff --git a/gear-ui3/src/views/dv/machinery/index.vue b/gear-ui3/src/views/dv/machinery/index.vue
index 9da1a09..649fddb 100644
--- a/gear-ui3/src/views/dv/machinery/index.vue
+++ b/gear-ui3/src/views/dv/machinery/index.vue
@@ -97,7 +97,7 @@
         <el-table v-loading="loading" :data="machineryList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="设备编码" width = "120" align="center" key="machineryCode" prop="machineryCode">
-              <template slot-scope="scope">
+              <template #default="scope">
                 <el-button
                   size="mini"
                   type="text"
@@ -108,14 +108,14 @@
           <el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
           <el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
           <el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
-          <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" />
+          <!-- <el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName"  :show-overflow-tooltip="true" /> -->
           <el-table-column label="设备状态" align="center" key="status" prop="status" >
-            <template slot-scope="scope">
+            <template #default="scope">
               <dict-tag :options="mes_machinery_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" width="160">
-            <template slot-scope="scope">
+            <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
@@ -125,7 +125,7 @@
             width="160"
             class-name="small-padding fixed-width"
           >
-            <template slot-scope="scope">
+            <template #default="scope">
               <el-button
                 size="mini"
                 type="text"
@@ -193,13 +193,15 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item  label="设备分类" prop="machineryTypeId">
-                  <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'"  />
-                  <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' />
+                  <el-tree-select v-model="form.machineryTypeId" :data="machineryTypeOptions" :props="{label: 'machineryTypeName', value: 'machineryTypeId'}" disabled v-if="optType=='view'"  />
+                  <el-tree-select v-model="form.machineryTypeId" :data="machineryTypeOptions" :props="{label: 'machineryTypeName', value: 'machineryTypeId'}" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' />
+                  <!-- <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" disabled v-if="optType=='view'"  /> -->
+                  <!-- <treeselect v-model="form.machineryTypeId" :options="machineryTypeOptions" :normalizer="normalizer" placeholder="请选择所属分类" v-else :disable-branch-nodes='true' /> -->
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="所属车间" prop="workshopId">
                   <el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间">
                     <el-option
@@ -210,7 +212,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="设备状态" prop="status">
                   <el-select v-model="form.status" placeholder="请选择设备状态">
@@ -323,8 +325,8 @@ import { listMachinerytype } from "@/api/mes/dv/machinerytype";
 // import { listAllWorkshop } from "@/api/mes/md/workshop";
 // import {genCode} from "@/api/system/autocode/rule"
 import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import Treeselect from "@riophae/vue-treeselect";
+// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 // import BarcodeImg from "@/components/barcodeImg/index.vue";
 import CheckPlan from "./components/Checkplan.vue"
 import Repair from "./components/Repair.vue"
@@ -335,7 +337,7 @@ import Repair from "./components/Repair.vue"
 
 export default {
   name: "Machinery",
-  components: { Treeselect, CheckPlan, Repair },
+  components: { CheckPlan, Repair },
   setup() {
     const { proxy } = getCurrentInstance();
     const { sys_yes_no, mes_machinery_status } = proxy.useDict("sys_yes_no", "mes_machinery_status");
@@ -429,9 +431,9 @@ export default {
         machineryName: [
           { required: true, message: "设备名称不能为空", trigger: "blur" }
         ],
-        workshopId: [
-          { required: true, message: "车间不能为空",trigger: "blur"}
-        ],
+        // workshopId: [
+        //   { required: true, message: "车间不能为空",trigger: "blur"}
+        // ],
         machineryTypeId: [
           { required: true, message: "设备分类不能为空", trigger: "blur" },
         ],
@@ -524,7 +526,7 @@ export default {
         delete node.children;
       }
       return {
-        id: node.machineryTypeId,
+        value: node.machineryTypeId,
         label: node.machineryTypeName,
         children: node.children
       };
@@ -532,10 +534,10 @@ export default {
 	/** 查询设备类型下拉树结构 */
     getTreeselect() {
       listMachinerytype().then(response => {
-        debugger;
         this.machineryTypeOptions = [];
         const data = this.handleTree(response.data, "machineryTypeId", "parentTypeId")[0];
-        this.machineryTypeOptions.push(data);
+        console.log(data);
+        this.machineryTypeOptions = data.children;
       });
     },
     // 筛选节点
@@ -564,7 +566,7 @@ export default {
         machineryTypeId: null,
         machineryTypeCode: null,
         machineryTypeName: null,
-        workshopId: null,
+        workshopId: '1',
         workshopCode: null,
         workshopName: null,
         lastMaintenTime: null,
@@ -619,7 +621,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      debugger;
       this.reset();
       this.getTreeselect();
       // this.getWorkshops();
@@ -664,7 +665,6 @@ export default {
               this.getList();
             });
           } else {
-            debugger;
             addMachinery(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/gear-ui3/src/views/dv/machinerytype/index.vue b/gear-ui3/src/views/dv/machinerytype/index.vue
index 1679413..9b08b5e 100644
--- a/gear-ui3/src/views/dv/machinerytype/index.vue
+++ b/gear-ui3/src/views/dv/machinerytype/index.vue
@@ -10,7 +10,7 @@
         />
       </el-form-item>
       <el-form-item label="是否启用" prop="enableFlag">
-        <el-select v-model="queryParams.enableFlag" placeholder="选择是或否" clearable>
+        <el-select v-model="queryParams.enableFlag" style="width: 100px" placeholder="选择是或否" clearable>
           <el-option
             v-for="dict in sys_yes_no"
             :key="dict.value"
@@ -25,6 +25,39 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
     <el-table
       v-loading="loading"
       :data="machinerytypeList"
@@ -35,13 +68,13 @@
       <el-table-column label="设备类型编码" prop="machineryTypeCode" />
       <el-table-column label="设备类型名称" align="center" prop="machineryTypeName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
@@ -71,7 +104,8 @@
         <el-row>
           <el-col :span="24" v-if="form.parentTypeId !== 0">
             <el-form-item label="父类型" prop="parentTypeId">
-              <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
+              <!-- <treeselect v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" /> -->
+              <el-tree-select v-model="form.parentTypeId" :options="machinerytypeOptions" :normalizer="normalizer" placeholder="请选择父类型" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -118,15 +152,15 @@
 
 <script>
 import { listMachinerytype, getMachinerytype, delMachinerytype, addMachinerytype, updateMachinerytype } from "@/api/mes/dv/machinerytype";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// import Treeselect from "@riophae/vue-treeselect";
+// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Machinerytype",
   dicts: ['sys_yes_no'],
-  components: {
-    Treeselect
-  },
+  // components: {
+  //   Treeselect
+  // },
   setup() {
     const { proxy } = getCurrentInstance();
     const { sys_yes_no } = proxy.useDict("sys_yes_no");
@@ -247,6 +281,7 @@ export default {
         this.form.parentTypeId = row.machineryTypeId;
       } else {
         this.form.parentTypeId = 0;
+        this.form.ancestors = 0;
       }
       this.open = true;
       this.title = "添加设备类型";
diff --git a/gear-ui3/src/views/dv/maintenrecord/index.vue b/gear-ui3/src/views/dv/maintenrecord/index.vue
index 41f305b..1b4d037 100644
--- a/gear-ui3/src/views/dv/maintenrecord/index.vue
+++ b/gear-ui3/src/views/dv/maintenrecord/index.vue
@@ -86,7 +86,7 @@
     <el-table v-loading="loading" :data="maintenrecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="设备编码" align="center" prop="machineryCode" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
@@ -98,18 +98,18 @@
       <el-table-column label="规格型号" align="center" prop="machinerySpec" />
       <el-table-column label="计划名称" align="center" prop="planName" />
       <el-table-column label="保养时间" align="center" prop="maintenTime" width="180">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.maintenTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="保养人" align="center" prop="nickName" />
       <el-table-column label="状态" align="center" prop="status" >
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
@@ -222,14 +222,17 @@ import MachinerySelectSingle from "@/components/machinerySelect/single.vue";
 import CheckplanSelect from "@/components/dvplanSelect/index.vue";
 import UserSingleSelect from "@/components/userSelect/single.vue"
 import MaintenRecordLine from "./line.vue"
+import useUserStore from '@/store/modules/user'
 export default {
   name: "Maintenrecord",
   components: {MachinerySelectSingle, CheckplanSelect, UserSingleSelect, MaintenRecordLine},
   setup() {
     const { proxy } = getCurrentInstance();
     const { mes_order_status } = proxy.useDict("mes_order_status");
+    const userStore = useUserStore();
     return {
-      mes_order_status
+      mes_order_status,
+      userStore
     }
   },
   data() {
@@ -295,9 +298,9 @@ export default {
     reset() {
       this.form = {
       recordId: null,        planId: null,        planCode: null,        planName: null,        planType: null,        machineryId: null,        machineryCode: null,        machineryName: null,        machineryBrand: null,        machinerySpec: null,        maintenTime: null,        userId: null,        userName: null,        nickName: null,        status: "PREPARE",        remark: null,        attr1: null,        attr2: null,        attr3: null,        attr4: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
-      this.form.userId= this.$store.state.user.id;
-      this.form.nickName= this.$store.state.user.nick;
-      this.form.userName= this.$store.state.user.name;
+      this.form.userId= this.userStore.id;
+      this.form.nickName= this.userStore.nickName;
+      this.form.userName= this.userStore.name;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
diff --git a/gear-ui3/src/views/dv/maintenrecord/line.vue b/gear-ui3/src/views/dv/maintenrecord/line.vue
index 0765e3c..59fa970 100644
--- a/gear-ui3/src/views/dv/maintenrecord/line.vue
+++ b/gear-ui3/src/views/dv/maintenrecord/line.vue
@@ -41,7 +41,7 @@
       <el-table-column label="保养结果" align="center" prop="maintenStatus" />
       <el-table-column label="异常描述" align="center" prop="maintenResult" />
       <el-table-column label="操作" align="center" v-if="optType != 'view'" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/repair/index.vue b/gear-ui3/src/views/dv/repair/index.vue
index 85fcb31..336f209 100644
--- a/gear-ui3/src/views/dv/repair/index.vue
+++ b/gear-ui3/src/views/dv/repair/index.vue
@@ -100,34 +100,34 @@
       <el-table-column label="设备编码" align="center" prop="machineryCode" />
       <el-table-column label="设备名称" align="center" prop="machineryName" />
       <el-table-column label="报修日期" align="center" prop="requireDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.requireDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="维修完成日期" align="center" prop="finishDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.finishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="验收日期" align="center" prop="confirmDate" width="120">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="维修结果" align="center" prop="repairResult">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_repair_result" :value="scope.row.repairResult"/>
         </template>
       </el-table-column>
       <el-table-column label="维修人员" align="center" prop="acceptedBy" />
       <el-table-column label="验收人员" align="center" prop="confirmBy" />
       <el-table-column label="单据状态" align="center" prop="status">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_order_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/repair/line.vue b/gear-ui3/src/views/dv/repair/line.vue
index ce6e18b..997a879 100644
--- a/gear-ui3/src/views/dv/repair/line.vue
+++ b/gear-ui3/src/views/dv/repair/line.vue
@@ -28,7 +28,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目名称" align="center" prop="subjectName" />
       <el-table-column label="故障描述" align="center" prop="malfunction" >
-<!--        <template slot-scope="scope">-->
+<!--        <template #default="scope">-->
 <!--          <el-input type="textarea">{{scope.row.malfunction}}</el-input>-->
 <!--        </template>-->
       </el-table-column>
@@ -37,7 +37,7 @@
       </el-table-column>
       <el-table-column label="维修情况" align="center" prop="repairDes" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue b/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
index f81196c..26a6d17 100644
--- a/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
+++ b/gear-ui3/src/views/dv/specialEquipment/specialEquipment.vue
@@ -139,17 +139,17 @@
       <el-table-column label="规格型号" align="center" prop="specificationModel" />
       <el-table-column label="制造单位" align="center" prop="manufacturer" />
 <!--      <el-table-column label="制造日期" align="center" prop="productionDate" width="98">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="安装日期" align="center" prop="installationDate" width="98">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.installationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>-->
       <el-table-column label="投入使用日期" align="center" prop="useStartDate" width="98">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.useStartDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
@@ -158,23 +158,23 @@
 <!--      <el-table-column label="附件路径" align="center" prop="attachment" />-->
       <el-table-column label="检验周期" align="center" prop="inspectionCycle" />
       <el-table-column label="上次检验时间" align="center" prop="lastInspectionTime" width="98">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.lastInspectionTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="下次检验时间" align="center" prop="nextInspectionTime" width="98">
-        <template slot-scope="scope">
+        <template #default="scope">
           <span>{{ parseTime(scope.row.nextInspectionTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>-->
       <el-table-column label="当前状态" align="center" prop="currentStatus">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="special_equipment_type" :value="scope.row.currentStatus"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"
diff --git a/gear-ui3/src/views/dv/subject/index.vue b/gear-ui3/src/views/dv/subject/index.vue
index d4448b5..583a81b 100644
--- a/gear-ui3/src/views/dv/subject/index.vue
+++ b/gear-ui3/src/views/dv/subject/index.vue
@@ -79,7 +79,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="项目编码" align="center" prop="subjectCode" />
       <el-table-column label="项目类型" align="center" prop="subjectType">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="mes_dvsubject_type" :value="scope.row.subjectType"/>
         </template>
       </el-table-column>
@@ -87,13 +87,13 @@
       <el-table-column label="项目内容" align="center" prop="subjectContent" :show-overflow-tooltip="true"/>
       <el-table-column label="标准" align="center" prop="subjectStandard" :show-overflow-tooltip="true"/>
       <el-table-column label="是否启用" align="center" prop="enableFlag">
-        <template slot-scope="scope">
+        <template #default="scope">
           <dict-tag :options="sys_yes_no" :value="scope.row.enableFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template #default="scope">
           <el-button
             size="mini"
             type="text"