8
0
duy há 9 meses atrás
pai
commit
8f68a2fc15

+ 9 - 0
src/api/modules/desk/meta.js

@@ -16,6 +16,7 @@ export default {
             params: form,
         });
     },
+    //修改
     async metadataUpdate(form) {
         return HcApi({
             url: "/api/blade-business/metadata/classification/submit",
@@ -23,4 +24,12 @@ export default {
             data: form,
         });
     },
+    //删除
+    async remove(form) {
+        return HcApi({
+            url: "/api/blade-business/metadata/remove",
+            method: "post",
+            params: form,
+        });
+    },
 };

+ 196 - 188
src/views/desk/archive.vue

@@ -52,234 +52,242 @@
                 <rightConfig></rightConfig>
             </hc-card>
         </hc-page-split>
-    </div>
 
-    <!-- 新增/修改 -->
-    <hc-dialog
-        v-model="isAddEditShow"
-        widths="24rem"
-        is-footer-center
-        :title="formModel.id ? '修改' : '新增'"
-        @close="addEditClose"
-    >
-        <el-form
-            ref="formRef"
-            :model="formModel"
-            :rules="formRules"
-            label-position="top"
-            label-width="auto"
+        <!-- 新增/修改 -->
+        <hc-dialog
+            v-model="isAddEditShow"
+            widths="24rem"
+            is-footer-center
+            :title="formModel.id ? '修改' : '新增'"
+            @close="addEditClose"
         >
-            <el-form-item label="节点名称:" prop="nodeName">
-                <el-input
-                    v-model="formModel.nodeName"
-                    clearable
-                    placeholder="请输入节点名称"
-                />
-            </el-form-item>
-
-            <el-form-item label="岗位类型" prop="postType">
-                <el-select
-                    v-model="formModel.postType"
-                    filterable
-                    clearable
-                    block
-                    placeholder="请选择岗位类型"
-                >
-                    <el-option
-                        v-for="item in jobTypeList"
-                        :key="item.id"
-                        :label="item.title"
-                        :value="item.id"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="节点类型:" prop="nodeType">
-                <el-select
-                    v-model="formModel.nodeType"
-                    filterable
-                    clearable
-                    block
-                    placeholder="请选择节点类型"
-                >
-                    <el-option
-                        v-for="item in nodeTypeList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
+            <el-form
+                ref="formRef"
+                :model="formModel"
+                :rules="formRules"
+                label-position="top"
+                label-width="auto"
+            >
+                <el-form-item label="节点名称:" prop="nodeName">
+                    <el-input
+                        v-model="formModel.nodeName"
+                        clearable
+                        placeholder="请输入节点名称"
                     />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="工程类型" prop="projectType">
-                <el-select
-                    v-model="formModel.projectType"
-                    placeholder="工程类型"
-                >
-                    <el-option
-                        v-for="item in projectTypeList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
+                </el-form-item>
 
-            <el-form-item
-                label="储存类型"
-                prop="storageType"
-                v-if="formModel.nodeType == 1"
-            >
-                <el-select v-model="formModel.storageType" placeholder="请选择">
-                    <el-option
-                        v-for="item in storageTypeList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <template v-if="formModel.nodeType == 2">
-                <el-form-item label="是否存储节点" prop="isStorageNode">
-                    <el-select v-model="formModel.isStorageNode">
+                <el-form-item label="岗位类型" prop="postType">
+                    <el-select
+                        v-model="formModel.postType"
+                        filterable
+                        clearable
+                        block
+                        placeholder="请选择岗位类型"
+                    >
                         <el-option
-                            v-for="item in storageNodeList"
+                            v-for="item in jobTypeList"
+                            :key="item.id"
+                            :label="item.title"
+                            :value="item.id"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="节点类型:" prop="nodeType">
+                    <el-select
+                        v-model="formModel.nodeType"
+                        filterable
+                        clearable
+                        block
+                        placeholder="请选择节点类型"
+                    >
+                        <el-option
+                            v-for="item in nodeTypeList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="工程类型" prop="projectType">
+                    <el-select
+                        v-model="formModel.projectType"
+                        placeholder="工程类型"
+                    >
+                        <el-option
+                            v-for="item in projectTypeList"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <template v-if="formModel.isStorageNode == 1">
-                    <el-form-item label="储存类型" prop="storageType">
-                        <el-select
-                            v-model="formModel.storageType"
-                            placeholder="请选择"
-                        >
-                            <el-option
-                                v-for="item in storageTypeList"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
 
-                    <el-form-item label="是否接口节点" prop="isInterfaceNode">
-                        <el-select v-model="formModel.isInterfaceNode">
+                <el-form-item
+                    label="储存类型"
+                    prop="storageType"
+                    v-if="formModel.nodeType == 1"
+                >
+                    <el-select
+                        v-model="formModel.storageType"
+                        placeholder="请选择"
+                    >
+                        <el-option
+                            v-for="item in storageTypeList"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <template v-if="formModel.nodeType == 2">
+                    <el-form-item label="是否存储节点" prop="isStorageNode">
+                        <el-select v-model="formModel.isStorageNode">
                             <el-option
-                                v-for="item in interfaceNodeList"
+                                v-for="item in storageNodeList"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value"
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <template v-if="formModel.isInterfaceNode == 1">
-                        <el-form-item label="选择接口类型">
-                            <el-select v-model="formModel.interfaceType">
+                    <template v-if="formModel.isStorageNode == 1">
+                        <el-form-item label="储存类型" prop="storageType">
+                            <el-select
+                                v-model="formModel.storageType"
+                                placeholder="请选择"
+                            >
                                 <el-option
-                                    v-for="item in interfaceTypeList"
+                                    v-for="item in storageTypeList"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
                                 ></el-option>
                             </el-select>
                         </el-form-item>
+
+                        <el-form-item
+                            label="是否接口节点"
+                            prop="isInterfaceNode"
+                        >
+                            <el-select v-model="formModel.isInterfaceNode">
+                                <el-option
+                                    v-for="item in interfaceNodeList"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <template v-if="formModel.isInterfaceNode == 1">
+                            <el-form-item label="选择接口类型">
+                                <el-select v-model="formModel.interfaceType">
+                                    <el-option
+                                        v-for="item in interfaceTypeList"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </template>
                     </template>
                 </template>
-            </template>
-            <!-- 数字化文件上传 -->
-            <template v-if="formModel.nodeType == 1">
-                <el-form-item label="关联类型" prop="associationType">
-                    <el-select
-                        v-model="formModel.associationType"
-                        placeholder="请选择"
-                    >
-                        <el-option
-                            v-for="item in associationTypeList"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <template v-if="formModel.associationType == 1">
-                    <el-form-item label="内业资料类型" prop="majorDataType">
-                        <el-checkbox-group v-model="formModel.majorDataType">
-                            <el-checkbox
-                                v-for="item in majorDataTypeList"
-                                :label="item.label"
-                                :value="item.value"
-                            ></el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                    <el-form-item label="显示层级" prop="displayHierarchy">
+                <!-- 数字化文件上传 -->
+                <template v-if="formModel.nodeType == 1">
+                    <el-form-item label="关联类型" prop="associationType">
                         <el-select
-                            v-model="formModel.displayHierarchy"
+                            v-model="formModel.associationType"
                             placeholder="请选择"
                         >
                             <el-option
-                                v-for="item in displayHierarchyList"
+                                v-for="item in associationTypeList"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value"
                             ></el-option>
                         </el-select>
                     </el-form-item>
+                    <template v-if="formModel.associationType == 1">
+                        <el-form-item label="内业资料类型" prop="majorDataType">
+                            <el-checkbox-group
+                                v-model="formModel.majorDataType"
+                            >
+                                <el-checkbox
+                                    v-for="item in majorDataTypeList"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-checkbox>
+                            </el-checkbox-group>
+                        </el-form-item>
+                        <el-form-item label="显示层级" prop="displayHierarchy">
+                            <el-select
+                                v-model="formModel.displayHierarchy"
+                                placeholder="请选择"
+                            >
+                                <el-option
+                                    v-for="item in displayHierarchyList"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template v-if="formModel.associationType == 2">
+                        <el-form-item label="文件类型" prop="expDataType">
+                            <el-checkbox-group v-model="formModel.expDataType">
+                                <el-checkbox
+                                    v-for="item in fileTypeList"
+                                    :key="item.value"
+                                    :label="item.label"
+                                ></el-checkbox>
+                            </el-checkbox-group>
+                        </el-form-item>
+                    </template>
                 </template>
-                <template v-if="formModel.associationType == 2">
-                    <el-form-item label="文件类型" prop="expDataType">
-                        <el-checkbox-group v-model="formModel.expDataType">
-                            <el-checkbox
-                                v-for="item in fileTypeList"
-                                :key="item.value"
-                                :label="item.label"
-                            ></el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                </template>
+            </el-form>
+            <template #footer>
+                <el-button hc-btn @click="addEditClose">取消</el-button>
+                <el-button
+                    hc-btn
+                    type="primary"
+                    :loading="addEditLoading"
+                    @click="addEditSubmit"
+                    >提交</el-button
+                >
             </template>
-        </el-form>
-        <template #footer>
-            <el-button hc-btn @click="addEditClose">取消</el-button>
-            <el-button
-                hc-btn
-                type="primary"
-                :loading="addEditLoading"
-                @click="addEditSubmit"
-                >提交</el-button
-            >
-        </template>
-    </hc-dialog>
-    <!-- 树节点调整排序 -->
-    <hc-dialog
-        v-model="isSortingShow"
-        title="调整排序"
-        widths="600px"
-        is-table
-        @close="sortingClose"
-    >
-        <hc-table
-            ref="tableSortingRef"
-            :column="tableSortingColumn"
-            :datas="tableSortingData"
-            is-row-drop
-            is-sort
-            quick-sort
-            @row-drop="sortingRowDropTap"
-            @row-sort="sortingRowSortTap"
-        />
-        <template #footer>
-            <el-button hc-btn @click="sortingClose">取消</el-button>
-            <el-button
-                hc-btn
-                type="primary"
-                :disabled="tableSortingData.length <= 0"
-                :loading="sortingLoading"
-                @click="sortingSubmit"
-                >提交</el-button
-            >
-        </template>
-    </hc-dialog>
+        </hc-dialog>
+        <!-- 树节点调整排序 -->
+        <hc-dialog
+            v-model="isSortingShow"
+            title="调整排序"
+            widths="600px"
+            is-table
+            @close="sortingClose"
+        >
+            <hc-table
+                ref="tableSortingRef"
+                :column="tableSortingColumn"
+                :datas="tableSortingData"
+                is-row-drop
+                is-sort
+                quick-sort
+                @row-drop="sortingRowDropTap"
+                @row-sort="sortingRowSortTap"
+            />
+            <template #footer>
+                <el-button hc-btn @click="sortingClose">取消</el-button>
+                <el-button
+                    hc-btn
+                    type="primary"
+                    :disabled="tableSortingData.length <= 0"
+                    :loading="sortingLoading"
+                    @click="sortingSubmit"
+                    >提交</el-button
+                >
+            </template>
+        </hc-dialog>
+    </div>
 </template>
 
 <script setup>

+ 131 - 129
src/views/desk/meta.vue

@@ -17,7 +17,9 @@
                 </el-select>
             </div>
             <div class="ml-14px">
-                <el-button hc-btn type="warning">配置</el-button>
+                <el-button hc-btn type="warning" @click="configClick"
+                    >配置</el-button
+                >
             </div>
         </template>
 
@@ -29,24 +31,16 @@
             :is-current-row="false"
         >
             <template #fieldType="{ row }">
-                {{
-                    getFieldType(row.fieldType)
-                }}
+                {{ getFieldType(row.fieldType) }}
             </template>
             <template #containerType="{ row }">
-                {{
-                    getContainerType(row.containerType)
-                }}
+                {{ getContainerType(row.containerType) }}
             </template>
             <template #captureMode="{ row }">
-                {{
-                    getCaptureMode(row.captureMode)
-                }}
+                {{ getCaptureMode(row.captureMode) }}
             </template>
             <template #mandatoryType="{ row }">
-                {{
-                    getMandatoryType(row.mandatoryType)
-                }}
+                {{ getMandatoryType(row.mandatoryType) }}
             </template>
             <template #action="{ row }">
                 <el-link
@@ -61,7 +55,7 @@
                     <el-link type="warning" @click="editRowClick(row)">
                         修改
                     </el-link>
-                    <el-link type="danger" @click="delRowClick(row)">
+                    <el-link type="danger" v-del-com:[delRowClick]="row">
                         删除
                     </el-link>
                 </template>
@@ -172,197 +166,205 @@
 </template>
 
 <script setup>
