duy hace 2 años
padre
commit
76420ad794

+ 184 - 188
src/components/dialog/EditNodeDialog.vue

@@ -1,10 +1,10 @@
 <template>
     <el-dialog v-model="addNodeModal" :title="title" width="50rem" class="hc-modal-border" draggable destroy-on-close :close-on-click-modal="false" @closed="cancelClick">
-      <el-form :model="addform" ref="ruleFormRef" :rules="rules" label-width="110px">
-      <el-form-item label="节点名称" prop="nodeName">
-          <el-input v-model="addform.nodeName" size="large"/>
-      </el-form-item>
-      <!-- <el-form-item label="岗位类型" prop="postType">
+        <el-form ref="ruleFormRef" :model="addform" :rules="rules" label-width="110px">
+            <el-form-item label="节点名称" prop="nodeName">
+                <el-input v-model="addform.nodeName" size="large" />
+            </el-form-item>
+            <!-- <el-form-item label="岗位类型" prop="postType">
           <el-select  v-model="addform.postType"  placeholder="请选择岗位" size="large" style="width:100%">
               <el-option v-for="item in JobTypeList" :key="item.id" :label="item.title" :value="item.id"></el-option>
           </el-select>
@@ -21,28 +21,26 @@
       </el-form-item> -->
 
 
-      <!-- <el-form-item  label="储存类型"  prop="storageType"  v-if="addform.nodeType==1">
+            <!-- <el-form-item  label="储存类型"  prop="storageType"  v-if="addform.nodeType==1">
           <el-select  v-model="addform.storageType"  placeholder="请选择"  size="large" style="width:100%">
               <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="true">
-
-  
-          <el-form-item  label="是否存储节点"  prop="isStorageNode">
-              <el-select  v-model="addform.isStorageNode" placeholder="请选择" size="large" style="width:100%">
-                  <el-option  v-for="item in storageNodeList"  :key="item.value"  :label="item.label"  :value="item.value"></el-option>
-              </el-select>
-          </el-form-item>
-
-          <template v-if="addform.isStorageNode==1">
-              <el-form-item  label="储存类型" prop="storageType">
-                  <el-select v-model="addform.storageType" placeholder="请选择" size="large" style="width:100%">
-                      <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="isBuiltDrawing">
+            <template v-if="true">
+                <el-form-item label="是否存储节点" prop="isStorageNode">
+                    <el-select v-model="addform.isStorageNode" placeholder="请选择" size="large" style="width:100%">
+                        <el-option v-for="item in storageNodeList" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+
+                <template v-if="addform.isStorageNode == 1">
+                    <el-form-item label="储存类型" prop="storageType">
+                        <el-select v-model="addform.storageType" placeholder="请选择" size="large" style="width:100%">
+                            <el-option v-for="item in storageTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                        </el-select>
+                    </el-form-item>
+                    <!-- <el-form-item  label="是否竣工图" prop="isBuiltDrawing">
                   <el-select v-model="addform.isBuiltDrawing" placeholder="请选择" size="large" style="width:100%">
                       <el-option v-for="item in builtDrawingList"  :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
@@ -60,11 +58,10 @@
                       </el-select>
                   </el-form-item>
               </template> -->
+                </template>
+            </template>
 
-          </template>
-      </template>
-
-      <!-- <template v-if="addform.nodeType==1">
+            <!-- <template v-if="addform.nodeType==1">
           <el-form-item  label="关联类型" prop="associationType">
               <el-select  v-model="addform.associationType"  placeholder="请选择" size="large" style="width:100%">
                   <el-option v-for="item in associationTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -92,61 +89,64 @@
               </el-form-item>
           </template>
       </template> -->
