325e76ab by lihua

修改匿名化问题

1 parent 1c89f529
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description="" 51 <ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description=""
52 style="margin-top: 16px;"> 52 style="margin-top: 16px;">
53 <div class="folder-main"> 53 <div class="folder-main">
54 <el-button v-show="!clickSelectNode.path && !Object.keys(dicomStatisticsData)?.length" :icon="Upload" 54 <el-button v-show="!selectCurrPath && !Object.keys(dicomStatisticsData)?.length" :icon="Upload"
55 class="mr8" @click=uploadFolder>上传文件</el-button> 55 class="mr8" @click=uploadFolder>上传文件</el-button>
56 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick"> 56 <Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick">
57 <template #extra-content> 57 <template #extra-content>
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
70 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div> 70 <div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div>
71 </template> 71 </template>
72 </Dialog> 72 </Dialog>
73 <div v-show="clickSelectNode.path && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' + 73 <div v-show="selectCurrPath && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' +
74 (clickSelectNode.path || '--') }} 74 (selectCurrPath || '--') }}
75 </div> 75 </div>
76 <!-- 正在扫描的状态 --> 76 <!-- 正在扫描的状态 -->
77 <div class="folder-progress" 77 <div class="folder-progress"
78 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)"> 78 v-show="selectCurrPath && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)">
79 <div class="folder-title">正在扫描</div> 79 <div class="folder-title">正在扫描</div>
80 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 80 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
81 :show-text="false" :duration="8" /> 81 :show-text="false" :duration="8" />
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 </div> 87 </div>
88 <!-- 正在解析的状态 --> 88 <!-- 正在解析的状态 -->
89 <div class="folder-progress" 89 <div class="folder-progress"
90 v-show="clickSelectNode.path && (dicomStatisticsData.state == 'R')"> 90 v-show="selectCurrPath && (dicomStatisticsData.state == 'R')">
91 <div class="folder-title">正在解析</div> 91 <div class="folder-title">正在解析</div>
92 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow 92 <el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
93 :show-text="false" :duration="8" /> 93 :show-text="false" :duration="8" />
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div> 100 <div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div>
101 </div> 101 </div>
102 <!-- 解析失败的状态 --> 102 <!-- 解析失败的状态 -->
103 <div class="folder-progress" v-show="clickSelectNode.path && dicomStatisticsData.state == 'E'"> 103 <div class="folder-progress" v-show="selectCurrPath && dicomStatisticsData.state == 'E'">
104 <div class="folder-title"> 104 <div class="folder-title">
105 <el-icon class="title-icon fail"> 105 <el-icon class="title-icon fail">
106 <CircleCloseFilled /> 106 <CircleCloseFilled />
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 </div> 120 </div>
121 <!-- 解析成功状态 --> 121 <!-- 解析成功状态 -->
122 <div class="folder-progress" 122 <div class="folder-progress"
123 v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0"> 123 v-show="selectCurrPath && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0">
124 <div class="folder-title"> 124 <div class="folder-title">
125 <el-icon class="title-icon success"> 125 <el-icon class="title-icon success">
126 <svg-icon name="icon-success" /> 126 <svg-icon name="icon-success" />
...@@ -136,11 +136,12 @@ ...@@ -136,11 +136,12 @@
136 </div> 136 </div>
137 </div> 137 </div>
138 </div> 138 </div>
139 <div v-show="clickSelectNode.path && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据 139 <!-- 解析成功之后需要显示预览文件,和删除重新上传文件按钮 -->
140 <div v-show="selectCurrPath && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据
140 </div> 141 </div>
141 <Table v-show="clickSelectNode.path && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo"> 142 <Table v-show="selectCurrPath && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo">
142 </Table> 143 </Table>
143 <div v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button 144 <div v-show="selectCurrPath && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button
144 @click=deleteFolder>删除文件,重新上传解析</el-button></div> 145 @click=deleteFolder>删除文件,重新上传解析</el-button></div>
145 </ContentWrap> 146 </ContentWrap>
146 </div> 147 </div>
...@@ -1023,6 +1024,13 @@ const uploadFileDialogInfo = ref({ ...@@ -1023,6 +1024,13 @@ const uploadFileDialogInfo = ref({
1023 contentLoading: false, 1024 contentLoading: false,
1024 }); 1025 });
1025 1026
1027 const selectCurrPath = computed(() => {
1028 if (isBuiltInPath.value) {
1029 return builtInPath.value;
1030 }
1031 return clickSelectNode.value?.path;
1032 })
1033
1026 const folderRefreshTimer = ref(); 1034 const folderRefreshTimer = ref();
1027 1035
1028 const processFolderRefresh = async (isRefresh = false) => { 1036 const processFolderRefresh = async (isRefresh = false) => {
...@@ -1223,6 +1231,7 @@ const uploadFolder = () => { ...@@ -1223,6 +1231,7 @@ const uploadFolder = () => {
1223 const deleteFolder = () => { 1231 const deleteFolder = () => {
1224 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => { 1232 proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => {
1225 clickSelectNode.value = {}; 1233 clickSelectNode.value = {};
1234 isBuiltInPath.value = false;
1226 folderFileTableInfo.value.data = []; 1235 folderFileTableInfo.value.data = [];
1227 dicomStatisticsData.value = {}; 1236 dicomStatisticsData.value = {};
1228 }, () => { 1237 }, () => {
...@@ -1414,9 +1423,9 @@ const changeStep = async (val) => { ...@@ -1414,9 +1423,9 @@ const changeStep = async (val) => {
1414 saveParams.dataSourceGuid = null; 1423 saveParams.dataSourceGuid = null;
1415 saveParams.tableName = null; 1424 saveParams.tableName = null;
1416 } else { 1425 } else {
1417 if (saveParams.dataSource == 3 && clickSelectNode.value.path) { 1426 if (saveParams.dataSource == 3 && selectCurrPath.value) {
1418 saveParams.filePath = { 1427 saveParams.filePath = {
1419 url: clickSelectNode.value.path 1428 url: selectCurrPath.value
1420 }; 1429 };
1421 } else { 1430 } else {
1422 saveParams.filePath = null; 1431 saveParams.filePath = null;
...@@ -1525,7 +1534,7 @@ const changeStep = async (val) => { ...@@ -1525,7 +1534,7 @@ const changeStep = async (val) => {
1525 } 1534 }
1526 }); 1535 });
1527 } else { 1536 } else {
1528 if (!clickSelectNode.value.path) { 1537 if (!selectCurrPath.value) {
1529 proxy.$ElMessage.error('请先上传文件'); 1538 proxy.$ElMessage.error('请先上传文件');
1530 return; 1539 return;
1531 } 1540 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!