diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue
index 9ebe049..0afc4fd 100644
--- a/src/views/auditPages/assetsManagement/index.vue
+++ b/src/views/auditPages/assetsManagement/index.vue
@@ -32,7 +32,7 @@
                 <el-form-item label="系统类型：" prop="xtlx">
                   <el-select v-model="formInline.xtlx" placeholder="请选择系统类型">
                     <el-option
-                      v-for="dict in dict.type.zc_xtlx"
+                      v-for="dict in zc_xtlx"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value">
@@ -65,7 +65,7 @@
                 <el-form-item label="系统状态：" prop="xtzt">
                   <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
                     <el-option
-                      v-for="dict in dict.type.zc_xtzt"
+                      v-for="dict in zc_xtzt"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value">
@@ -75,8 +75,8 @@
               </el-col>
               <el-col :span="9" style="text-align: right;padding-right: 35px;">
                 <el-form-item>
-                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                  <el-button size="mini" @click="resetQuery">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery">查询</el-button>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -90,7 +90,7 @@
                 <el-button
                   type="info"
                   plain
-                  icon="el-icon-upload2"
+                  icon="Upload"
                   size="mini"
                   @click="handleImport"
                 >导入</el-button>
@@ -99,7 +99,7 @@
                 <el-button
                   type="warning"
                   plain
-                  icon="el-icon-download"
+                  icon="Download"
                   size="mini"
                   @click="handleExport"
                 >导出</el-button>
@@ -108,7 +108,7 @@
                 <el-button
                   type="primary"
                   plain
-                  icon="el-icon-plus"
+                  icon="Plus"
                   size="mini"
                   @click="handleAdd"
                 >新增资产</el-button>
@@ -120,51 +120,35 @@
               <el-table-column type="index" width="60" label="序号" align="center"/>
               <el-table-column label="系统名称" key="xtmc" width="200px" prop="xtmc" align="center" />
               <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
+                <template #default="scope">
+                  <dict-tag :options="zc_xtlx" :value="scope.row.xtlx"/>
                 </template>
               </el-table-column>
-              <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
-                <!-- <template slot-scope="scope">
-                  <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-                </template> -->
-              </el-table-column>
+              <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center" />
               <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
               <el-table-column label="系统状态" key="status" prop="status" class-name="table-status" align="center">
-                <template slot-scope="scope">
-                  <span  v-if="scope.row.xtzt == 1" style="color: #16B771;">
-                    已安装
-                  </span>
-                  <span v-if="scope.row.xtzt == 2" style="color: #F58A0C;">
-                    测试中
-                  </span>
-                  <span v-if="scope.row.xtzt == 3" style="color: #1485EF;">
-                    使用中
-                  </span>
-                  <span v-if="scope.row.xtzt == 4" style="color: #29A07A;">
-                    维护中
-                  </span>
-                  <span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
-                    关停
-                  </span>
-                  <span v-if="scope.row.xtzt == 6" style="color: #F50C0C;">
-                    备用
-                  </span>
+                <template #default="scope">
+                  <span v-if="scope.row.xtzt == 1" style="color: #16B771;">已安装</span>
+                  <span v-if="scope.row.xtzt == 2" style="color: #F58A0C;">测试中</span>
+                  <span v-if="scope.row.xtzt == 3" style="color: #1485EF;">使用中</span>
+                  <span v-if="scope.row.xtzt == 4" style="color: #29A07A;">维护中</span>
+                  <span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">关停</span>
+                  <span v-if="scope.row.xtzt == 6" style="color: #F50C0C;">备用</span>
                 </template>
               </el-table-column>
               <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-                <template slot-scope="scope">
+                <template #default="scope">
                   <div style="display: flex;align-items: center;justify-content: center;">
                     <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <el-icon><View /></el-icon>
                       <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
                     </div>
                     <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <el-icon><Edit /></el-icon>
                       <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                     </div>
                     <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <el-icon><Delete /></el-icon>
                       <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
                     </div>
                   </div>