-      <el-form-item label="组卷规则" prop="archiveAutoType">
-        <el-select  v-model="addform.archiveAutoType"  placeholder="请选择" size="large" style="width:100%">
-                  <el-option v-for="item in archiveAutoTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-      </el-form>
-      <template #footer>
-          <div class="dialog-footer">
-              <el-button size="large" @click="cancelClick">
-                  <HcIcon name="close"/>
-                  <span>取消</span>
-              </el-button>
-              <el-button type="primary" hc-btn  @click="confirmClick">
-                  <HcIcon name="check"/>
-                  <span>确认</span>
-              </el-button>
-          </div>
-      </template>
-  </el-dialog>
+            <el-form-item label="组卷规则" prop="archiveAutoType">
+                <el-select v-model="addform.archiveAutoType" placeholder="请选择" size="large" style="width:100%">
+                    <el-option v-for="item in archiveAutoTypeList" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <div class="dialog-footer">
+                <el-button size="large" @click="cancelClick">
+                    <HcIcon name="close" />
+                    <span>取消</span>
+                </el-button>
+                <el-button type="primary" hc-btn @click="confirmClick">
+                    <HcIcon name="check" />
+                    <span>确认</span>
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
 </template>
 
 <script setup>
-import {useAppStore} from "~src/store";
-import {ref, watch, onMounted,nextTick,toRefs,computed } from "vue";
-import {roletree,getDictionary,archiveTreeSave,archiveTreeDetail,archiveTreeUpdate} from "~api/other";
-import archiveFileApi from "~api/archiveFile/archiveFile";
-import {getArrValue,isArrItem} from "js-fast-way"
-const useAppState = useAppStore()
-
-const contractId = ref(useAppState.getContractId);
+import { useAppStore } from '~src/store'
+import { computed, nextTick, onMounted, ref, toRefs, watch } from 'vue'
+import { archiveTreeDetail, archiveTreeSave, archiveTreeUpdate, getDictionary, roletree } from '~api/other'
+import archiveFileApi from '~api/archiveFile/archiveFile'
+import { getArrValue, isArrItem } from 'js-fast-way'
 //参数
 const props = defineProps({
     projectId: {
-        type: [String,Number],
-        default: ''
+        type: [String, Number],
+        default: '',
     },
 
     node: {
         type: Object,
-        default: () => ({})
+        default: () => ({}),
     },
     show:{
       type:Boolean,
-      default:false
+      default:false,
     },
     type: {
         type: String,
-        default: ''
+        default: '',
     },
 })
 
-const projectId = ref(props.projectId);
+//事件
+const emit = defineEmits(['hide'])
+
+const useAppState = useAppStore()
+
+const contractId = ref(useAppState.getContractId)
+const projectId = ref(props.projectId)
 
 // 使用toRefs结构,使其具有响应式
