ZaiZai 10 сар өмнө
parent
commit
8578168545

+ 2 - 2
package.json

@@ -25,7 +25,7 @@
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.5",
-        "hc-vue3-ui": "^4.3.7",
+        "hc-vue3-ui": "^4.3.8",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.6",
         "js-md5": "^0.8.3",
@@ -49,7 +49,7 @@
         "typescript": "^5.6.3",
         "unocss": "^0.58.9",
         "unocss-preset-extra": "0.5.3",
-        "vite": "^5.4.8",
+        "vite": "^5.4.9",
         "z-element-plus": "^1.1.4"
     }
 }

+ 180 - 172
src/api/modules/data-fill/wbs.js

@@ -1,22 +1,22 @@
-import { HcApi } from "../../request/index";
-import { getHeader } from "hc-vue3-ui";
+import { HcApi } from '../../request/index'
+import { getHeader } from 'hc-vue3-ui'
 
 export default {
     //新增或删除 合同段划分树首件关联
     async wbsTreeFirstSave(form) {
         return HcApi({
-            url: "/api/blade-business/treeContractFirst/saveOrDelete",
-            method: "post",
+            url: '/api/blade-business/treeContractFirst/saveOrDelete',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //修改树节点
     async wbsTreeUpdateNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/updateContractNodeParameter",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/updateContractNodeParameter',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //导图结构树节点查询
     // async queryMappingStructureTree(form) {
@@ -28,434 +28,442 @@ export default {
     // },
     async queryMappingStructureTree(form) {
         return HcApi({
-            url: "/api/blade-user/wbs/lazyQueryContractWbsTree",
-            method: "get",
+            url: '/api/blade-user/wbs/lazyQueryContractWbsTree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存或修改节点上传的图纸记录
     async saveContractTreeDrawings(form) {
         return HcApi({
-            url: "/api/blade-business/contractTreeDrawings/saveContractTreeDrawings",
-            method: "post",
+            url: '/api/blade-business/contractTreeDrawings/saveContractTreeDrawings',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //删除节点
     async removeContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/removeContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/removeContractTreeNode',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询当前节点下所有元素表信息
     async searchNodeAllTable(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/search-node-tables",
-            method: "get",
+            url: '/api/blade-manager/wbsTreeContract/search-node-tables',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //清表生成html
     async getExcelHtml(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-excel-html_buss",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-excel-html_buss',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取按键切换输入框的key列表
     async getHtmlBussCols(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-html-buss-cols",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-html-buss-cols',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //填报页面数据保存
     async saveExcelBussData(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/save_buss_data",
-            method: "post",
+            url: '/api/blade-manager/exceltab/save_buss_data',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //懒加载项目级工程划分树
     async queryWbsTreePrivateByProjectIdAndId(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryWbsTreePrivateByProjectIdAndId",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryWbsTreePrivateByProjectIdAndId',
+            method: 'post',
             params: form,
-        });
+        })
     },
     async queryWbsTreeContractByContractIdAndId(form) {
         return HcApi({
-            url: "/api/blade-manager/contractInfo/add-node-tree",
-            method: "get",
+            url: '/api/blade-manager/contractInfo/add-node-tree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //新增自定义节点项目全加载树
     async queryPriateTree(form) {
         return HcApi({
-            url: "/api/blade-user/wbs/private/tree",
-            method: "get",
+            url: '/api/blade-user/wbs/private/tree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //新增节点及其子节点
     async saveContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/saveContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/saveContractTreeNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //新增自定义节点
     async saveCustomAddContractNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/customAddContractNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/customAddContractNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //复制节点
     async copyContractTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/copyContractTreeNode",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/copyContractTreeNode',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //自定义排序
     async diySortTreeNode(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/diySort",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/diySort',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //获取表单数据
     async getBussDataInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-dataInfo",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-dataInfo',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //查询节点状态
     async queryNodeStatus(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询监理节点状态
     async queryNodeStatusJl(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-jl",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-jl',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询首件节点状态
     async queryNodeStatusSj(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-sj",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-sj',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询试验上报按钮状态
     async queryNodeStatusTrial(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryNodeStatus-trial",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/queryNodeStatus-trial',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //单个废除
     async abolishOne(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/abolishOne",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/abolishOne',
+            method: 'post',
             params: form,
-        });
+        })
     },
 
     //单个废除-首件
     async abolishOneSJ(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/abolishOne-sj",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/abolishOne-sj',
+            method: 'post',
             params: form,
-        });
+        })
     },
 
     //隐藏表单
     async showBussTab(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/show-buss-tab",
-            method: "get",
+            url: '/api/blade-manager/exceltab/show-buss-tab',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //单表pdf预览
     async getBussPdfInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-pdfInfo",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-pdfInfo',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //表单复制
     async copeBussTab(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/cope-buss-tab",
-            method: "get",
+            url: '/api/blade-manager/exceltab/cope-buss-tab',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //多表预览
     async getBussPdfs(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/get-buss-pdfs",
-            method: "get",
+            url: '/api/blade-manager/exceltab/get-buss-pdfs',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取附件列表
     async getBussFileList(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/get-buss-fileList",
-            method: "get",
+            url: '/api/blade-manager/tablefile/get-buss-fileList',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取附件添加列表
     async selectTableFileListByTen(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/selectTableFileListByTen",
-            method: "get",
+            url: '/api/blade-manager/tablefile/selectTableFileListByTen',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //逻辑附件添加
     async delTabById(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/delTabById",
-            method: "post",
+            url: '/api/blade-manager/tablefile/delTabById',
+            method: 'post',
             params: form,
-        });
+        })
     },
     async getBussFileList1(form) {
         return HcApi({
-            url: "/api/blade-business/detection/self/file-list",
-            method: "get",
+            url: '/api/blade-business/detection/self/file-list',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //逻辑删除
     async removeBussFile(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/remove",
-            method: "post",
+            url: '/api/blade-manager/tablefile/remove',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //删除试验文件
     async removeBussFile1(form) {
         return HcApi({
-            url: "/api/blade-manager/tablefile/remove-trial",
-            method: "post",
+            url: '/api/blade-manager/tablefile/remove-trial',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //用户端删除复制信息表
     async removeBussTabInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/remove-buss-tabInfo",
-            method: "post",
+            url: '/api/blade-manager/exceltab/remove-buss-tabInfo',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //复制节点填报数据
     async copyContractNodeSubmitBusinessData(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/copyContractNodeSubmitBusinessData",
-            method: "post",
+            url: '/api/blade-business/informationWriteQuery/copyContractNodeSubmitBusinessData',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //输入框查询合同段树
     async searchContractTree(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/searchContractTree",
-            method: "get",
+            url: '/api/blade-business/informationWriteQuery/searchContractTree',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //设计值计算
     async queryFormulaRange(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/range",
-            method: "get",
+            url: '/api/blade-manager/formula/range',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //获取文件题名
     async queryDocumentTitle(form) {
         return HcApi({
-            url: "/api/blade-business/informationWriteQuery/queryDocumentTitle",
-            method: "get",
+            url: '/api/blade-business/informationWriteQuery/queryDocumentTitle',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //查询公式参数面板
     async queryPanel(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/panel",
-            method: "get",
+            url: '/api/blade-manager/formula/panel',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存公式参数
 
     async savePanel(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/panel-save",
-            method: "post",
+            url: '/api/blade-manager/formula/panel-save',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //同步质检资料
     async syncTbadata(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/sync-tab-data",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/sync-tab-data',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //获取表单详情
     async getWbsContractById(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/getWbsContractById",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/getWbsContractById',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //查询当前节点下所有表的附件信息
     async tablesAndFile(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/search-node-tablesAndFile",
-            method: "get",
+            url: '/api/blade-manager/wbsTreeContract/search-node-tablesAndFile',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //清除表单信息
     async rmTabdataInfo(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/rm-tabdata-info",
-            method: "get",
+            url: '/api/blade-manager/exceltab/rm-tabdata-info',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //下载模板
     async downloadExcel(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/download-excel",
-            method: "get",
-            responseType: "blob",
+            url: '/api/blade-manager/wbsTreeContract/download-excel',
+            method: 'get',
+            responseType: 'blob',
             params: form,
-        });
+        })
     },
     //导入模板
     async importExcel(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/import-excel",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/import-excel',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //计算含水率
     async calculateWater(form) {
         return HcApi({
-            url: "/api/blade-manager/mixProportion/calculateWater",
-            method: "post",
+            url: '/api/blade-manager/mixProportion/calculateWater',
+            method: 'post',
             data: form,
-        });
+        })
     },
 
     //批量保存
     async save_nodeId(form) {
         return HcApi({
-            url: "/api/blade-manager/exceltab/save_nodeId",
-            method: "post",
+            url: '/api/blade-manager/exceltab/save_nodeId',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //批量隐藏节点
     async updateNodeStates(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/updateNodeStates",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/updateNodeStates',
+            method: 'post',
             params: form,
-        });
+        })
     },
     //获取图纸
     async getTreeDrawings(form) {
         return HcApi({
-            url: "/api/blade-business/contractTreeDrawings/getTreeDrawings",
-            method: "get",
+            url: '/api/blade-business/contractTreeDrawings/getTreeDrawings',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //保存用户填报历史
     async saveUserHistory(form) {
         return HcApi({
-            url: "/api/blade-manager/userHistory/saveUserHistory",
-            method: "post",
+            url: '/api/blade-manager/userHistory/saveUserHistory',
+            method: 'post',
             data: form,
-        });
+        })
     },
     //回到上次填报历史
     async getUserHistory(form) {
         return HcApi({
-            url: "/api/blade-manager/userHistory/getUserHistory",
-            method: "get",
+            url: '/api/blade-manager/userHistory/getUserHistory',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //评定汇总
     async evaluateTotal(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/evaluate",
-            method: "get",
+            url: '/api/blade-manager/formula/evaluate',
+            method: 'get',
             params: form,
-        });
+        })
     },
     async evaluateTotalNew(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/newEvaluate",
-            method: "get",
+            url: '/api/blade-manager/formula/newEvaluate',
+            method: 'get',
             params: form,
-        });
+        })
     },
     async evaluateIsWater(form) {
         return HcApi({
-            url: "/api/blade-manager/formula/isWaterProject",
-            method: "get",
+            url: '/api/blade-manager/formula/isWaterProject',
+            method: 'get',
             params: form,
-        });
+        })
     },
     //排序
     async formTableSort(form) {
         return HcApi({
-            url: "/api/blade-manager/wbsTreeContract/table-sort",
-            method: "post",
+            url: '/api/blade-manager/wbsTreeContract/table-sort',
+            method: 'post',
             data: form,
-        });
+        })
     },
-};
+    //删除节点前
+    async removeContractTreeNodeJudge(form) {
+        return HcApi({
+            url: '/api/blade-business/informationWriteQuery/removeContractTreeNodeJudge',
+            method: 'post',
+            params: form,
+        })
+    },
+}

+ 2 - 2
src/config/index.json

@@ -1,10 +1,10 @@
 {
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
-    "target": "http://39.108.216.210:8090",
+    "target2": "http://39.108.216.210:8090",
     "target3": "http://192.168.0.125:8090",
     "target4": "http://183.247.216.148:28090",
-    "target5": "http://192.168.0.196:8090",
+    "target": "http://192.168.0.196:8090",
     "socket": "wss://measure.hczcxx.cn/websocket",
     "socket2": "ws://192.168.0.125:9527/websocket",
     "localModel": false,

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 677 - 660
src/views/data-fill/wbs.vue


+ 8 - 8
yarn.lock

@@ -2008,10 +2008,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.3.7:
-  version "4.3.7"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.3.7.tgz#d0091ec79fe70df7429017ca383d9597dffaaead"
-  integrity sha512-mvHHg1MJIx9qvEstSxwOxkblYXhr9y2yZVwUrrZ4WQwOVfqv+Za/C9q99jJYCNaSuQFPKW4qpR5v1b1H/NHbAA==
+hc-vue3-ui@^4.3.8:
+  version "4.3.8"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.3.8.tgz#931190300daccf62e833eea0c521466c3cda8500"
+  integrity sha512-hLOVW9t9AYVetEAzK+CDgFlsStgVdz37ll6Fjwgw3uOSshwMJZUdKLpHOYAk0/fscKVTrTUwV/IUc8DaEuLwiA==
   dependencies:
     axios "^1.7.7"
     dayjs "^1.11.13"
@@ -3068,10 +3068,10 @@ utrie@^1.0.2:
   dependencies:
     base64-arraybuffer "^1.0.2"
 
-vite@^5.4.8:
-  version "5.4.8"
-  resolved "http://39.108.216.210:9000/vite/-/vite-5.4.8.tgz#af548ce1c211b2785478d3ba3e8da51e39a287e8"
-  integrity sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==
+vite@^5.4.9:
+  version "5.4.9"
+  resolved "http://39.108.216.210:9000/vite/-/vite-5.4.9.tgz#215c80cbebfd09ccbb9ceb8c0621391c9abdc19c"
+  integrity sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно