be589967 by lihua

修改匿名化问题

1 parent bc06177a
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description="" 47 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description=""
48 style="margin-top: 16px;"> 48 style="margin-top: 16px;">
49 <div class="folder-main"> 49 <div class="folder-main">
50 <el-button v-show="!clickSelectNode.path && !Object.keys(dicomStatisticsData)?.length" :icon="Upload" 50 <el-button v-show="!selectCurrPath && !Object.keys(dicomStatisticsData)?.length" :icon="Upload"
51 class="mr8" @click=uploadFolder>上传文件</el-button> 51 class="mr8" @click=uploadFolder>上传文件</el-button>
52 <!-- 弹框展示服务器文件夹目录,并选择 --> 52 <!-- 弹框展示服务器文件夹目录,并选择 -->
53 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick"> 53 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick">
...@@ -67,12 +67,12 @@ ...@@ -67,12 +67,12 @@
67 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div> 67 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div>
68 </template> 68 </template>
69 </Dialog> 69 </Dialog>
70 <div v-show="clickSelectNode.path && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' + 70 <div v-show="selectCurrPath && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' +
71 (clickSelectNode.path || '--') }} 71 (selectCurrPath || '--') }}
72 </div> 72 </div>
73 <!-- 正在扫描的状态 --> 73 <!-- 正在扫描的状态 -->
74 <div class="folder-progress" 74 <div class="folder-progress"
75 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)"> 75 v-show="selectCurrPath && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)">
76 <div class="folder-title">正在扫描</div> 76 <div class="folder-title">正在扫描</div>
77 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 77 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
78 :show-text="false" :duration="8" /> 78 :show-text="false" :duration="8" />
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 </div> 84 </div>
85 <!-- 正在解析的状态 --> 85 <!-- 正在解析的状态 -->
86 <div class="folder-progress" 86 <div class="folder-progress"
87 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'R')"> 87 v-show="selectCurrPath && (dicomStatisticsData.state == 'R')">
88 <div class="folder-title">正在解析</div> 88 <div class="folder-title">正在解析</div>
89 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 89 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
90 :show-text="false" :duration="8" /> 90 :show-text="false" :duration="8" />
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
97 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div> 97 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div>
98 </div> 98 </div>
99 <!-- 解析失败的状态 --> 99 <!-- 解析失败的状态 -->
100 <div class="folder-progress" v-show="clickSelectNode.path && dicomStatisticsData.state == 'E'"> 100 <div class="folder-progress" v-show="selectCurrPath && dicomStatisticsData.state == 'E'">
101 <div class="folder-title"> 101 <div class="folder-title">
102 <el-icon class="title-icon fail"> 102 <el-icon class="title-icon fail">
103 <CircleCloseFilled /> 103 <CircleCloseFilled />
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 </div> 117 </div>
118 <!-- 解析成功状态 --> 118 <!-- 解析成功状态 -->
119 <div class="folder-progress" 119 <div class="folder-progress"
120 v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0"> 120 v-show="selectCurrPath && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0">
121 <div class="folder-title"> 121 <div class="folder-title">
122 <el-icon class="title-icon success"> 122 <el-icon class="title-icon success">
123 <svg-icon name="icon-success" /> 123 <svg-icon name="icon-success" />
...@@ -134,11 +134,11 @@ ...@@ -134,11 +134,11 @@
134 </div> 134 </div>
135 </div> 135 </div>
136 <!-- 解析成功之后需要显示预览文件,和删除重新上传文件按钮 --> 136 <!-- 解析成功之后需要显示预览文件,和删除重新上传文件按钮 -->
137 <div v-show="clickSelectNode.path && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据 137 <div v-show="selectCurrPath && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据
138 </div> 138 </div>
139 <Table v-show="clickSelectNode.path && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo"> 139 <Table v-show="selectCurrPath && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo">
140 </Table> 140 </Table>
141 <div v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button 141 <div v-show="selectCurrPath && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button
142 @click=deleteFolder>删除文件,重新上传解析</el-button></div> 142 @click=deleteFolder>删除文件,重新上传解析</el-button></div>
143 </ContentWrap> 143 </ContentWrap>
144 </div> 144 </div>
...@@ -979,6 +979,13 @@ const uploadFileDialogInfo = ref({ ...@@ -979,6 +979,13 @@ const uploadFileDialogInfo = ref({
979 contentLoading: false, 979 contentLoading: false,
980 }); 980 });
981 981
982 const selectCurrPath = computed(() => {
983 if (isBuiltInPath.value) {
984 return builtInPath.value;
985 }
986 return clickSelectNode.value?.path;
987 })
988
982 const folderRefreshTimer = ref(); 989 const folderRefreshTimer = ref();
983 990
984 const processFolderRefresh = async (isRefresh = false) => { 991 const processFolderRefresh = async (isRefresh = false) => {
...@@ -1179,6 +1186,7 @@ const uploadFolder = () => { ...@@ -1179,6 +1186,7 @@ const uploadFolder = () => {
1179 const deleteFolder = () => { 1186 const deleteFolder = () => {
1180 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => { 1187 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => {
1181 clickSelectNode.value = {}; 1188 clickSelectNode.value = {};
1189 isBuiltInPath.value = false;
1182 folderFileTableInfo.value.data = []; 1190 folderFileTableInfo.value.data = [];
1183 dicomStatisticsData.value = {}; 1191 dicomStatisticsData.value = {};
1184 }, () => { 1192 }, () => {
...@@ -1375,9 +1383,9 @@ const changeStepHandlers = { ...@@ -1375,9 +1383,9 @@ const changeStepHandlers = {
1375 saveParams.dataSourceGuid = null; 1383 saveParams.dataSourceGuid = null;
1376 saveParams.tableName = null; 1384 saveParams.tableName = null;
1377 } else { 1385 } else {
1378 if (saveParams.dataSource == 3 && clickSelectNode.value.path) { 1386 if (saveParams.dataSource == 3 && selectCurrPath.value) {
1379 saveParams.filePath = { 1387 saveParams.filePath = {
1380 url: clickSelectNode.value.path 1388 url: selectCurrPath.value
1381 }; 1389 };
1382 } else { 1390 } else {
1383 saveParams.filePath = null; 1391 saveParams.filePath = null;
...@@ -1486,7 +1494,7 @@ const changeStepHandlers = { ...@@ -1486,7 +1494,7 @@ const changeStepHandlers = {
1486 } 1494 }
1487 }); 1495 });
1488 } else { 1496 } else {
1489 if (!clickSelectNode.value.path) { 1497 if (!selectCurrPath.value) {
1490 proxy.$ElMessage.error('请先上传文件'); 1498 proxy.$ElMessage.error('请先上传文件');
1491 return; 1499 return;
1492 } 1500 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!