From 8808d415c48b12baacf98442b48d125d62bd2a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Tue, 23 Jan 2024 14:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9F=BA=E7=A1=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/admin/index.vue                   |  80 +----
 src/views/govern/manage/basic/dictionary.vue  |  50 +--
 .../govern/manage/basic/popupDictionary.vue   | 304 +++++++++---------
 .../govern/manage/basic/popupVersion.vue      | 113 ++++---
 src/views/govern/manage/basic/template.vue    |  48 +--
 src/views/govern/manage/basic/version.vue     |  35 +-
 6 files changed, 290 insertions(+), 340 deletions(-)

diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue
index 1e52423..4982b30 100644
--- a/src/layouts/admin/index.vue
+++ b/src/layouts/admin/index.vue
@@ -58,84 +58,6 @@ const init = async () => {
      * 后台初始化请求，获取站点配置，动态路由等信息
      */
     getRouteMenu().then((res: any) => {
-        const arr = [
-            {
-                id: 2,
-                pid: 0,
-                type: 'menu_dir',
-                title: '权限管理',
-                name: 'auth',
-                path: 'auth',
-                icon: 'fa-solid fa-layer-group',
-                menu_type: null,
-                url: '',
-                component: '',
-                keepalive: 0,
-                extend: 'none',
-                children: [
-                    {
-                        id: 3,
-                        pid: 2,
-                        type: 'menu',
-                        title: '审核管理',
-                        name: 'auth/audit',
-                        path: 'auth/audit',
-                        icon: 'el-icon-Avatar',
-                        menu_type: 'tab',
-                        url: '',
-                        component: '/src/views/auth/audit/index.vue',
-                        keepalive: 'auth/audit',
-                        extend: 'none',
-                        children: []
-                    },
-                    {
-                        id: 3,
-                        pid: 2,
-                        type: 'menu',
-                        title: '用户管理',
-                        name: 'auth/userList',
-                        path: 'auth/userList',
-                        icon: 'el-icon-Avatar',
-                        menu_type: 'tab',
-                        url: '',
-                        component: '/src/views/auth/userList/index.vue',
-                        keepalive: 'auth/userList',
-                        extend: 'none',
-                        children: []
-                    },
-                    {
-                        id: 3,
-                        pid: 2,
-                        type: 'menu',
-                        title: '角色管理',
-                        name: 'auth/role',
-                        path: 'auth/role',
-                        icon: 'el-icon-Avatar',
-                        menu_type: 'tab',
-                        url: '',
-                        component: '/src/views/auth/role/index.vue',
-                        keepalive: 'auth/role',
-                        extend: 'none',
-                        children: []
-                    },
-                    {
-                        id: 13,
-                        pid: 2,
-                        type: 'menu',
-                        title: '菜单规则管理',
-                        name: 'auth/menu',
-                        path: 'auth/menu',
-                        icon: 'el-icon-Menu',
-                        menu_type: 'tab',
-                        url: '',
-                        component: '/src/views/auth/menu/index.vue',
-                        keepalive: 'auth/menu',
-                        extend: 'none',
-                        children: []
-                    }
-                ]
-            }
-        ]
         const handlerMenu = (data: any) => {
             data.forEach((item: any) => {
                 item.routePath = item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
@@ -151,7 +73,7 @@ const init = async () => {
             })
         }
         handlerMenu(res.data)
-        handleAdminRoute([...res.data, ...arr])
+        handleAdminRoute(res.data)
         // 预跳转到上次路径
         if (route.params.to) {
             const lastRoute = JSON.parse(route.params.to as string)
diff --git a/src/views/govern/manage/basic/dictionary.vue b/src/views/govern/manage/basic/dictionary.vue
index f54e0a0..7bc6a44 100644
--- a/src/views/govern/manage/basic/dictionary.vue
+++ b/src/views/govern/manage/basic/dictionary.vue
@@ -1,55 +1,58 @@
 <template>
-    <div class='default-main'>
+    <div class="default-main">
         <TableHeader>
             <template #select>
-                <el-form-item label='数据分类'>
+                <el-form-item label="数据分类">
                     <el-select
-                        v-model='tableStore.table.params.dataType'
+                        v-model="tableStore.table.params.dataType"
                         multiple
                         filterable
                         collapse-tags
                         clearable
-                        placeholder='请选择数据分类'
+                        placeholder="请选择数据分类"
                     >
                         <el-option
-                            v-for='item in DataTypeSelect'
-                            :key='item.id'
-                            :label='item.name'
-                            :value='item.id'
+                            v-for="item in DataTypeSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='数据存储'>
+                <el-form-item label="数据存储">
                     <el-select
-                        v-model='tableStore.table.params.classId'
+                        v-model="tableStore.table.params.classId"
                         multiple
                         filterable
                         collapse-tags
                         clearable
-                        placeholder='请选择数据存储'
+                        placeholder="请选择数据存储"
                     >
                         <el-option
-                            v-for='item in DataSelect'
-                            :key='item.id'
-                            :label='item.name'
-                            :value='item.id'
+                            v-for="item in DataSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='过滤筛选:'>
-                    <el-input v-model='tableStore.table.params.searchValue' placeholder='数据名称、别名、名称'
-                              clearable></el-input>
+                <el-form-item label="过滤筛选:">
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        placeholder="数据名称、别名、名称"
+                        clearable
+                    ></el-input>
                 </el-form-item>
             </template>
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增字典</el-button>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
-        <PopupDictionary ref='popupDictionary'></PopupDictionary>
+        <Table ref="tableRef" />
+        <PopupDictionary ref="popupDictionary"></PopupDictionary>
     </div>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -112,9 +115,8 @@ const tableStore = new TableStore({
                         title: '确定删除吗？'
                     },
                     click: row => {
-                        delCsDictData(row.id).then((res) => {
-                            console.warn(res)
-                            ElMessage.success(res.message)
+                        delCsDictData(row.id).then(res => {
+                            ElMessage.success('删除成功')
                             tableStore.index()
                         })
                     }
diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue
index 720e744..534c080 100644
--- a/src/views/govern/manage/basic/popupDictionary.vue
+++ b/src/views/govern/manage/basic/popupDictionary.vue
@@ -1,140 +1,180 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <div style='padding-left: 50px'>
-                <el-divider content-position='center'>基础数据</el-divider>
+            <div style="padding-left: 50px">
+                <el-divider content-position="center">基础数据</el-divider>
             </div>
-            <el-form :inline='true' :model='form' label-width='140px' ref='formRef' :rules='rules'>
-                <el-form-item label='数据分类:' prop='dataType'>
-                    <el-select v-model='form.dataType' filterable clearable placeholder='请选择数据分类'>
-                        <el-option v-for='item in DataTypeSelect' :key='item.id' :label='item.name'
-                                   :value='item.id'>
-                        </el-option>
+            <el-form :inline="true" :model="form" label-width="140px" ref="formRef" :rules="rules">
+                <el-form-item label="数据分类:" prop="dataType">
+                    <el-select v-model="form.dataType" filterable clearable placeholder="请选择数据分类">
+                        <el-option
+                            v-for="item in DataTypeSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='数据名称:' prop='name'>
-                    <el-input v-model='form.name' autocomplete='off' placeholder='请输入数据名称'></el-input>
+                <el-form-item label="数据名称:" prop="name">
+                    <el-input v-model="form.name" autocomplete="off" placeholder="请输入数据名称"></el-input>
                 </el-form-item>
-                <el-form-item label='别名:' prop='otherName'>
-                    <el-input v-model='form.otherName' autocomplete='off' placeholder='请输入别名'></el-input>
+                <el-form-item label="别名:" prop="otherName">
+                    <el-input v-model="form.otherName" autocomplete="off" placeholder="请输入别名"></el-input>
                 </el-form-item>
-                <el-form-item label='展示名称:' prop='showName'>
-                    <el-input v-model='form.showName' autocomplete='off' placeholder='请输入展示名称'></el-input>
+                <el-form-item label="展示名称:" prop="showName">
+                    <el-input v-model="form.showName" autocomplete="off" placeholder="请输入展示名称"></el-input>
                 </el-form-item>
-                <el-form-item label='相别:' prop='phase'>
-                    <el-select v-model='form.phase' filterable clearable placeholder='请选择相别'>
-                        <el-option v-for='item in phaseSelect' :key='item.id' :label='item.name'
-                                   :value='item.id'></el-option>
+                <el-form-item label="相别:" prop="phase">
+                    <el-select v-model="form.phase" filterable clearable placeholder="请选择相别">
+                        <el-option
+                            v-for="item in phaseSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='单位:' prop='unit'>
-                    <el-input v-model='form.unit' autocomplete='off' placeholder='请输入单位'></el-input>
+                <el-form-item label="单位:" prop="unit">
+                    <el-input v-model="form.unit" autocomplete="off" placeholder="请输入单位"></el-input>
                 </el-form-item>
-                <el-form-item label='基础数据类型:' prop='type'>
-                    <el-input v-model='form.type' autocomplete='off' placeholder='请输入基础数据类型'></el-input>
+                <el-form-item label="基础数据类型:" prop="type">
+                    <el-input v-model="form.type" autocomplete="off" placeholder="请输入基础数据类型"></el-input>
                 </el-form-item>
-                <el-form-item label='开始结束次数:' prop='harmStart'>
-                    <el-slider v-model='form.harm' range show-stops :max='50' />
+                <el-form-item label="开始结束次数:" prop="harmStart">
+                    <el-slider v-model="form.harm" range show-stops :max="50" />
                 </el-form-item>
-                <el-form-item label='统计方法:' prop='statMethod'>
-                    <el-select v-model='form.statMethod' multiple filterable clearable placeholder='请选择统计方法'>
-                        <el-option v-for='item in StatMethodSelect' :key='item.id' :label='item.name'
-                                   :value='item.id'>
-                        </el-option>
+                <el-form-item label="统计方法:" prop="statMethod">
+                    <el-select v-model="form.statMethod" multiple filterable clearable placeholder="请选择统计方法">
+                        <el-option
+                            v-for="item in StatMethodSelect"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='数据存储:' prop='classId'>
-                    <el-select v-model='form.classId' filterable clearable placeholder='请选择数据存储'>
-                        <el-option v-for='item in DataSelect' :key='item.code' :label='item.name'
-                                   :value='item.id'></el-option>
+                <el-form-item label="数据存储:" prop="classId">
+                    <el-select v-model="form.classId" filterable clearable placeholder="请选择数据存储">
+                        <el-option
+                            v-for="item in DataSelect"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='报表数据来源:' prop='resourcesId'>
-                    <el-select v-model='form.resourcesId' filterable clearable placeholder='请选择报表数据来源'>
-                        <el-option v-for='item in ResourcesIdSelect' :key='item.code' :label='item.name'
-                                   :value='item.id'>
-                        </el-option>
+                <el-form-item label="报表数据来源:" prop="resourcesId">
+                    <el-select v-model="form.resourcesId" filterable clearable placeholder="请选择报表数据来源">
+                        <el-option
+                            v-for="item in ResourcesIdSelect"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='序号:' prop='sort'>
-                    <el-input type='number' v-model='form.sort' autocomplete='off' placeholder='请输入序号'></el-input>
+                <el-form-item label="序号:" prop="sort">
+                    <el-input type="number" v-model="form.sort" autocomplete="off" placeholder="请输入序号"></el-input>
                 </el-form-item>
-                <el-form-item label='限值名称:' prop='limitName'>
-                    <el-input type='text' v-model='form.limitName' autocomplete='off'
-                              placeholder='请输入限值名称'></el-input>
+                <el-form-item label="限值名称:" prop="limitName">
+                    <el-input
+                        type="text"
+                        v-model="form.limitName"
+                        autocomplete="off"
+                        placeholder="请输入限值名称"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='限值表名:' prop='limitTable'>
-                    <el-input type='text' v-model='form.limitTable' autocomplete='off'
-                              placeholder='请输入限值表名'></el-input>
+                <el-form-item label="限值表名:" prop="limitTable">
+                    <el-input
+                        type="text"
+                        v-model="form.limitTable"
+                        autocomplete="off"
+                        placeholder="请输入限值表名"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='超标判断方式:' prop='formula'>
-                    <el-select v-model='form.formula' filterable clearable placeholder='请选择超标判断方式'>
-                        <el-option v-for='item in FormulaSelect' :key='item.code' :label='item.name'
-                                   :value='item.id'>
-                        </el-option>
+                <el-form-item label="超标判断方式:" prop="formula">
+                    <el-select v-model="form.formula" filterable clearable placeholder="请选择超标判断方式">
+                        <el-option
+                            v-for="item in FormulaSelect"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
-            <div style='padding-left: 50px'>
-                <el-divider content-position='center'>拓展数据</el-divider>
+            <div style="padding-left: 50px">
+                <el-divider content-position="center">拓展数据</el-divider>
             </div>
-            <el-form :inline='true' :model='form' label-width='140px' ref='formRef2' :rules='rules'>
-                <el-form-item label='参数缺省值:' prop='defaultValue'>
-                    <el-input v-model='form.defaultValue' autocomplete='off' placeholder='请输入参数缺省值'></el-input>
+            <el-form :inline="true" :model="form" label-width="140px" ref="formRef2" :rules="rules">
+                <el-form-item label="参数缺省值:" prop="defaultValue">
+                    <el-input v-model="form.defaultValue" autocomplete="off" placeholder="请输入参数缺省值"></el-input>
                 </el-form-item>
-                <el-form-item label='事件类别:' prop='eventType'>
-                    <el-input v-model='form.eventType' autocomplete='off' placeholder='请输入事件类别'></el-input>
+                <el-form-item label="事件类别:" prop="eventType">
+                    <el-input v-model="form.eventType" autocomplete="off" placeholder="请输入事件类别"></el-input>
                 </el-form-item>
 
-                <el-form-item label='设置最大值:' prop='maxNum'>
-                    <el-input type='number' v-model='form.maxNum' autocomplete='off'
-                              placeholder='请输入设置最大值'></el-input>
+                <el-form-item label="设置最大值:" prop="maxNum">
+                    <el-input
+                        type="number"
+                        v-model="form.maxNum"
+                        autocomplete="off"
+                        placeholder="请输入设置最大值"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='设置最小值:' prop='minNum'>
-                    <el-input type='number' v-model='form.minNum' autocomplete='off'
-                              placeholder='请输入设置最小值'></el-input>
+                <el-form-item label="设置最小值:" prop="minNum">
+                    <el-input
+                        type="number"
+                        v-model="form.minNum"
+                        autocomplete="off"
+                        placeholder="请输入设置最小值"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='枚举序列:' prop='setValue'>
-                    <el-input v-model='form.setValue' autocomplete='off' placeholder='请输入枚举序列'></el-input>
+                <el-form-item label="枚举序列:" prop="setValue">
+                    <el-input v-model="form.setValue" autocomplete="off" placeholder="请输入枚举序列"></el-input>
                 </el-form-item>
-                <el-form-item label='字符串长度上限:' prop='strlen'>
-                    <el-input type='number' v-model='form.strlen' autocomplete='off'
-                              placeholder='请输入字符串长度上限'></el-input>
+                <el-form-item label="字符串长度上限:" prop="strlen">
+                    <el-input
+                        type="number"
+                        v-model="form.strlen"
+                        autocomplete="off"
+                        placeholder="请输入字符串长度上限"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='上送规则:' prop='tranRule'>
-                    <el-input v-model='form.tranRule' autocomplete='off' placeholder='请输入上送规则'></el-input>
+                <el-form-item label="上送规则:" prop="tranRule">
+                    <el-input v-model="form.tranRule" autocomplete="off" placeholder="请输入上送规则"></el-input>
                 </el-form-item>
-                <el-form-item label='是否可远程控制:' prop='ctlSts'>
-                    <el-radio v-model='form.ctlSts' :label='1'>是</el-radio>
-                    <el-radio v-model='form.ctlSts' :label='0'>否</el-radio>
+                <el-form-item label="是否可远程控制:" prop="ctlSts">
+                    <el-radio v-model="form.ctlSts" :label="1">是</el-radio>
+                    <el-radio v-model="form.ctlSts" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label='是否需遥控校验:' prop='curSts'>
-                    <el-radio v-model='form.curSts' :label='1'>是</el-radio>
-                    <el-radio v-model='form.curSts' :label='0'>否</el-radio>
+                <el-form-item label="是否需遥控校验:" prop="curSts">
+                    <el-radio v-model="form.curSts" :label="1">是</el-radio>
+                    <el-radio v-model="form.curSts" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label='是否存储:' prop='storeFlag'>
-                    <el-radio v-model='form.storeFlag' :label='1'>是</el-radio>
-                    <el-radio v-model='form.storeFlag' :label='0'>否</el-radio>
+                <el-form-item label="是否存储:" prop="storeFlag">
+                    <el-radio v-model="form.storeFlag" :label="1">是</el-radio>
+                    <el-radio v-model="form.storeFlag" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label='是否加密:' prop='storeFlag'>
-                    <el-radio v-model='form.storeFlag' :label='1'>是</el-radio>
-                    <el-radio v-model='form.storeFlag' :label='0'>否</el-radio>
+                <el-form-item label="是否加密:" prop="storeFlag">
+                    <el-radio v-model="form.storeFlag" :label="1">是</el-radio>
+                    <el-radio v-model="form.storeFlag" :label="0">否</el-radio>
                 </el-form-item>
-                <el-form-item label='数据是否上送:' prop='tranFlag'>
-                    <el-radio v-model='form.tranFlag' :label='1'>是</el-radio>
-                    <el-radio v-model='form.tranFlag' :label='0'>否</el-radio>
+                <el-form-item label="数据是否上送:" prop="tranFlag">
+                    <el-radio v-model="form.tranFlag" :label="1">是</el-radio>
+                    <el-radio v-model="form.tranFlag" :label="0">否</el-radio>
                 </el-form-item>
             </el-form>
         </el-scrollbar>
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
@@ -186,7 +226,7 @@ const StatMethodSelect = [
     }
 ]
 const tableStore = inject('tableStore') as TableStore
-const form = reactive({
+const form = reactive<any>({
     id: null,
     classId: null,
     ctlSts: null,
@@ -223,70 +263,30 @@ const rules = {
         { required: true, message: '请输入数据分类', trigger: 'blur' },
         { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
     ],
-    name: [
-        { required: true, message: '请输入数据名称', trigger: 'blur' }
-    ],
-    otherName: [
-        { required: true, message: '请输入别名', trigger: 'blur' }
-    ],
-    showName: [
-        { required: true, message: '请输入展示名称', trigger: 'blur' }
-    ],
-    phase: [
-        { type: 'array', required: true, message: '请选择相别', trigger: 'blur' }
-    ],
-    unit: [
-        { required: true, message: '请输入单位', trigger: 'blur' }
-    ],
-    type: [
-        { required: true, message: '请输入基础数据类型', trigger: 'blur' }
-    ],
-    harmStart: [
-        { required: true, message: '请填写开始结束次数', trigger: 'blur' }
-    ],
-    statMethod: [
-        { required: true, message: '请选择统计方法', trigger: 'blur' }
-    ],
-    classId: [
-        { required: true, message: '请选择数据存储', trigger: 'blur' }
-    ],
-    resourcesId: [
-        { required: true, message: '请选择报表数据来源', trigger: 'blur' }
-    ],
-    sort: [
-        { required: true, message: '请填写序号', trigger: 'blur' }
-    ],
+    name: [{ required: true, message: '请输入数据名称', trigger: 'blur' }],
+    otherName: [{ required: true, message: '请输入别名', trigger: 'blur' }],
+    showName: [{ required: true, message: '请输入展示名称', trigger: 'blur' }],
+    phase: [{ type: 'array', required: true, message: '请选择相别', trigger: 'blur' }],
+    unit: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+    type: [{ required: true, message: '请输入基础数据类型', trigger: 'blur' }],
+    harmStart: [{ required: true, message: '请填写开始结束次数', trigger: 'blur' }],
+    statMethod: [{ required: true, message: '请选择统计方法', trigger: 'blur' }],
+    classId: [{ required: true, message: '请选择数据存储', trigger: 'blur' }],
+    resourcesId: [{ required: true, message: '请选择报表数据来源', trigger: 'blur' }],
+    sort: [{ required: true, message: '请填写序号', trigger: 'blur' }],
     defaultValue: [
         { required: true, message: '请输入参数缺省值', trigger: 'blur' },
         { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
     ],
-    eventType: [
-        { required: true, message: '请输入事件类别', trigger: 'blur' }
-    ],
-    maxNum: [
-        { type: 'date', required: true, message: '请设置最大值', trigger: 'blur' }
-    ],
-    minNum: [
-        { type: 'date', required: true, message: '请设置最小值', trigger: 'blur' }
-    ],
-    setValue: [
-        { required: true, message: '请输入枚举序列', trigger: 'blur' }
-    ],
-    strlen: [
-        { required: true, message: '请输入字符串长度上限', trigger: 'blur' }
-    ],
-    tranRule: [
-        { required: true, message: '请填写上送规则', trigger: 'blur' }
-    ],
-    ctlSts: [
-        { required: true, message: '请选择是否可远程控制', trigger: 'blur' }
-    ],
-    storeFlag: [
-        { required: true, message: '请选择是否需遥控校验', trigger: 'blur' }
-    ],
-    tranFlag: [
-        { required: true, message: '请选择是否存储||是否加密', trigger: 'blur' }
-    ]
+    eventType: [{ required: true, message: '请输入事件类别', trigger: 'blur' }],
+    maxNum: [{ type: 'date', required: true, message: '请设置最大值', trigger: 'blur' }],
+    minNum: [{ type: 'date', required: true, message: '请设置最小值', trigger: 'blur' }],
+    setValue: [{ required: true, message: '请输入枚举序列', trigger: 'blur' }],
+    strlen: [{ required: true, message: '请输入字符串长度上限', trigger: 'blur' }],
+    tranRule: [{ required: true, message: '请填写上送规则', trigger: 'blur' }],
+    ctlSts: [{ required: true, message: '请选择是否可远程控制', trigger: 'blur' }],
+    storeFlag: [{ required: true, message: '请选择是否需遥控校验', trigger: 'blur' }],
+    tranFlag: [{ required: true, message: '请选择是否存储||是否加密', trigger: 'blur' }]
 }
 const dialogVisible = ref(false)
 const title = ref('')
diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue
index 918eec9..065a611 100644
--- a/src/views/govern/manage/basic/popupVersion.vue
+++ b/src/views/govern/manage/basic/popupVersion.vue
@@ -1,70 +1,80 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline='true' :model='form' label-width='120px' ref='formRef' :rules='rules'>
-                <el-form-item label='装置类型:' prop='type'>
-                    <el-select v-model='form.type' placeholder='请选择' style='width: 100%' @change='typeChange'>
-                        <el-option v-for='item in TypeOptions' :key='item.id' :label='item.name'
-                                   :value='item.id'></el-option>
+            <el-form :inline="true" :model="form" label-width="120px" ref="formRef" :rules="rules">
+                <el-form-item label="装置类型:" prop="type">
+                    <el-select v-model="form.type" placeholder="请选择" style="width: 100%" @change="typeChange">
+                        <el-option
+                            v-for="item in TypeOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='装置型号:' prop='devType'>
-                    <el-select v-model='form.devType' placeholder='请选择' style='width: 100%' @change='devTypeChange'>
-                        <el-option v-for='item in DevTypeOptions' :key='item.id' :label='item.name'
-                                   :value='item.id'></el-option>
+                <el-form-item label="装置型号:" prop="devType">
+                    <el-select v-model="form.devType" placeholder="请选择" style="width: 100%" @change="devTypeChange">
+                        <el-option
+                            v-for="item in DevTypeOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='版本号:' prop='versionNo'>
-                    <el-input v-model='form.versionNo' autocomplete='off' placeholder='请输入'></el-input>
+                <el-form-item label="版本号:" prop="versionNo">
+                    <el-input v-model="form.versionNo" autocomplete="off" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label='版本类型:' prop='versionType'>
-                    <el-input v-model='form.versionType' autocomplete='off'
-                              placeholder='填写特殊类型(不填默认通用类型)'></el-input>
+                <el-form-item label="版本类型:" prop="versionType">
+                    <el-input
+                        v-model="form.versionType"
+                        autocomplete="off"
+                        placeholder="填写特殊类型(不填默认通用类型)"
+                    ></el-input>
                 </el-form-item>
-                <el-form-item label='版本协议:' prop='versionAgreement'>
-                    <el-input v-model='form.versionAgreement' autocomplete='off' placeholder='请输入'></el-input>
+                <el-form-item label="版本协议:" prop="versionAgreement">
+                    <el-input v-model="form.versionAgreement" autocomplete="off" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label='版本日期:' prop='versionDate'>
+                <el-form-item label="版本日期:" prop="versionDate">
                     <el-date-picker
-                        v-model='form.versionDate'
-                        type='date'
-                        value-format='yyyy-MM-dd'
-                        placeholder='选择日期时间'
-                        style='width: 100%'
-                    >
-                    </el-date-picker>
+                        v-model="form.versionDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择日期时间"
+                        style="width: 100%"
+                    ></el-date-picker>
                 </el-form-item>
-                <el-form-item label='描述:' prop='description'>
-                    <el-input v-model='form.description' autocomplete='off' placeholder='请输入'></el-input>
+                <el-form-item label="描述:" prop="description">
+                    <el-input v-model="form.description" autocomplete="off" placeholder="请输入"></el-input>
                 </el-form-item>
-                <el-form-item label='CRC校验:' prop='crcInfo'>
-                    <el-input v-model='form.crcInfo' autocomplete='off' placeholder='请输入'></el-input>
+                <el-form-item label="CRC校验:" prop="crcInfo">
+                    <el-input v-model="form.crcInfo" autocomplete="off" placeholder="请输入"></el-input>
                 </el-form-item>
             </el-form>
-            <el-form :inline='true' :model='form' label-width='120px' class='mt10'>
-                <el-form-item label='升级文件:' prop='file'>
+            <el-form :inline="true" :model="form" label-width="120px" class="mt10">
+                <el-form-item label="升级文件:" prop="file">
                     <el-upload
-                        :limit='1'
-                        :auto-upload='false'
-                        :on-change='fileChange'
-                        :on-exceed='fileExceed'
-                        :file-list='fileList'
+                        :limit="1"
+                        :auto-upload="false"
+                        :on-change="fileChange"
+                        :on-exceed="fileExceed"
+                        :file-list="fileList"
                     >
-                        <el-button size='small' type='primary'>点击上传</el-button>
+                        <el-button size="small" type="primary">点击上传</el-button>
                     </el-upload>
                 </el-form-item>
             </el-form>
         </el-scrollbar>
 
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
@@ -79,7 +89,7 @@ const DevTypeOptions = ref()
 const fileList = ref()
 const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
-const form = reactive({
+const form = reactive<any>({
     devType: null,
     devTypeName: null,
     versionAgreement: null,
@@ -107,7 +117,7 @@ const typeChange = () => {
     console.log(form.type)
     form.devType = null
     form.devTypeName = null
-    queryCsDictTree(form.type).then((res) => {
+    queryCsDictTree(form.type).then(res => {
         DevTypeOptions.value = res.data
     })
 }
@@ -134,20 +144,22 @@ const open = (text: string, data?: anyObj) => {
         for (let key in form) {
             form[key] = data[key]
         }
-        fileList.value = [{
-            name: data.filePath,
-            url: data.filePath
-        }]
+        fileList.value = [
+            {
+                name: data.filePath,
+                url: data.filePath
+            }
+        ]
     } else {
         for (let key in form) {
             form[key] = null
         }
     }
-    queryByCode('Direct_Connected_Device').then((res) => {
-        queryCsDictTree(res.data.id).then((res) => {
+    queryByCode('Direct_Connected_Device').then(res => {
+        queryCsDictTree(res.data.id).then(res => {
             TypeOptions.value = res.data
         })
-        queryByid(res.data.id).then((res) => {
+        queryByid(res.data.id).then(res => {
             DevTypeAllOptions.value = res.data
         })
     })
@@ -171,7 +183,6 @@ const submit = () => {
             dialogVisible.value = false
         }
     })
-
 }
 
 defineExpose({ open })
diff --git a/src/views/govern/manage/basic/template.vue b/src/views/govern/manage/basic/template.vue
index 5dfc740..4d17422 100644
--- a/src/views/govern/manage/basic/template.vue
+++ b/src/views/govern/manage/basic/template.vue
@@ -1,34 +1,42 @@
 <template>
-    <div class='default-main'>
-        <TableHeader ref='tableHeaderRef'>
+    <div class="default-main">
+        <TableHeader ref="tableHeaderRef">
             <template #select>
-                <el-form-item label='模版名称'>
-                    <el-input v-model='tableStore.table.params.name' clearable placeholder='请输入名称'></el-input>
+                <el-form-item label="模版名称">
+                    <el-input v-model="tableStore.table.params.name" clearable placeholder="请输入名称"></el-input>
                 </el-form-item>
-                <el-form-item label='装置型号'>
-                    <el-select v-model='tableStore.table.params.devType' placeholder='请选择' style='width: 100%'
-                               clearable>
-                        <el-option v-for='item in DevTypeOptions' :key='item.id' :label='item.name'
-                                   :value='item.id'></el-option>
+                <el-form-item label="装置型号">
+                    <el-select
+                        v-model="tableStore.table.params.devType"
+                        placeholder="请选择"
+                        style="width: 100%"
+                        clearable
+                    >
+                        <el-option
+                            v-for="item in DevTypeOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
                 <el-upload
-                    action=''
-                    class='upload-demo'
-                    :show-file-list='false'
-                    :auto-upload='false'
-                    :on-change='chooseFile'
+                    action=""
+                    class="upload-demo"
+                    :show-file-list="false"
+                    :auto-upload="false"
+                    :on-change="chooseFile"
                 >
-                    <el-button :icon='Plus' type='primary' class='ml10'>新增模版</el-button>
+                    <el-button :icon="Plus" type="primary" class="ml10">新增模版</el-button>
                 </el-upload>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
+        <Table ref="tableRef" />
     </div>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -44,8 +52,8 @@ defineOptions({
 })
 const DevTypeOptions = ref()
 const tableHeaderRef = ref()
-queryByCode('Direct_Connected_Device').then((res) => {
-    queryByid(res.data.id).then((res) => {
+queryByCode('Direct_Connected_Device').then(res => {
+    queryByid(res.data.id).then(res => {
         DevTypeOptions.value = res.data
     })
 })
@@ -87,7 +95,7 @@ const tableStore = new TableStore({
                 }
             ]
         }
-    ],
+    ]
 })
 tableStore.table.params.devType = ''
 tableStore.table.params.name = ''
diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue
index 20a829f..c0a4ca1 100644
--- a/src/views/govern/manage/basic/version.vue
+++ b/src/views/govern/manage/basic/version.vue
@@ -1,24 +1,32 @@
 <template>
-    <div class='default-main'>
-        <TableHeader ref='tableHeaderRef'>
+    <div class="default-main">
+        <TableHeader ref="tableHeaderRef">
             <template #select>
-                <el-form-item label='装置型号:'>
-                    <el-select v-model='tableStore.table.params.devType' placeholder='请选择' style='width: 100%'
-                               clearable>
-                        <el-option v-for='item in DevTypeOptions' :key='item.id' :label='item.name'
-                                   :value='item.id'></el-option>
+                <el-form-item label="装置型号:">
+                    <el-select
+                        v-model="tableStore.table.params.devType"
+                        placeholder="请选择"
+                        style="width: 100%"
+                        clearable
+                    >
+                        <el-option
+                            v-for="item in DevTypeOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button :icon='Plus' type='primary' @click='addMenu' class='ml10'>新增版本</el-button>
+                <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增版本</el-button>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
-        <PopupVersion ref='popupVersionRef'></PopupVersion>
+        <Table ref="tableRef" />
+        <PopupVersion ref="popupVersionRef"></PopupVersion>
     </div>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -38,10 +46,9 @@ const popupVersionRef = ref()
 const dictData = useDictData()
 const DevTypeOptions = ref()
 const tableHeaderRef = ref()
-queryByCode('Direct_Connected_Device').then((res) => {
+queryByCode('Direct_Connected_Device').then(res => {
     console.log(res)
-    queryByid(res.data.id).then((res) => {
-        console.log(res)
+    queryByid(res.data.id).then(res => {
         DevTypeOptions.value = res.data
     })
 })