-import { nextTick, onActivated, onDeactivated, onUnmounted, ref } from 'vue'
-import { deepClone, formValidate, getArrValue } from 'js-fast-way'
-import { HcDelMsg } from 'hc-vue3-ui'
-import mainApi from '~api/desk/meta'
+import { nextTick, onActivated, onDeactivated, onUnmounted, ref } from "vue";
+import { deepClone, formValidate, getArrValue } from "js-fast-way";
+import { HcDelMsg } from "hc-vue3-ui";
+import mainApi from "~api/desk/meta";
 
 //激活
 onActivated(() => {
-    searchClick()
-})
+    searchClick();
+});
 
 //搜索表单
-const searchForm = ref({ fileStorageType: '', current: 1, size: 30, total: 0 })
+const searchForm = ref({ fileStorageType: "", current: 1, size: 30, total: 0 });
 const searchClick = () => {
-    searchForm.value.current = 1
-    getTableData()
-}
+    searchForm.value.current = 1;
+    getTableData();
+};
 
 //分页
 const pageChange = ({ current, size }) => {
-    searchForm.value.current = current
-    searchForm.value.size = size
-    getTableData()
-}
+    searchForm.value.current = current;
+    searchForm.value.size = size;
+    getTableData();
+};
 
 //表格数据
 const tableColumn = ref([
-    { key: 'containerName', name: '元数据项' },
-    { key: 'code', name: '编号', align: 'center' },
-    { key: 'fieldType', name: '数据类型', align: 'center' },
-    { key: 'containerType', name: '所属容器分类', align: 'center' },
-    { key: 'captureMode', name: '捕获方式', align: 'center' },
-    { key: 'mandatoryType', name: '是否必选', align: 'center' },
-    { key: 'action', name: '操作', width: 110, align: 'center' },
-])
-const tableData = ref([{}])
+    { key: "containerName", name: "元数据项" },
+    { key: "code", name: "编号", align: "center" },
+    { key: "fieldType", name: "数据类型", align: "center" },
+    { key: "containerType", name: "所属容器分类", align: "center" },
+    { key: "captureMode", name: "捕获方式", align: "center" },
+    { key: "mandatoryType", name: "是否必选", align: "center" },
+    { key: "action", name: "操作", width: 110, align: "center" },
+]);
+const tableData = ref([{}]);
 
 //获取表格数据
-const tableLoading = ref(true)
+const tableLoading = ref(true);
 const getTableData = async () => {
-    tableData.value = []
-    tableLoading.value = true
+    tableData.value = [];
+    tableLoading.value = true;
     const { data } = await mainApi.page({
         ...searchForm.value,
         total: null,
-    })
-    tableLoading.value = false
-    tableData.value = getArrValue(data?.records)
-    searchForm.value.total = data?.total || 0
-}
+    });
+    tableLoading.value = false;
+    tableData.value = getArrValue(data?.records);
+    searchForm.value.total = data?.total || 0;
+};
 
 //文件存储类型
 const fileStorageTypeData = [
-    { value: '', label: '元数据表' },
-    { value: 'a', label: '普通' },
-    { value: 'b', label: '竣工图' },
-    { value: 'c', label: '计量' },
-    { value: 'd', label: '质检' },
-    { value: 'e', label: '声像' },
-    { value: 'f', label: '隐蔽' },
-    { value: 'g', label: '试验' },
-    { value: 'h', label: '管理文件' },
-    { value: 'i', label: '变更令' },
-]
+    { value: "", label: "元数据表" },
+    { value: "a", label: "普通" },
+    { value: "b", label: "竣工图" },
+    { value: "c", label: "计量" },
+    { value: "d", label: "质检" },
+    { value: "e", label: "声像" },
+    { value: "f", label: "隐蔽" },
+    { value: "g", label: "试验" },
+    { value: "h", label: "管理文件" },
+    { value: "i", label: "变更令" },
+];
 
 //数据类型
 const fieldTypeData = [
-    { label: '字符串', value: '1' },
-    { label: '日期', value: '4' },
-]
+    { label: "字符串", value: "1" },
+    { label: "日期", value: "4" },
+];
 const getFieldType = (val) => {
-    return fieldTypeData.find(({ value }) => value == val)?.label || ''
-}
+    return fieldTypeData.find(({ value }) => value == val)?.label || "";
+};
 
 //所属容器分类
 const containerTypeData = [
-    { label: '无', value: 100 },
-    { label: '来源', value: 0 },
-    { label: '文件联', value: 1 },
-    { label: '内容描述', value: 2 },
-    { label: '文件标识码', value: 3 },
-    { label: '照片文件', value: 4 },
-    { label: '电子属性', value: 5 },
-    { label: '数字化属性', value: 6 },
-    { label: '电子签名', value: 7 },
-    { label: '竣工图', value: 8 },
-    { label: '业务层级', value: 9 },
-]
+    { label: "无", value: 100 },
+    { label: "来源", value: 0 },
+    { label: "文件联", value: 1 },
+    { label: "内容描述", value: 2 },
+    { label: "文件标识码", value: 3 },
+    { label: "照片文件", value: 4 },
+    { label: "电子属性", value: 5 },
+    { label: "数字化属性", value: 6 },
+    { label: "电子签名", value: 7 },
+    { label: "竣工图", value: 8 },
+    { label: "业务层级", value: 9 },
+];
 const getContainerType = (val) => {
-    return containerTypeData.find(({ value }) => value == val)?.label || ''
-}
+    return containerTypeData.find(({ value }) => value == val)?.label || "";
+};
 
 //捕获方式
 const captureModeData = [
-    { label: '手动', value: 0 },
-    { label: '自动', value: 1 },
-    { label: '手动/自动', value: 2 },
-]
+    { label: "手动", value: 0 },
+    { label: "自动", value: 1 },
+    { label: "手动/自动", value: 2 },
+];
 const getCaptureMode = (val) => {
-    return captureModeData.find(({ value }) => value == val)?.label || ''
-}
+    return captureModeData.find(({ value }) => value == val)?.label || "";
+};
 
 //是否必选
 const mandatoryTypeData = [
-    { label: '可选', value: 0 },
-    { label: '必选', value: 1 },
-    { label: '条件选', value: 2 },
-]
+    { label: "可选", value: 0 },
+    { label: "必选", value: 1 },
+    { label: "条件选", value: 2 },
+];
 const getMandatoryType = (val) => {
-    return mandatoryTypeData.find(({ value }) => value == val)?.label || ''
-}
+    return mandatoryTypeData.find(({ value }) => value == val)?.label || "";
+};
 //取消捕获
-const cancleLoading = ref(false)
+const cancleLoading = ref(false);
 const cancleCapClick = async (row) => {
-    cancleLoading.value = true
+    cancleLoading.value = true;
     const { error, code, msg } = await mainApi.cancelAllocation({
         ids: row.id,
         type: searchForm.value.fileStorageType,
-    })
-    cancleLoading.value = false
+    });
+    cancleLoading.value = false;
     //判断状态
     if (!error && code === 200) {
-        window.$message.success(msg)
+        window.$message.success(msg);
 
-        getTableData()
+        getTableData();
     }
-}
+};
 
 //修改
-const isDialogShow = ref(false)
-const formModel = ref({})
-const formRef = ref(null)
+const isDialogShow = ref(false);
+const formModel = ref({});
+const formRef = ref(null);
 
 const formRules = {
     containerName: {
         required: true,
-        trigger: 'blur',
-        message: '请输入元数据项',
+        trigger: "blur",
+        message: "请输入元数据项",
     },
     code: {
         required: true,
-        trigger: 'blur',
-        message: '请输入code',
+        trigger: "blur",
+        message: "请输入code",
     },
     fieldType: {
         required: true,
-        trigger: 'blur',
-        message: '请选择数据类型',
+        trigger: "blur",
+        message: "请选择数据类型",
     },
     containerType: {
         required: true,
-        trigger: 'blur',
-        message: '请选择所属容器分类',
+        trigger: "blur",
+        message: "请选择所属容器分类",
     },
     captureMode: {
         required: true,
-        trigger: 'blur',
-        message: '请选择捕获方式',
+        trigger: "blur",
+        message: "请选择捕获方式",
     },
     mandatoryType: {
         required: true,
-        trigger: 'blur',
-        message: '请选择是否必选',
+        trigger: "blur",
+        message: "请选择是否必选",
     },
-}
+};
 const editRowClick = async (row) => {
-    formModel.value = deepClone(row)
-    await nextTick()
-    isDialogShow.value = true
-}
+    formModel.value = deepClone(row);
+    await nextTick();
+    isDialogShow.value = true;
+};
 const dialogClose = () => {
-    isDialogShow.value = false
-}
+    isDialogShow.value = false;
+};
 
