瀏覽代碼

新主题,先不要发版

ZaiZai 1 年之前
父節點
當前提交
d52ea21345
共有 2 個文件被更改,包括 28 次插入86 次删除
  1. 15 27
      src/components/dialog/EditNodeDialog.vue
  2. 13 59
      src/views/archives/bookmark.vue

+ 15 - 27
src/components/dialog/EditNodeDialog.vue

@@ -1,5 +1,5 @@
 <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">
+    <hc-new-dialog v-model="addNodeModal" :title="title" widths="50rem" @save="confirmClick" @close="cancelClick">
         <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" />
@@ -95,19 +95,7 @@
                 </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>
+    </hc-new-dialog>
 </template>
 
 <script setup>
@@ -151,16 +139,16 @@ const { node } = toRefs(props)
 //监听
 watch(() => [
     props.projectId,
-  
+
 ], ([UserProjectId]) => {
 
     projectId.value = UserProjectId
-   
-   
+
+
 })
 
 watch(() => [props.show, props.type], ([newShow, newType])=>{
-  
+
     //console.log(newShow,newType)
     if (newShow) {
       if (newType == 'add') {
@@ -196,7 +184,7 @@ let addform = ref({})
 let addNodeModal = ref(false)
 
 const addNode = async ()=>{
-    
+
     //console.log(node.value.data)
     const { code, data } = await archiveTreeDetail({
         id:node.value.data.id,
@@ -204,7 +192,7 @@ const addNode = async ()=>{
     if (code == 200) {
         delete data['id']
         delete data['nodeName']
-   
+
         //新增的信息和父级一样
         //是否竣工图,是否接口节点。默认否
         data.isInterfaceNode = 2
@@ -217,9 +205,9 @@ const addNode = async ()=>{
             emit('hide', {})
             window.$message.warning('存储节点下面不允许新增节点')
         }
-        
-    
-        
+
+
+
     }
 }
 
@@ -283,7 +271,7 @@ const confirmClick = async () => {
                 projectType:addform.value.projectType, //工程类型
                 storageType:addform.value.storageType, //储存类型
             }
-          
+
                 form.isStorageNode = addform.value.isStorageNode //是否为存储节点
                 if (addform.value.isStorageNode == 1) {
                     form.isBuiltDrawing = addform.value.isBuiltDrawing //竣工图
@@ -294,7 +282,7 @@ const confirmClick = async () => {
                 } else {
                     delete form.storageType
                 }
-         
+
                 form.associationType = addform.value.associationType //关联类型
                 if (addform.value.associationType == 1) {
                     form.majorDataType = addform.value.majorDataType //内业资料类型
@@ -303,7 +291,7 @@ const confirmClick = async () => {
                     // form.expDataType = addform.value.expDataType.join(',')//文件类型
                     form.expDataType = addform.value.expDataType//文件类型
                 }
-            
+
 
             await saveTreeNode(form)
 
@@ -395,7 +383,7 @@ const editNodeModal = async ()=>{
         console.log(data, 'data')
         addform.value = data
         isEditsto.value = data.isStorageNode
-       
+
         addNodeModal.value = true
     }
     //addform.value = node.data;

+ 13 - 59
src/views/archives/bookmark.vue

@@ -19,38 +19,16 @@
                 </hc-new-card>
             </div>
             <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                22
-            </div>
-        </div>
-        <!-- 废弃 -->
-        <div class="hc-page-layout-box" style="display: none">
-            <div class="hc-layout-left-box" :style="`width:${leftWidth}px;`">
-                <div class="hc-project-box">
-                    <div class="hc-project-icon-box">
-                        <HcIcon name="stack" />
-                    </div>
-                    <div class="ml-2 project-name-box">
-                        <div class="project-alias">{{ projectInfo.name }}</div>
-                    </div>
-                </div>
-                <div v-loading="treeLoading" class="hc-tree-box" element-loading-text="加载中...">
-                    <el-scrollbar>
-                        <HcTree :project-id="projectId" :contract-id="contractId" :auto-expand-keys="treeAutoExpandKeys" @nodeTap="nodeElTreeClick" @nodeLoading="treeNodeLoading" />
-                    </el-scrollbar>
-                </div>
-                <!-- 左右拖动 -->
-                <div class="horizontal-drag-line" @mousedown="onmousedown" />
-            </div>
-            <div class="hc-page-content-box">
-                <HcCard title="当前目录信息编辑">
+                <hc-new-card title="当前目录信息编辑">
                     <template #extra>
                         <HcTooltip keys="archives_bookmark_btn_add">
-                            <el-button type="primary" hc-btn @click="addModalClick(false)">
-                                <span>保存设置</span>
-                            </el-button>
+                            <el-button type="primary" hc-btn @click="addModalClick(false)">保存设置</el-button>
                         </HcTooltip>
                     </template>
-                    <el-form ref="formUserRef" :model="formInline" size="large" label-position="top">
+                    <template #search>
+                        <el-alert title="提示:设置基础信息,系统可统一内置到组卷信息里面去" type="error" :closable="false" />
+                    </template>
+                    <el-form :model="formInline" size="large" label-position="top">
                         <el-row :gutter="20">
                             <el-col :span="12">
                                 <el-form-item label="档号前缀">
@@ -100,13 +78,11 @@
                             </el-col>
                         </el-row>
                     </el-form>
-                    <template #action>
-                        <el-alert title="提示:设置基础信息,系统可统一内置到组卷信息里面去" type="error" :closable="false" />
-                    </template>
-                </HcCard>
+                </hc-new-card>
             </div>
+
             <!-- 新增子目录文件夹 -->
-            <el-dialog v-model="showaddModal" :title="`${showaddModaltype}子目录文件夹`" width="50rem" class="hc-modal-border" draggable destroy-on-close @closed="cancelClick">
+            <hc-new-dialog v-model="showaddModal" widths="50rem" :title="`${showaddModaltype}子目录文件夹`" @save="confirmClick" @close="cancelClick">
                 <el-form :model="addform" label-width="150px" style="flex-wrap: nowrap;">
                     <el-form-item label="文件目录名称:">
                         <div class="el-form-item__content">
@@ -122,19 +98,7 @@
                         </div>
                     </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>
+            </hc-new-dialog>
         </div>
     </hc-body>
 </template>
@@ -142,31 +106,21 @@
 <script setup>
 import { nextTick, onMounted, reactive, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
-
-// import HcTree from "./components/hc-tree.vue"
-import HcTree from '~src/components/tree/hc-tree.vue'
-import projectScanningApi from '~api/other-file/projectScanning'
-import { getArchiveTreeLazyTree } from '~api/other'
-import { getStoreValue, setStoreValue } from '~src/utils/storage'
-import { deepClone, downloadBlob, getArrValue, getRandom } from 'js-fast-way'
-import { HcIsButton } from '~src/plugins/IsButtons'
-
+import { getRandom } from 'js-fast-way'
 import { archiveTreeUpdate } from '~api/other'
+import { getStoreValue, setStoreValue } from '~src/utils/storage'
+import HcTree from '~src/components/tree/hc-tree.vue'
 
 //变量
 const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId)
 const contractId = ref(useAppState.getContractId)
 const projectInfo = ref(useAppState.getProjectInfo)
-const menusData = ref([])
 const isCollapse = ref(useAppState.getCollapse)
-let parentId = ref('')
 const showaddModal = ref(false)
 const showaddModaltype = ref('新增')
 let addform = reactive({ title: '' })
 const addArray = reactive([])
-let checkArray = reactive([])
-import { rowsToId, rowsToIdNumArr } from '~uti/tools'
 
 const uuid = getRandom(4)