2d4ee12d by lihua

修改匿名化问题

1 parent 9f888656
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description="" 52 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description=""
53 style="margin-top: 16px;"> 53 style="margin-top: 16px;">
54 <div class="folder-main"> 54 <div class="folder-main">
55 <el-button v-show="!clickSelectNode.path && !Object.keys(dicomStatisticsData)?.length" :icon="Upload" 55 <el-button v-show="!selectCurrPath && !Object.keys(dicomStatisticsData)?.length" :icon="Upload"
56 class="mr8" @click=uploadFolder>上传文件</el-button> 56 class="mr8" @click=uploadFolder>上传文件</el-button>
57 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick"> 57 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick">
58 <template #extra-content> 58 <template #extra-content>
...@@ -71,12 +71,12 @@ ...@@ -71,12 +71,12 @@
71 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div> 71 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div>
72 </template> 72 </template>
73 </Dialog> 73 </Dialog>
74 <div v-show="clickSelectNode.path && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' + 74 <div v-show="selectCurrPath && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' +
75 (clickSelectNode.path || '--') }} 75 (selectCurrPath || '--') }}
76 </div> 76 </div>
77 <!-- 正在扫描的状态 --> 77 <!-- 正在扫描的状态 -->
78 <div class="folder-progress" 78 <div class="folder-progress"
79 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)"> 79 v-show="selectCurrPath && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)">
80 <div class="folder-title">正在扫描</div> 80 <div class="folder-title">正在扫描</div>
81 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 81 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
82 :show-text="false" :duration="8" /> 82 :show-text="false" :duration="8" />
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 </div> 88 </div>
89 <!-- 正在解析的状态 --> 89 <!-- 正在解析的状态 -->
90 <div class="folder-progress" 90 <div class="folder-progress"
91 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'R')"> 91 v-show="selectCurrPath && (dicomStatisticsData.state == 'R')">
92 <div class="folder-title">正在解析</div> 92 <div class="folder-title">正在解析</div>
93 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 93 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
94 :show-text="false" :duration="8" /> 94 :show-text="false" :duration="8" />
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div> 101 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div>
102 </div> 102 </div>
103 <!-- 解析失败的状态 --> 103 <!-- 解析失败的状态 -->
104 <div class="folder-progress" v-show="clickSelectNode.path && dicomStatisticsData.state == 'E'"> 104 <div class="folder-progress" v-show="selectCurrPath && dicomStatisticsData.state == 'E'">
105 <div class="folder-title"> 105 <div class="folder-title">
106 <el-icon class="title-icon fail"> 106 <el-icon class="title-icon fail">
107 <CircleCloseFilled /> 107 <CircleCloseFilled />
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 </div> 121 </div>
122 <!-- 解析成功状态 --> 122 <!-- 解析成功状态 -->
123 <div class="folder-progress" 123 <div class="folder-progress"
124 v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0"> 124 v-show="selectCurrPath && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0">
125 <div class="folder-title"> 125 <div class="folder-title">
126 <el-icon class="title-icon success"> 126 <el-icon class="title-icon success">
127 <svg-icon name="icon-success" /> 127 <svg-icon name="icon-success" />
...@@ -137,11 +137,12 @@ ...@@ -137,11 +137,12 @@
137 </div> 137 </div>
138 </div> 138 </div>
139 </div> 139 </div>
140 <div v-show="clickSelectNode.path && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据 140 <!-- 解析成功之后需要显示预览文件,和删除重新上传文件按钮 -->
141 <div v-show="selectCurrPath && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据
141 </div> 142 </div>
142 <Table v-show="clickSelectNode.path && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo"> 143 <Table v-show="selectCurrPath && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo">
143 </Table> 144 </Table>
144 <div v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button 145 <div v-show="selectCurrPath && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button
145 @click=deleteFolder>删除文件,重新上传解析</el-button></div> 146 @click=deleteFolder>删除文件,重新上传解析</el-button></div>
146 </ContentWrap> 147 </ContentWrap>
147 </div> 148 </div>
...@@ -1194,6 +1195,13 @@ const uploadFileDialogInfo = ref({ ...@@ -1194,6 +1195,13 @@ const uploadFileDialogInfo = ref({
1194 contentLoading: false, 1195 contentLoading: false,
1195 }); 1196 });
1196 1197
1198 const selectCurrPath = computed(() => {
1199 if (isBuiltInPath.value) {
1200 return builtInPath.value;
1201 }
1202 return clickSelectNode.value?.path;
1203 })
1204
1197 const folderRefreshTimer = ref(); 1205 const folderRefreshTimer = ref();
1198 1206
1199 const processFolderRefresh = async (isRefresh = false) => { 1207 const processFolderRefresh = async (isRefresh = false) => {
...@@ -1394,6 +1402,7 @@ const uploadFolder = () => { ...@@ -1394,6 +1402,7 @@ const uploadFolder = () => {
1394 const deleteFolder = () => { 1402 const deleteFolder = () => {
1395 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => { 1403 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => {
1396 clickSelectNode.value = {}; 1404 clickSelectNode.value = {};
1405 isBuiltInPath.value = false;
1397 folderFileTableInfo.value.data = []; 1406 folderFileTableInfo.value.data = [];
1398 dicomStatisticsData.value = {}; 1407 dicomStatisticsData.value = {};
1399 }, () => { 1408 }, () => {
...@@ -1590,9 +1599,9 @@ const changeStep = async (val) => { ...@@ -1590,9 +1599,9 @@ const changeStep = async (val) => {
1590 saveParams.dataSourceGuid = null; 1599 saveParams.dataSourceGuid = null;
1591 saveParams.tableName = null; 1600 saveParams.tableName = null;
1592 } else { 1601 } else {
1593 if (saveParams.dataSource == 3 && clickSelectNode.value.path) { 1602 if (saveParams.dataSource == 3 && selectCurrPath.value) {
1594 saveParams.filePath = { 1603 saveParams.filePath = {
1595 url: clickSelectNode.value.path 1604 url: selectCurrPath.value
1596 }; 1605 };
1597 } else { 1606 } else {
1598 saveParams.filePath = null; 1607 saveParams.filePath = null;
...@@ -1705,7 +1714,7 @@ const changeStep = async (val) => { ...@@ -1705,7 +1714,7 @@ const changeStep = async (val) => {
1705 }); 1714 });
1706 } 1715 }
1707 } else { 1716 } else {
1708 if (!clickSelectNode.value.path) { 1717 if (!selectCurrPath.value) {
1709 proxy.$ElMessage.error('请先上传文件'); 1718 proxy.$ElMessage.error('请先上传文件');
1710 return; 1719 return;
1711 } 1720 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!