-const submitLoading = ref(false)
+const submitLoading = ref(false);
 const dialogSubmit = async () => {
-    const formRes = await formValidate(formRef.value)
-    if (!formRes) return false
-    submitLoading.value = true
+    const formRes = await formValidate(formRef.value);
+    if (!formRes) return false;
+    submitLoading.value = true;
     //处理数据
-    const form = formModel.value
+    const form = formModel.value;
 
     //发起请求
-    const { isRes } = await mainApi.metadataUpdate(form)
-    submitLoading.value = false
-    if (!isRes) return
-    dialogClose()
-    window?.$message?.success('操作成功')
-    getTableData()
-}
+    const { isRes } = await mainApi.metadataUpdate(form);
+    submitLoading.value = false;
+    if (!isRes) return;
+    dialogClose();
+    window?.$message?.success("操作成功");
+    getTableData();
+};
+//删除
 //删除
-const delRowClick = (row) => {}
+const delRowClick = async ({ item }, resolve) => {
+    const { isRes } = await mainApi.remove(item.id);
+    resolve(); //关闭弹窗
+    if (!isRes) return;
+    window.$message.success("删除成功");
+    getTableData().then();
+};
+const configClick = () => {};
 </script>
 
 <style lang="scss"></style>

+ 14 - 15
src/views/desk/test-classify.vue

@@ -50,22 +50,21 @@
                 </hc-body>
             </div>
         </hc-card>
+        <!-- 新增编辑 -->
+        <hc-dialog
+            :title="form.id ? '编辑' : '新增'"
+            v-model="treeTap"
+            @close="treeClose"
+            :loading="saveLoading"
+            @save="saveTree"
+        >
+            <el-form ref="formRef" :model="form" :rules="fromRules">
+                <el-form-item label="节点名称" prop="nodeName">
+                    <el-input v-model="form.nodeName" />
+                </el-form-item>
+            </el-form>
+        </hc-dialog>
     </hc-page-split>
-
-    <!-- 新增编辑 -->
-    <hc-dialog
-        :title="form.id ? '编辑' : '新增'"
-        v-model="treeTap"
-        @close="treeClose"
-        :loading="saveLoading"
-        @save="saveTree"
-    >
-        <el-form ref="formRef" :model="form" :rules="fromRules">
-            <el-form-item label="节点名称" prop="nodeName">
-                <el-input v-model="form.nodeName" />
-            </el-form-item>
-        </el-form>
-    </hc-dialog>
 </template>
 
 <script setup>

+ 109 - 105
src/views/desk/test-param.vue

@@ -38,117 +38,121 @@
             </template>
         </hc-card>
         <temperatureDensity v-else :tabsKey="tabsKey"></temperatureDensity>
-    </hc-tab-card>
-    <!-- 新增/修改 -->
-    <hc-dialog
-        v-model="isDataInfoShow"
-        is-footer-center
-        :title="isNullES(formModel.id) ? '新增' : '修改'"
-        @close="dialogClose"
-    >
-        <el-form
-            ref="formRef"
-            :model="formModel"
-            :rules="formRules"
-            label-position="top"
-            label-width="auto"
-            size="large"
-        >
-            <el-form-item label="N值:" prop="valueN">
-                <el-input
-                    v-model="formModel.valueN"
-                    clearable
-                    placeholder="请输入N值"
-                />
-            </el-form-item>
-            <el-form-item
-                label="保证率99%:"
-                prop="assuranceRateNinetyNinePercent"
-            >
-                <el-input
-                    v-model="formModel.assuranceRateNinetyNinePercent"
-                    clearable
-                    placeholder="请输入"
-                />
-            </el-form-item>
-            <el-form-item
-                label="保证率95%:"
-                prop="assuranceRateNinetyFivePercent"
-            >
-                <el-input
-                    v-model="formModel.assuranceRateNinetyFivePercent"
-                    clearable
-                    placeholder="请输入"
-                />
-            </el-form-item>
-            <el-form-item label="保证率90%:" prop="assuranceRateNinetyPercent">
-                <el-input
-                    v-model="formModel.assuranceRateNinetyPercent"
-                    clearable
-                    placeholder="请输入"
-                />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <el-button hc-btn @click="dialogClose">取消</el-button>
-            <el-button
-                hc-btn
-                type="primary"
-                :loading="submitLoading"
-                @click="dialogSubmit"
-                >提交</el-button
-            >
-        </template>
-    </hc-dialog>
-
-    <!-- 模板导入 -->
-    <hc-dialog v-model="fileModal" title="模板导入">
-        <hc-card-item>
-            <template #header>
-                <div class="text-sm text-red">
-                    提示:必须按照系统要求的模版格式上传,否则系统识别无效
-                </div>
-            </template>
 