-const {node} = toRefs(props);
+const { node } = toRefs(props)
 
 //监听
 watch(() => [
@@ -159,33 +159,30 @@ watch(() => [
    
 })
 
-watch(() => [props.show,props.type],([newShow,newType])=>{
+watch(() => [props.show, props.type], ([newShow, newType])=>{
   
     //console.log(newShow,newType)
-    if(newShow){
-      if(newType == 'add'){
+    if (newShow) {
+      if (newType == 'add') {
         addNode()
-      }else if(newType == 'edit'){
+      } else if (newType == 'edit') {
         editNodeModal()
       }
-    }else{
-      cancelClick();
-      addNodeModal.value = false;
+    } else {
+      cancelClick()
+      addNodeModal.value = false
     }
-});
+})
 
 //计算属性
 let title = computed(()=>{
-  if(props.type == 'add'){
+  if (props.type == 'add') {
     return '新增'
-  }else if(props.type == 'edit'){
+  } else if (props.type == 'edit') {
     return '编辑'
   }
 })
 
-//事件
-const emit = defineEmits(['hide'])
-
 //渲染完成
 onMounted(() => {
     //数据初始化
@@ -198,25 +195,25 @@ onMounted(() => {
 let addform = ref({})
 let addNodeModal = ref(false)
 
-const addNode = async()=>{
+const addNode = async ()=>{
     
     //console.log(node.value.data)
-    const {code,data } = await archiveTreeDetail({
-        id:node.value.data.id
+    const { code, data } = await archiveTreeDetail({
+        id:node.value.data.id,
     })
     if (code == 200) {
-        delete data['id'];
-        delete data['nodeName'];
+        delete data['id']
+        delete data['nodeName']
    
         //新增的信息和父级一样
         //是否竣工图,是否接口节点。默认否
-        data.isInterfaceNode = 2;
-        data.interfaceType = 2;
+        data.isInterfaceNode = 2
+        data.interfaceType = 2
 
-        addform.value = data;
-        console.log(data,'data');
-        addNodeModal.value = true;
-        if(data.isStorageNode==1){
+        addform.value = data
+        console.log(data, 'data')
+        addNodeModal.value = true
+        if (data.isStorageNode == 1) {
             emit('hide', {})
             window.$message.warning('存储节点下面不允许新增节点')
         }
@@ -279,30 +276,30 @@ const confirmClick = async () => {
                 id: addform.value.id,
                 projectId:projectId.value,
                 parentId: node.value.data.id, //上级节点id
-                nodeName: addform.value.nodeName,  //节点名称
-                nodeType: addform.value.nodeType,  // 节点类型
-                postType: addform.value.postType,  //岗位类型
-                archiveAutoType:addform.value.archiveAutoType,//组卷规则
+                nodeName: addform.value.nodeName, //节点名称
+                nodeType: addform.value.nodeType, // 节点类型
+                postType: addform.value.postType, //岗位类型
+                archiveAutoType:addform.value.archiveAutoType, //组卷规则
                 projectType:addform.value.projectType, //工程类型
                 storageType:addform.value.storageType, //储存类型
             }
           
-                form.isStorageNode = addform.value.isStorageNode  //是否为存储节点
-                if(addform.value.isStorageNode == 1){
-                    form.isBuiltDrawing = addform.value.isBuiltDrawing  //竣工图
-                    form.isInterfaceNode = addform.value.isInterfaceNode  //是否接口节点
-                    if(addform.value.isInterfaceNode == 1){
-                        form.interfaceType =  addform.value.interfaceType  //选择接口类型
+                form.isStorageNode = addform.value.isStorageNode //是否为存储节点
+                if (addform.value.isStorageNode == 1) {
+                    form.isBuiltDrawing = addform.value.isBuiltDrawing //竣工图
+                    form.isInterfaceNode = addform.value.isInterfaceNode //是否接口节点
+                    if (addform.value.isInterfaceNode == 1) {
+                        form.interfaceType = addform.value.interfaceType //选择接口类型
                     }
-                }else{
+                } else {
                     delete form.storageType
                 }
          
-                form.associationType = addform.value.associationType  //关联类型
-                if(addform.value.associationType == 1){
+                form.associationType = addform.value.associationType //关联类型
+                if (addform.value.associationType == 1) {
                     form.majorDataType = addform.value.majorDataType //内业资料类型
-                    form.displayHierarchy = addform.value.displayHierarchy  //显示层级
-                }else if(addform.value.associationType == 2){
+                    form.displayHierarchy = addform.value.displayHierarchy //显示层级
+                } else if (addform.value.associationType == 2) {
                     // form.expDataType = addform.value.expDataType.join(',')//文件类型
                     form.expDataType = addform.value.expDataType//文件类型
                 }
@@ -316,7 +313,7 @@ const confirmClick = async () => {
 }
 
 const saveTreeNode = async (form)=>{
-    if (form?.majorDataType&&isArrItem( form?.majorDataType)) {
+    if (form?.majorDataType && isArrItem( form?.majorDataType)) {
         if (form.majorDataType.length > 0) {
           let das = ''
           form.majorDataType.forEach((val, key) => {
@@ -329,13 +326,13 @@ const saveTreeNode = async (form)=>{
         }
       }
       if (addform.value.id) {
-        console.log(isEditsto.value,'isEditsto.value');
-        console.log(ishabvFile.value,'ishabvFile.value');
+        console.log(isEditsto.value, 'isEditsto.value')
+        console.log(ishabvFile.value, 'ishabvFile.value')
         // await archiveTreeUpdateHandle(form)
-        if(isEditsto.value===1&&addform.value.isStorageNode===2&&ishabvFile.value){
+        if (isEditsto.value === 1 && addform.value.isStorageNode === 2 && ishabvFile.value) {
             //是否存储类型由是改为否,要判断该节点下是否有存储文件
             window.$message.warning('当前节点下有存储文件,请迁移或删除后再变更')
-        }else{
+        } else {
             await archiveTreeUpdateHandle(form)
         }
       } else {
@@ -345,59 +342,59 @@ const saveTreeNode = async (form)=>{
 
 const archiveTreeSaveHandle = async (form)=>{//新增
     //console.log(form);
-    const {code,data} = await archiveTreeSave(form)
+    const { code, data } = await archiveTreeSave(form)
     //console.log(res);
     if (code == 200) {
         window.$message?.success('新增成功')
-        window?.location?.reload()  //刷新页面
+        window?.location?.reload() //刷新页面
     }
 }
 
 const archiveTreeUpdateHandle = async (form)=>{//编辑
     //console.log(form);
-    const {code } = await archiveTreeUpdate(form)
+    const { code } = await archiveTreeUpdate(form)
     //console.log(res);
     if (code == 200) {
         window.$message?.success('修改成功')
-        node.value.data.title = form.nodeName;
-        node.value.data.isStorageNode = form.isStorageNode;
-        node.value.data.storageType = form.storageType;
+        node.value.data.title = form.nodeName
+        node.value.data.isStorageNode = form.isStorageNode
+        node.value.data.storageType = form.storageType
     }
 }
-const ishabvFile=ref(false)
+const ishabvFile = ref(false)
 //查询该节点下有没有文件
 const getTableData = async (nodeid) => {
-    console.log(contractId.value,'contractId.value');
+    console.log(contractId.value, 'contractId.value')
     const { error, code, data } = await archiveFileApi.getarchiveFilePage({
         nodeIds: nodeid,
         current: 1,
         size: 20,
         total: 0,
         projectId: projectId.value,
-        contractId:contractId.value
+        contractId:contractId.value,
     })
     if (!error && code === 200) {
-        let dataarr=getArrValue(data['records'])
-        if(dataarr.length>0){
-            ishabvFile.value=true
-        }else{
-            ishabvFile.value=false
+        let dataarr = getArrValue(data['records'])
+        if (dataarr.length > 0) {
+            ishabvFile.value = true
+        } else {
+            ishabvFile.value = false
         }
     } else {
-        ishabvFile.value=false
+        ishabvFile.value = false
     }
 }
-const isEditsto=ref('')//原始为存储节点
+const isEditsto = ref('')//原始为存储节点
 //编辑节点
 const editNodeModal = async ()=>{
     getTableData(node.value.data.id)
-    const {code,data } = await archiveTreeDetail({
-        id:node.value.data.id
+    const { code, data } = await archiveTreeDetail({
+        id:node.value.data.id,
     })
     if (code == 200) {
-        console.log(data,'data');
-        addform.value = data;
-        isEditsto.value=data.isStorageNode
+        console.log(data, 'data')
+        addform.value = data
+        isEditsto.value = data.isStorageNode
        
         addNodeModal.value = true
     }
@@ -405,7 +402,7 @@ const editNodeModal = async ()=>{
 
 }
 
-const ruleFormRef = ref();
+const ruleFormRef = ref(null)
 const rules = ref({
     nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
     postType: [{ required: true, message: '请选择岗位类型', trigger: 'change' }],
@@ -423,25 +420,25 @@ const rules = ref({
 })
 
 //类型枚举
-let JobTypeList = ref([]);//岗位类型枚举
-const getJobTypeList = async() => {//岗位类型枚举
-    const { data,code } = await roletree()
+let JobTypeList = ref([])//岗位类型枚举
+const getJobTypeList = async () => {//岗位类型枚举
+    const { data, code } = await roletree()
     //console.log(res);
     if (code == 200) {
         JobTypeList.value = data
     }
 }
-let majorDataTypeList = ref([]);
-const major_data_type = async() => {//内业资料类型
-    const { data,code } = await getDictionary({ code: 'major_data_type' })
+let majorDataTypeList = ref([])
+const major_data_type = async () => {//内业资料类型
+    const { data, code } = await getDictionary({ code: 'major_data_type' })
     //console.log(res);
     if (code == 200) {
         majorDataTypeList.value = data
     }
 }
-let displayHierarchyList = ref([]);
-const display_hierarchy = async() => {//显示层级
-    const { data,code } = await getDictionary({ code: 'display_hierarchy' })
+let displayHierarchyList = ref([])
+const display_hierarchy = async () => {//显示层级
+    const { data, code } = await getDictionary({ code: 'display_hierarchy' })
     //console.log(res);
     if (code == 200) {
         displayHierarchyList.value = data
@@ -451,145 +448,144 @@ const display_hierarchy = async() => {//显示层级
 const nodeTypeList = [
 {
     label: '关联电子原生文件',
-    value: 1
+    value: 1,
 }, {
     label: '数字化上传文件',
-    value: 2
+    value: 2,
 },
 ]//节点类型枚举
 const projectTypeList = [
 {
     label: '水利水电工程',
-    value: 1
+    value: 1,
 }, {
     label: '公路工程',
-    value: 2
+    value: 2,
 }, {
     label: '全部',
-    value: 3
+    value: 3,
 },
 ]//工程类型枚举
-const storageTypeList=[
+const storageTypeList = [
 {
     label: '普通',
-    value: 1
-},{
+    value: 1,
+}, {
     label: '竣工图',
-    value: 2
-},{
+    value: 2,
+}, {
     label: '计量',
-    value: 3
-},{
+    value: 3,
+}, {
     label: '质检',
-    value: 4
-},{
+    value: 4,
+}, {
     label: '声像',
-    value: 5
-},{
+    value: 5,
+}, {
     label: '隐蔽',
-    value: 6
-},{
+    value: 6,
+}, {
     label: '原材试验',
-    value: 7
-},{
+    value: 7,
+}, {
     label: '管理文件',
-    value: 8
-},{
+    value: 8,
+}, {
     label: '变更令',
-    value: 9
+    value: 9,
 },
 ]//储存类型枚举
 const storageNodeList = [
     {
     label: '是',
-    value: 1
+    value: 1,
     }, {
     label: '否',
-    value: 2
-    }
+    value: 2,
+    },
 ]//存储节点枚举
 const builtDrawingList = [{
     label: '是',
-    value: 1
+    value: 1,
     }, {
     label: '否',
-    value: 2
+    value: 2,
     },
 ]//竣工图枚举
 const interfaceNodeList = [
     {
     label: '是',
-    value: 1
+    value: 1,
     }, {
     label: '否',
-    value: 2
+    value: 2,
     },
 ]//接口节点枚举
 const interfaceTypeList = [
     {
         label: '试验接口',
-        value: 1
+        value: 1,
     }, {
         label: '计量接口',
-        value: 2
+        value: 2,
     },
 ]//选择接口类型枚举
 const associationTypeList = [
     {
     label: '质检资料',
-    value: 1
+    value: 1,
     },
     {
     label: '试验资料',
-    value: 2
+    value: 2,
     },
     {
     label: '影像资料',
-    value: 3
+    value: 3,
     },
     {
     label: '台账资料',
-    value: 4
-    },{
+    value: 4,
+    }, {
     label: '首件资料',
-    value: 5
-    },{
+    value: 5,
+    }, {
     label: '日志文件',
-    value: 6
+    value: 6,
     },
 ]
 const fileTypeList = [
     {
         label: '配合比',
-        value: 1
+        value: 1,
     },
     {
         label: '原材',
-        value: 2
-    },{
+        value: 2,
+    }, {
         label: '汇总',
-        value: 3
-    },{
+        value: 3,
+    }, {
         label: '设备',
-        value: 4
-    },{
+        value: 4,
+    }, {
         label: '外委(第三方)',
-        value: 5
+        value: 5,
     },
 ]
 //组卷规则
 const archiveAutoTypeList = [
     {
         label: '最高组卷',
-        value: 1
+        value: 1,
     },
     {
         label: '分类并卷',
-        value: 2
-    },{
+        value: 2,
+    }, {
         label: '单独组卷',
-        value: 3
+        value: 3,
     },
 ]
-
 </script>

+ 47 - 48
src/views/archives/components/meta-info.vue

@@ -1,134 +1,133 @@
 <template>
-    <HcDialog :show="showModal" to-id="node-card-target" title="元数据信息" isToBody isTable isRowFooter widths="62rem" @close="cancelClick">
-        <metaTable  :isEdit="isEdit" :loading="tabeloading" :metaDataTable="metaDataTable" @changemeDataTable="changemeDataTable"  v-if="metaDataTable.length>0"/>
-       <HcNoData v-if="metaDataTable.length==0"/>
+    <HcDialog :show="showModal" title="元数据信息" is-to-body is-table is-row-footer widths="62rem" @close="cancelClick">
+        <metaTable v-if="metaDataTable.length > 0" :is-edit="isEdit" :loading="tabeloading" :meta-data-table="metaDataTable" @changemeDataTable="changemeDataTable" />
+        <HcNoData v-if="metaDataTable.length == 0" />
         <template #rightRowFooter>
-
-            <div class="dialog-footer " style="margin-top: 20px" v-if="isEdit">
+            <div v-if="isEdit" class="dialog-footer " style="margin-top: 20px">
                 <el-button size="large" @click="gobackClick">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                     <span>返回</span>
                 </el-button>
-                <el-button type="primary" hc-btn  @click="confirmClick">
-                    <HcIcon name="check"/>
+                <el-button type="primary" hc-btn @click="confirmClick">
+                    <HcIcon name="check" />
                     <span>编辑</span>
                 </el-button>
             </div>
-            <div class="dialog-footer fright" style="margin-top: 20px" v-else>
+            <div v-else class="dialog-footer fright" style="margin-top: 20px">
                 <el-button size="large" @click="cancelClick">
-                    <HcIcon name="close"/>
+                    <HcIcon name="close" />
                     <span>取消</span>
                 </el-button>
                 <el-button type="primary" hc-btn :loading="saveloading" @click="saveClick">
-                    <HcIcon name="check"/>
+                    <HcIcon name="check" />
                     <span>提交</span>
                 </el-button>
             </div>
         </template>
-          
     </HcDialog>
-
 </template>
 
 <script setup>
-import {ref, watch,toRefs} from "vue"
-import {useAppStore} from "~src/store";
+import { ref, toRefs, watch } from 'vue'
+import { useAppStore } from '~src/store'
 import metaTable from './meta-table.vue'
-import tuningApi from "~api/archiveConfig/tuning.js";
-import {getArrValue} from "js-fast-way"
+import tuningApi from '~api/archiveConfig/tuning.js'
+import { getArrValue } from 'js-fast-way'
 //参数
 const props = defineProps({
     show: {
         type: Boolean,
-        default: false
+        default: false,
     },
 
     uis: {
         type: String,
-        default: ''
+        default: '',
     },
     ui: {
         type: String,
-        default: ''
+        default: '',
     },
     fileId:{
         type: String,
-        default: ''
+        default: '',
     },
     loading:{
         type: String,
-        default: ''
-    }
+        default: '',
+    },
 
 })
 
+const emits = defineEmits(['upshowModal', 'getTableData'])
+
+
 //变量
 const userStore = useAppStore()
 
 
 const showModal = ref(props.show)
 const isLoading = ref(props.loading)
-const fileIdval=ref(props.fileId)
-const isEdit =ref(true)
+const fileIdval = ref(props.fileId)
+const isEdit = ref(true)
 
 const size = ref('70%')
 //监听
 watch(() => [
     props.show,
    
-], ([show,  loading, user]) => {
+], ([show, loading, user]) => {
     showModal.value = show
     isLoading.value = loading
     if (show) {
-        isEdit.value=true
+        isEdit.value = true
         getmetaInfo()
     }
 })
 //获取元数据信息
-const tabeloading=ref(false)
-const metaDataTable=ref([])
-const getmetaInfo=async()=>{
+const tabeloading = ref(false)
+const metaDataTable = ref([])
+const getmetaInfo = async ()=>{
     tabeloading.value = true
-    const {error, code, data} = await tuningApi.getMetadataFileByid({
+    const { error, code, data } = await tuningApi.getMetadataFileByid({
         fileId:props.fileId,
     })
     tabeloading.value = false
     if (!error && code === 200) {
-        console.log(data,'data');
-        metaDataTable.value=getArrValue(data)
-        updateInfo.value=metaDataTable.value
+        console.log(data, 'data')
+        metaDataTable.value = getArrValue(data)
+        updateInfo.value = metaDataTable.value
     } else {
-        metaDataTable.value=[]
+        metaDataTable.value = []
     }
 }
-const updateInfo=ref('')
-const changemeDataTable=(val)=>{
-    updateInfo.value=val
+const updateInfo = ref('')
+const changemeDataTable = (val)=>{
+    updateInfo.value = val
 }
 
-const emits = defineEmits(['upshowModal','getTableData'])
 //返回  
 const gobackClick = () => {
-    isEdit.value=true
+    isEdit.value = true
       emits('upshowModal', false)
 }
 //取消
 const cancelClick = () => {
-    isEdit.value=true
+    isEdit.value = true
     emits('upshowModal', false)
 }
 
 //编辑
 const confirmClick = async () => {
-    isEdit.value=false
+    isEdit.value = false
 }
 //提交
-const saveloading=ref(false)
+const saveloading = ref(false)
 const saveClick = async () => {
-    isEdit.value=false
+    isEdit.value = false
     saveloading.value = true
-    const {error, code, msg} = await tuningApi.updateMetadata({
-        list:updateInfo.value
+    const { error, code, msg } = await tuningApi.updateMetadata({
+        list:updateInfo.value,
     })
     saveloading.value = false
     if (!error && code === 200) {
@@ -140,8 +139,8 @@ const saveClick = async () => {
     }
     emits('upshowModal', false)
 }
-
 </script>
+
 <style lang="scss">
 .modalbox{
  .m20{
@@ -151,8 +150,8 @@ const saveClick = async () => {
      font-size: 1.25rem;
  }
 }
-
 </style>
+
 <style lang="scss" scoped>
 .fright{
     float: right;

+ 1 - 1
src/views/archives/tuning.vue

@@ -697,7 +697,7 @@ const sortTableColumn = ref([
 const sortTableData = ref([])
 
 const sortTableLoading = ref(false)
-const sortType = ref()
+const sortType = ref(null)
 const getSortTableData = async () => {
    
     if (sortType.value === 1) {

+ 4 - 4
src/views/custody/backup.vue

@@ -210,10 +210,10 @@ const getFileData = async ()=>{
 
     })
     if (!error) {
-        downFileUrl.value = data.fileUrl
-        tableBasicData.value[0].size = data.fileSize
-        tableBasicData.value[0].num = data.fileSize
-        tableBasicData.value[0].baledate = data.uploadDate
+        downFileUrl.value = data?.fileUrl
+        tableBasicData.value[0].size = data?.fileSize
+        tableBasicData.value[0].num = data?.fileSize
+        tableBasicData.value[0].baledate = data?.uploadDate
 
     } else {
         downUtilsClickLoading.value = false

+ 35 - 34
src/views/using/components/echarts/BarChart.vue

@@ -1,30 +1,29 @@
 <template>
     <div class="hc-bar-chart-box">
-        <div ref="echart" class="hc-bar-chart-echarts" :style="`width : ${chart?.clientWidth}px`"/>
+        <div ref="echart" class="hc-bar-chart-echarts" :style="`width : ${chart?.clientWidth}px`" />
     </div>
 </template>
 
 <script setup>
 import * as echarts from 'echarts'
-import {useAppStore} from "~src/store";
+import { useAppStore } from '~src/store'
 import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-const useAppState = useAppStore()
 const props = defineProps({
     datas: {
         type: Array,
-        default: () => ([])
+        default: () => ([]),
     },
     config: {
         type: Object,
-        default: () => ({})
+        default: () => ({}),
     },
 })
-
+const useAppState = useAppStore()
 //初始变量
-let chart = null;
+let chart = null
 const echart = ref(null)
 const datas = ref(props.datas)
-const AppTheme = ref(useAppState.getTheme);
+const AppTheme = ref(useAppState.getTheme)
 
 //监听
 watch(() => [
@@ -44,32 +43,32 @@ const initChart = () => {
 
 //监听浏览器窗口变化
 const windowResize = () => {
-    window.addEventListener("resize", resizeEvent);
+    window.addEventListener('resize', resizeEvent)
 }
 
 const resizeEvent = () => {
     window.requestAnimationFrame(() => {
-        chart.resize();
+        chart.resize()
     })
 }
 
 const onResize = () => {
     nextTick(() => {
-        chart.resize();
+        chart.resize()
     })
 }
 
 //设置数据
 const setDatas = (data) => {
-    const {name, key, label} = props.config;
-    let AxisData = [], series = [];
+    const { name, key, label } = props.config
+    let AxisData = [], series = []
     for (let i = 0; i < name.length; i++) {
-        let keyData = [];
+        let keyData = []
         for (let x = 0; x < data.length; x++) {
             if (AxisData.indexOf(data[x].title) === -1) {
                 AxisData.push(data[x].title)
             }
-            keyData.push(data[x][key[i]]);
+            keyData.push(data[x][key[i]])
         }
         series.push({
             name: name[i],
@@ -77,9 +76,9 @@ const setDatas = (data) => {
             data: keyData,
             tooltip: {
                 valueFormatter(value) {
-                    return value + label;
-                }
-            }
+                    return value + label
+                },
+            },
         })
     }
     setOptions(AxisData, series)
@@ -87,21 +86,22 @@ const setDatas = (data) => {
 
 //设置图表
 const setOptions = (AxisData, seriesData) => {
-    const {name, color, label} = props.config;
+    const { name, color, label } = props.config
     let xLabelWidth = ((chart.getWidth() * 1 - 30 - 40) / AxisData.length) - 30
     chart.setOption({
         color: color,
         tooltip: {
             trigger: 'axis',
             axisPointer: {
-                type: 'shadow'
-            }
+                type: 'shadow',
+            },
         },
         legend: {
             data: name,
-            textStyle: {
-                color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
-            },
+            // textStyle: {
+            //     color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
+            // },
+            color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
         },
         xAxis: [
             {
@@ -109,25 +109,26 @@ const setOptions = (AxisData, seriesData) => {
                 data: AxisData,
                 axisLabel: {
                     width: xLabelWidth,
-                    overflow: "breakAll",
+                    overflow: 'breakAll',
                     interval: 0,
                     rotate: 0,
-                    textStyle: {
-                        color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
-                    },
+                    // textStyle: {
+                    //     color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
+                    // },
+                    color: AppTheme.value === 'dark' ? '#FFFFFF' : '#000000',
                 },
-            }
+            },
         ],
         yAxis: [
             {
                 type: 'value',
                 //interval: 30,
                 axisLabel: {
-                    formatter: '{value}' + label
+                    formatter: '{value}' + label,
                 },
-            }
+            },
         ],
-        series: seriesData
+        series: seriesData,
     })
 }
 
@@ -141,14 +142,14 @@ onMounted(() => {
 
 //被卸载
 onUnmounted(() => {
-    window.removeEventListener("resize",resizeEvent);
+    window.removeEventListener('resize', resizeEvent)
     chart.dispose()
     chart = null
 })
 
 // 暴露出去
 defineExpose({
-    onResize
+    onResize,
 })
 </script>