@@ -178,11 +162,16 @@
             :page="formInline.current"
             :limit="formInline.size"
             @pagination="getPagination"
-            :current-page.sync="formInline.current" 
-          ></my-pagination>
+            v-model:current-page="formInline.current"
+          />
         </main>
         <!-- 资产导入对话框 -->
-        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-dialog 
+          v-model="upload.open"
+          :title="upload.title" 
+          width="400px" 
+          append-to-body
+        >
           <el-upload
             ref="upload"
             :limit="1"
@@ -195,230 +184,268 @@
             :auto-upload="false"
             drag
           >
-            <i class="el-icon-upload"></i>
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip text-center" slot="tip">
-              <!-- <div class="el-upload__tip" slot="tip">
-                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-              </div> -->
-              <span>仅允许导入xls、xlsx格式文件。</span>
-              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-            </div>
+            <template #tip>
+              <div class="el-upload__tip">
+                <span>仅允许导入xls、xlsx格式文件。</span>
+                <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+              </div>
+            </template>
           </el-upload>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitFileForm">确 定</el-button>
-            <el-button @click="upload.open = false">取 消</el-button>
-          </div>
+          <template #footer>
+            <div class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+            </div>
+          </template>
         </el-dialog>
       </div>
     </el-col>
   </el-row>
 </template>
-<script>
+<script setup>
+import { ref, reactive, onMounted, onUnmounted, getCurrentInstance } from 'vue'
+import { useRouter } from 'vue-router'
 import myPagination from "@/views/components/Pagination/index.vue"
-// import myDialog from "@/views/components/myDialog/index.vue"
-import { getToken } from "@/utils/auth";
-import { assetUnit, deleteAssetInfo, schema } from "@/api/auditPagesApi/index";
-export default {
-  dicts: ['zc_xtzt','zc_xtlx'],
-  components:{myPagination},
-  data() {
-    return {
-      // 部门树选项
-      deptOptions: undefined,
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      formInline:{
-        xtmc:"",
-        xtlx:"",
-        time:[],
-        startTime:"",
-        endTime:"",
-        dwmc:"",
-        xtzt:"",
-        current:1,
-        size:20,
-      },
-      total:0,
-      tableData:[],
-      loading:false,
-      tabHeader: undefined,
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "web资产导入",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        // url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import"
-        url: location.origin + "/api/tc/assetCurrent/importData"
-      },
-    }
-  },
-  mounted(){
-    if( Object.keys(this.$route.params).length != 0) {
-    console.log(this.$route.params,"params");
-      
-      this.formInline = this.$route.params;
-    }else{
-      this.formInline.current = 1
-      this.formInline.size = 20
+import { getToken } from "@/utils/auth"
+import { assetUnit, deleteAssetInfo, schema } from "@/api/auditPagesApi/index"
+import { useDict } from '@/utils/dict'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import {
+  View,
+  Edit,
+  Delete,
+  Upload,
+  Download,
+  Plus,
+  UploadFilled
+} from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+const router = useRouter()
+
+// 字典数据
+const { zc_xtzt, zc_xtlx } = useDict('zc_xtzt', 'zc_xtlx')
+
+// 部门树选项
+const deptOptions = ref()
+const tree = ref(null)
+
+const defaultProps = {
+  children: "children",
+  label: "label"
+}
+
+const formInline = reactive({
+  xtmc: "",
+  xtlx: "",
+  time: [],
+  startTime: "",
+  endTime: "",
+  dwmc: "",
+  xtzt: "",
+  current: 1,
+  size: 20,
+})
+
+const total = ref(0)
+const tableData = ref([])
+const loading = ref(false)
+const tabHeader = ref()
+
+// 用户导入参数
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "web资产导入",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: location.origin + "/api/tc/assetCurrent/importData"
+})
+
+/** 查询部门下拉树结构 */
+const getDeptTree = () => {
+  schema({type:0}).then(response => {
+    deptOptions.value = response.data
+  })
+}
+
+// 筛选节点
+const filterNode = (value, data) => {
+  if (!value) return true
+  return data.label.indexOf(value) !== -1
+}
+
+// 节点单击事件
+const handleNodeClick = (data) => {
+  formInline.deptId = data.id
+  handleQuery()
+}
+
+// 获取列表
+const getList = () => {
+  loading.value = true
+  assetUnit('get', formInline).then(res => {
+    loading.value = false
+    total.value = res.data.total
+    tableData.value = res.data.records
+  })
+}
+
+// 重置
+const resetQuery = () => {
+  proxy.$refs["queryForm"].resetFields()
+  formInline.deptId = undefined
+  tree.value.setCurrentKey(null)
+  handleQuery()
+}
+
+// 查询
+const handleQuery = () => {
+  formInline.current = 1
+  formInline.size = 20
+  if(formInline.time) {
+    formInline.startTime = formInline.time[0]
+    formInline.endTime = formInline.time[1]
+  }
+  formInline.time = []
+  getList()
+}
+
+// 页码获取
+const getPagination = (pages) => {
+  formInline.current = pages.page
+  formInline.size = pages.limit
+  getList()
+}
+
+// 导入
+const handleImport = () => {
+  upload.open = true
+}
+
+// 导出
+const handleExport = () => {
+  proxy.download('/tc/assetCurrent/export', {
+    ...formInline
+  }, `web资产${new Date().getTime()}.xlsx`)
+}
+
+/** 下载模板操作 */
+const importTemplate = () => {
+  proxy.download('/tc/assetCurrent/importTemplate', {}, 
+    `web资产导入模板${new Date().getTime()}.xlsx`)
+}
+
+// 文件上传中处理
+const handleFileUploadProgress = () => {
+  upload.isUploading = true
+}
+
+// 文件上传成功处理
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs.upload.clearFiles()
+  ElMessageBox.alert(
+    `<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>${response.msg}</div>`,
+    "导入结果",
+    { dangerouslyUseHTMLString: true }
+  )
+  getList()
+}
+
+// 提交上传文件
+const submitFileForm = () => {
+  proxy.$refs.upload.submit()
+}
+
+// 新增资产
+const handleAdd = () => {
+  router.push({
+    name: 'AssetsAuth',
+    query: {
+      pageType: "add",
+      type: 0,
     }
-    this.getList();
-    this.getDeptTree();
-    this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
-  },
-  destroyed() {
-    window.removeEventListener('resize', this.cancalDebounce);
-  },
-  methods:{
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      schema({type:0}).then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.formInline.deptId = data.id;
-      this.handleQuery();
-    },
-    // 获取列表
-    getList(){
-      this.loading = true;
-      console.log(this.formInline);
-      
-      assetUnit('get',this.formInline).then(res=>{
-        this.loading = false;
-        this.total = res.data.total;
-        this.tableData = res.data.records;
-      })
-    },
-    // 重置
-    resetQuery(){
-      this.resetForm("queryForm");
-      this.formInline.deptId = undefined;
-      this.$refs.tree.setCurrentKey(null);
-      this.handleQuery();
-    },
-    // 查询
-    handleQuery(){
-      this.formInline.current = 1;
-      this.formInline.size = 20
-      if(this.formInline.time) {
-        this.formInline.startTime = this.formInline.time[0]
-        this.formInline.endTime = this.formInline.time[1]
+  })
+}
+
+// 查看详情
+const goInfo = (row, id) => {
+  if(id === 1) {
+    router.push({
+      name: 'AssetsAuth',
+      query: {
+        pageType: "look",
+        type: 0,
+        id: row.id,
+        queryData: formInline,
       }
-      this.formInline.time = [];
-      this.getList();
-    },
-    // 页码获取
-    getPagination(pages){
-      this.formInline.current = pages.page;
-      this.formInline.size = pages.limit;
-      this.getList();
-    },
-    // 导入
-    handleImport(){
-      this.upload.open = true;
-    },
-    // 导出
-    handleExport(){
-      this.download('/tc/assetCurrent/export', {
-        ...this.formInline
-      }, `web资产${new Date().getTime()}.xlsx`)
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('/tc/assetCurrent/importTemplate', {
-      }, `web资产导入模板${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 新增资产
-    handleAdd(){
-      this.$router.push({name: 'AssetsAuth',query: {
-        pageType: "add",
-        type:0,
-      }})
-    },
-    // 查看详情
-    goInfo(row,id){
-      console.log(this.formInline,'this.formInline')
-      // if(id == 1) {
-      //   this.$router.push({name: 'AssetsAuth',query: {
-      //     pageType: "look",
-      //     type:0,
-      //     id:row.id,
-      //     queryData:this.formInline,
-      //   }})
-      // } else if(id == 2) {
-      //   this.$router.push({name: 'AssetsAuth',query: {
-      //     pageType: "change",
-      //     type:0,
-      //     id:row.id,
-      //     queryData:this.formInline,
-      //   }})
-      // } else if(id == 3) {
-      //   const userIds = row.id;
-      //   this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-      //     return deleteAssetInfo(userIds);
-      //   }).then(() => {
-      //     this.getList();
-      //     this.$modal.msgSuccess("删除成功");
-      //   }).catch(() => {});
-      //   }
-    },
-    // 编辑
-    edit(){
-    },
-    // 删除
-    delInfo(){},
-    // 修改table背景色
-    tableRowClassName({row, rowIndex}){
-      if (rowIndex % 2 !== 0) {
-        return 'evenNumber-row';
+    })
+  } else if(id === 2) {
+    router.push({
+      name: 'AssetsAuth',
+      query: {
+        pageType: "change",
+        type: 0,
+        id: row.id,
+        queryData: formInline,
       }
-      return '';
-    },
-    // 屏幕尺寸变化
-    cancalDebounce(){
-      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
-      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
-      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
-      const elementHeight = element.offsetHeight;
-      const headerHeight = header.offsetHeight;
-      const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 110;
-    }
-  },
+    })
+  } else if(id === 3) {
+    const userIds = row.id
+    ElMessageBox.confirm(
+      `是否确认删除用户编号为"${userIds}"的数据项？`
+    ).then(() => {
+      return deleteAssetInfo(userIds)
+    }).then(() => {
+      getList()
+      ElMessage.success("删除成功")
+    }).catch(() => {})
+  }
+}
+
+// 修改table背景色
+const tableRowClassName = ({rowIndex}) => {
+  if (rowIndex % 2 !== 0) {
+    return 'evenNumber-row'
+  }
+  return ''
+}
+
+// 屏幕尺寸变化
+const cancalDebounce = () => {
+  const element = document.getElementById('L-size-main')
+  const header = document.getElementById('L-header')
+  const pagination = document.getElementById('L-pagination')
+  const elementHeight = element.offsetHeight
+  const headerHeight = header.offsetHeight
+  const paginationtHeight = pagination.offsetHeight
+  tabHeader.value = elementHeight - headerHeight - paginationtHeight - 110
 }
+
+onMounted(() => {
+  if(Object.keys(router.currentRoute.value.params).length !== 0) {
+    Object.assign(formInline, router.currentRoute.value.params)
+  } else {
+    formInline.current = 1
+    formInline.size = 20
+  }
+  getList()
+  getDeptTree()
+  cancalDebounce()
+  window.addEventListener('resize', cancalDebounce)
+})
+
+onUnmounted(() => {
+  window.removeEventListener('resize', cancalDebounce)
+})
 </script>
diff --git a/src/views/components/assetsType/index_v2.vue b/src/views/components/assetsType/index_v2.vue
index fe391f3..808a7f2 100644
--- a/src/views/components/assetsType/index_v2.vue
+++ b/src/views/components/assetsType/index_v2.vue
@@ -9,7 +9,7 @@
         <el-form
           :model="ruleForm"
           :rules="rules"
-          ref="ruleForm"
+          ref="ruleFormRef"
           label-width="170px"
           class="demo-ruleForm"
           label-position="right"
@@ -35,7 +35,7 @@
                   placeholder="请选择平台类型"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_ptlx_type"
+                    v-for="dict in sys_ptlx_type"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -106,7 +106,7 @@
                     @change="changeState"
                   >
                     <el-option
-                      v-for="dict in dict.type.gzh_state"
+                      v-for="dict in gzh_state"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -132,7 +132,7 @@
                     placeholder="请选择公众号类型"
                   >
                     <el-option
-                      v-for="dict in dict.type.gzh_lx"
+                      v-for="dict in gzh_lx"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -149,7 +149,7 @@
                     placeholder="请选择认证状态"
                   >
                     <el-option
-                      v-for="dict in dict.type.gzh_rzzt"
+                      v-for="dict in gzh_rzzt"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -178,7 +178,7 @@
                     placeholder="请选择认证类型"
                   >
                     <el-option
-                      v-for="dict in dict.type.gzh_rzlx"
+                      v-for="dict in gzh_rzlx"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -193,7 +193,7 @@
                     placeholder="请选择所属行业"
                   >
                     <el-option
-                      v-for="dict in dict.type.app_sshy"
+                      v-for="dict in app_sshy"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -210,7 +210,7 @@
                     placeholder="请选择重点行业"
                   >
                     <el-option
-                      v-for="dict in dict.type.app_zdhy"
+                      v-for="dict in app_zdhy"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -225,7 +225,7 @@
                     placeholder="请选择行政区划"
                   >
                     <el-option
-                      v-for="dict in dict.type.app_xzqh"
+                      v-for="dict in app_xzqh"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -377,7 +377,7 @@
                       placeholder="请选择菜单类型"
                     >
                       <el-option
-                        v-for="dict in dict.type.gzh_cdlx"
+                        v-for="dict in gzh_cdlx"
                         :key="dict.value"
                         :label="dict.label"
                         :value="dict.value"
@@ -470,7 +470,7 @@
                     placeholder="请选择账号状态"
                   >
                     <el-option
-                      v-for="dict in dict.type.gzh_state"
+                      v-for="dict in gzh_state"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -508,7 +508,7 @@
                     placeholder="请选择重点行业"
                   >
                     <el-option
-                      v-for="dict in dict.type.app_zdhy"
+                      v-for="dict in app_zdhy"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -523,7 +523,7 @@
                     placeholder="请选择所属行业"
                   >
                     <el-option
-                      v-for="dict in dict.type.app_sshy"
+                      v-for="dict in app_sshy"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -629,171 +629,189 @@
     </div>
   </div>
 </template>
-<script>
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance, nextTick } from "vue";
+import { useRouter } from "vue-router";
 import {
   assetOfficialAccount,
   assetOfficialAccountInfo,
   unitAllList,
 } from "@/api/auditPagesApi/index";
 import equalToPassword from "@/views/components/assetsType/mainx.js";
+import { useDict } from "@/utils/dict";
 
-export default {
-  dicts: [
-    "app_xzqh",
-    "app_sshy",
-    "app_zdhy",
-    "gzh_state",
-    "gzh_lx",
-    "gzh_rzzt",
-    "gzh_rzlx",
-    "gzh_cdlx",
-    "sys_ptlx_type",
+const props = defineProps({
+  pageType: String,
+  id: [String, Number],
+  queryData: Object,
+});
+
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+
+// 字典数据
+const {
+  app_xzqh,
+  app_sshy,
+  app_zdhy,
+  gzh_state,
+  gzh_lx,
+  gzh_rzzt,
+  gzh_rzlx,
+  gzh_cdlx,
+  sys_ptlx_type,
+} = useDict(
+  "app_xzqh",
+  "app_sshy",
+  "app_zdhy",
+  "gzh_state",
+  "gzh_lx",
+  "gzh_rzzt",
+  "gzh_rzlx",
+  "gzh_cdlx",
+  "sys_ptlx_type"
+);
+
+const ruleFormRef = ref(null);
+const loading = ref(false);
+const disabled = ref(false);
+
+const ruleForm = reactive({
+  ptlx: "1",
+  cdList: [
+    {
+      cdmc: "",
+      cdlj: "",
+      cdlx: "",
+    },
   ],
-  data() {
-    const changeSateTetx = (rule, value, callback) => {
-      if (this.ruleForm.gzhzt == 7 && !value) {
-        callback(new Error("请填写"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      ruleForm: {
-        ptlx: "1",
-        cdList: [
-          {
-            cdmc: "",
-            cdlj: "",
-            cdlx: "",
-          },
-        ],
-      },
-      rules: {
-        bfyy: [{ validator: changeSateTetx, trigger: "blur" }],
-        ssdw: [
-          { required: true, message: "所属单位不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "change" },
-        ],
-        // gzhmc:[
-        //   { required: true, message: "公众号名称不能为空", trigger: "blur" }
-        // ],
-      },
-      loading: false,
-      disabled: false,
-      // disabledTwo:true,
-    };
-  },
-  props: ["pageType", "id", "queryData"],
-  mounted() {
-    if (this.pageType == "look") {
-      this.getInfo(this.id);
-      this.disabled = true;
-      this.$nextTick(() => {
-        const inputElements = document.querySelectorAll(".el-input__inner");
-        const textareaInputElements = document.querySelectorAll(
-          ".el-textarea__inner"
-        );
-        inputElements.forEach((input) => {
-          input.placeholder = "";
-        });
-        textareaInputElements.forEach((input) => {
-          input.placeholder = "";
-        });
-      });
-    } else if (this.pageType == "change") {
-      this.getInfo(this.id);
-      this.disabled = false;
-      // this.disabledTwo = false;
+});
+
+// 表单验证规则
+const changeSateTetx = (rule, value, callback) => {
+  if (ruleForm.gzhzt == 7 && !value) {
+    callback(new Error("请填写"));
+  } else {
+    callback();
+  }
+};
+
+const rules = {
+  bfyy: [{ validator: changeSateTetx, trigger: "blur" }],
+  ssdw: [
+    { required: true, message: "所属单位不能为空", trigger: "blur" },
+    { required: true, validator: equalToPassword, trigger: "change" },
+  ],
+};
+
+// 状态改变
+const changeState = (e) => {
+  if (e != 7) {
+    ruleForm.bfyy = "";
+  }
+};
+
+// 删除菜单项
+const removeDomain = (item, type) => {
+  const index = ruleForm[type].indexOf(item);
+  if (index !== -1) {
+    ruleForm[type].splice(index, 1);
+  }
+};
+
+// 新增菜单
+const addOtherConcat = (type) => {
+  ruleForm[type].push({
+    cdmc: "",
+    cdlj: "",
+    cdlx: "",
+  });
+};
+
+// 获取信息
+const getInfo = (id) => {
+  assetOfficialAccountInfo(id).then((res) => {
+    Object.assign(ruleForm, res.data);
+  });
+};
+
+// 平台类型切换
+const ptlxChange = (item) => {
+  Object.keys(ruleForm).forEach((key) => {
+    if (key == "cdList") {
+      ruleForm[key] = [];
+      return;
     }
-  },
-  methods: {
-    changeState(e) {
-      console.log(e);
-      if (e != 7) {
-        this.ruleForm.bfyy = "";
-      }
-    },
-    removeDomain(item, type) {
-      var index = this.ruleForm[type].indexOf(item);
-      if (index !== -1) {
-        this.ruleForm[type].splice(index, 1);
-      }
-    },
-    // 新增其他联系人
-    addOtherConcat(type) {
-      this.ruleForm[type].push({
-        cdmc: "",
-        cdlj: "",
-        cdlx: "",
-        // key: Date.now()
-      });
-    },
-    getInfo(id) {
-      assetOfficialAccountInfo(id).then((res) => {
-        this.ruleForm = res.data;
+    if (key !== "ssdw" && key !== "ptlx") {
+      ruleForm[key] = "";
+    }
+  });
+};
+
+// 单位名称模糊查询
+const querySearchAsync = (queryString, cb) => {
+  let results = [];
+  unitAllList({ nickName: queryString }).then((res) => {
+    res.data.forEach((item) => {
+      results.push({
+        value: item.nickName,
+        id: item.id,
       });
-    },
-    // 平台类型切换
-    ptlxChange(item) {
-      Object.keys(this.ruleForm).forEach((key) => {
-        if(key =="cdList"){
-          this.ruleForm[key] = [];
-          return
-        }
-        if (key !== "ssdw" && key !== "ptlx" ) {
-          this.ruleForm[key] = "";
-        }
+    });
+    cb(results);
+  });
+};
 
+// 新增资产确认按钮
+const newAssets = () => {
+  if (!ruleFormRef.value) return;
 
-      });
-    },
-    // 单位名称模糊查询
-    querySearchAsync(queryString, cb) {
-      let results = [];
-      unitAllList({ nickName: queryString }).then((res) => {
-        res.data.forEach((item) => {
-          results.push({
-            value: item.nickName,
-            id: item.id,
+  ruleFormRef.value.validate((valid) => {
+    if (valid) {
+      loading.value = true;
+      if (props.pageType == "change") {
+        assetOfficialAccount("put", ruleForm).then((res) => {
+          loading.value = false;
+          proxy.$modal.msgSuccess("修改成功");
+          router.push({
+            name: "OfficialAccount",
+            params: props.queryData,
           });
         });
-      });
-      cb(results);
-    },
-    // 新增资产确认按钮
-    newAssets() {
-      console.log(this.ruleForm);
+      } else {
+        assetOfficialAccount("post", ruleForm).then((res) => {
+          loading.value = false;
+          proxy.$modal.msgSuccess("新增成功");
+          router.go(-1);
+        });
+      }
+    }
+  });
+};
 
-      this.$refs["ruleForm"].validate((valid) => {
-        if (valid) {
-          this.loading = true;
-          if (this.pageType == "change") {
-            assetOfficialAccount("put", this.ruleForm).then((res) => {
-              // console.log(res,"res");
-              this.loading = false;
-              this.$modal.msgSuccess("修改成功");
-              // this.$router.go(-1);
-              this.$router.push({
-                name: "OfficialAccount",
-                params: this.queryData,
-              });
-            });
-          } else {
+const sendBack = () => {
+  router.push({ name: "OfficialAccount", params: props.queryData });
+};
 
-            assetOfficialAccount("post", this.ruleForm).then((res) => {
-              // console.log(res,"res");
-              this.loading = false;
-              this.$modal.msgSuccess("新增成功");
-              this.$router.go(-1);
-            });
-          }
-        }
+onMounted(() => {
+  if (props.pageType == "look") {
+    getInfo(props.id);
+    disabled.value = true;
+    nextTick(() => {
+      const inputElements = document.querySelectorAll(".el-input__inner");
+      const textareaInputElements = document.querySelectorAll(
+        ".el-textarea__inner"
+      );
+      inputElements.forEach((input) => {
+        input.placeholder = "";
       });
-    },
-    sendBack() {
-      // this.$router.go(-1);
-      this.$router.push({ name: "OfficialAccount", params: this.queryData });
-    },
-  },
-};
+      textareaInputElements.forEach((input) => {
+        input.placeholder = "";
+      });
+    });
+  } else if (props.pageType == "change") {
+    getInfo(props.id);
+    disabled.value = false;
+  }
+});
 </script>