-            <el-button
-                size="small"
-                type="primary"
-                @click="downLoadFile"
-                :loading="downloadLoading"
-                >下载导入模板</el-button
-            >
-            <el-button
-                size="small"
-                type="primary"
-                @click="importModalClick"
-                :loading="uploadsLoading"
-                >本地上传</el-button
+        <!-- 新增/修改 -->
+        <hc-dialog
+            v-model="isDataInfoShow"
+            is-footer-center
+            :title="isNullES(formModel.id) ? '新增' : '修改'"
+            @close="dialogClose"
+        >
+            <el-form
+                ref="formRef"
+                :model="formModel"
+                :rules="formRules"
+                label-position="top"
+                label-width="auto"
+                size="large"
             >
-            <el-form class="mt-4" :model="formLabelAlign">
+                <el-form-item label="N值:" prop="valueN">
+                    <el-input
+                        v-model="formModel.valueN"
+                        clearable
+                        placeholder="请输入N值"
+                    />
+                </el-form-item>
                 <el-form-item
-                    label="数据覆盖:"
-                    :rules="[
-                        {
-                            required: true,
-                            message: '请选择数据是否覆盖',
-                            trigger: 'blur',
-                        },
-                    ]"
+                    label="保证率99%:"
+                    prop="assuranceRateNinetyNinePercent"
                 >
-                    <el-switch
-                        v-model="formLabelAlign.isCovered"
-                        active-text="是"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        inactive-text="否"
-                        active-value="1"
-                        inactive-value="0"
-                    >
-                    </el-switch>
+                    <el-input
+                        v-model="formModel.assuranceRateNinetyNinePercent"
+                        clearable
+                        placeholder="请输入"
+                    />
+                </el-form-item>
+                <el-form-item
+                    label="保证率95%:"
+                    prop="assuranceRateNinetyFivePercent"
+                >
+                    <el-input
+                        v-model="formModel.assuranceRateNinetyFivePercent"
+                        clearable
+                        placeholder="请输入"
+                    />
+                </el-form-item>
+                <el-form-item
+                    label="保证率90%:"
+                    prop="assuranceRateNinetyPercent"
+                >
+                    <el-input
+                        v-model="formModel.assuranceRateNinetyPercent"
+                        clearable
+                        placeholder="请输入"
+                    />
                 </el-form-item>
             </el-form>
-        </hc-card-item>
-    </hc-dialog>
+            <template #footer>
+                <el-button hc-btn @click="dialogClose">取消</el-button>
+                <el-button
+                    hc-btn
+                    type="primary"
+                    :loading="submitLoading"
+                    @click="dialogSubmit"
+                    >提交</el-button
+                >
+            </template>
+        </hc-dialog>
+
+        <!-- 模板导入 -->
+        <hc-dialog v-model="fileModal" title="模板导入">
+            <hc-card-item>
+                <template #header>
+                    <div class="text-sm text-red">
+                        提示:必须按照系统要求的模版格式上传,否则系统识别无效
+                    </div>
+                </template>
+
+                <el-button
+                    size="small"
+                    type="primary"
+                    @click="downLoadFile"
+                    :loading="downloadLoading"
+                    >下载导入模板</el-button
+                >
+                <el-button
+                    size="small"
+                    type="primary"
+                    @click="importModalClick"
+                    :loading="uploadsLoading"
+                    >本地上传</el-button
+                >
+                <el-form class="mt-4" :model="formLabelAlign">
+                    <el-form-item
+                        label="数据覆盖:"
+                        :rules="[
+                            {
+                                required: true,
+                                message: '请选择数据是否覆盖',
+                                trigger: 'blur',
+                            },
+                        ]"
+                    >
+                        <el-switch
+                            v-model="formLabelAlign.isCovered"
+                            active-text="是"
+                            active-color="#13ce66"
+                            inactive-color="#ff4949"
+                            inactive-text="否"
+                            active-value="1"
+                            inactive-value="0"
+                        >
+                        </el-switch>
+                    </el-form-item>
+                </el-form>
+            </hc-card-item>
+        </hc-dialog>
+    </hc-tab-card>
 </template>
 
 <script setup>