be589967 by lihua

修改匿名化问题

1 parent bc06177a
......@@ -47,7 +47,7 @@
<ContentWrap v-show="formRef?.formInline?.dataSource == 3" id="id-folder" title="提取文件" description=""
style="margin-top: 16px;">
<div class="folder-main">
<el-button v-show="!clickSelectNode.path && !Object.keys(dicomStatisticsData)?.length" :icon="Upload"
<el-button v-show="!selectCurrPath && !Object.keys(dicomStatisticsData)?.length" :icon="Upload"
class="mr8" @click=uploadFolder>上传文件</el-button>
<!-- 弹框展示服务器文件夹目录,并选择 -->
<Dialog ref="dialogRef" :dialog-info="uploadFileDialogInfo" @btnClick="dialogBtnClick">
......@@ -67,12 +67,12 @@
<div v-show="isBuiltInPath" class="builtIn-folder-foot">{{ '内置文件夹路径:' + (builtInPath || '--') }}</div>
</template>
</Dialog>
<div v-show="clickSelectNode.path && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' +
(clickSelectNode.path || '--') }}
<div v-show="selectCurrPath && dicomStatisticsData.state" class="folder-foot">{{ '当前提取文件夹路径:' +
(selectCurrPath || '--') }}
</div>
<!-- 正在扫描的状态 -->
<div class="folder-progress"
v-show="clickSelectNode.path && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)">
v-show="selectCurrPath && (dicomStatisticsData.state == 'S' || !Object.keys(dicomStatisticsData)?.length)">
<div class="folder-title">正在扫描</div>
<el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
:show-text="false" :duration="8" />
......@@ -84,7 +84,7 @@
</div>
<!-- 正在解析的状态 -->
<div class="folder-progress"
v-show="clickSelectNode.path && (dicomStatisticsData.state == 'R')">
v-show="selectCurrPath && (dicomStatisticsData.state == 'R')">
<div class="folder-title">正在解析</div>
<el-progress :percentage="!dicomStatisticsData.progress ? 0 : changeNum(dicomStatisticsData.progress, 2)" :stroke-width="12" striped striped-flow
:show-text="false" :duration="8" />
......@@ -97,7 +97,7 @@
<div style="display: flex;justify-content: center;margin-top: 4px;"><el-button :icon="RefreshRight" link @click="refreshFolderResult" v-preReClick>刷新进度</el-button></div>
</div>
<!-- 解析失败的状态 -->
<div class="folder-progress" v-show="clickSelectNode.path && dicomStatisticsData.state == 'E'">
<div class="folder-progress" v-show="selectCurrPath && dicomStatisticsData.state == 'E'">
<div class="folder-title">
<el-icon class="title-icon fail">
<CircleCloseFilled />
......@@ -117,7 +117,7 @@
</div>
<!-- 解析成功状态 -->
<div class="folder-progress"
v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0">
v-show="selectCurrPath && dicomStatisticsData.state == 'Y' && dicomStatisticsData.errorCount === 0">
<div class="folder-title">
<el-icon class="title-icon success">
<svg-icon name="icon-success" />
......@@ -134,11 +134,11 @@
</div>
</div>
<!-- 解析成功之后需要显示预览文件,和删除重新上传文件按钮 -->
<div v-show="clickSelectNode.path && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据
<div v-show="selectCurrPath && folderFileTableInfo.data?.length" class="preview-title">预览文件仅展示5条数据
</div>
<Table v-show="clickSelectNode.path && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo">
<Table v-show="selectCurrPath && folderFileTableInfo.data?.length" :tableInfo="folderFileTableInfo">
</Table>
<div v-show="clickSelectNode.path && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button
<div v-show="selectCurrPath && dicomStatisticsData.state == 'Y'" class="folder-bottom"><el-button
@click=deleteFolder>删除文件,重新上传解析</el-button></div>
</ContentWrap>
</div>
......@@ -979,6 +979,13 @@ const uploadFileDialogInfo = ref({
contentLoading: false,
});
const selectCurrPath = computed(() => {
if (isBuiltInPath.value) {
return builtInPath.value;
}
return clickSelectNode.value?.path;
})
const folderRefreshTimer = ref();
const processFolderRefresh = async (isRefresh = false) => {
......@@ -1179,6 +1186,7 @@ const uploadFolder = () => {
const deleteFolder = () => {
proxy.$openMessageBox("确定要删除该文件夹扫描解析结果,重新上传吗?", () => {
clickSelectNode.value = {};
isBuiltInPath.value = false;
folderFileTableInfo.value.data = [];
dicomStatisticsData.value = {};
}, () => {
......@@ -1375,9 +1383,9 @@ const changeStepHandlers = {
saveParams.dataSourceGuid = null;
saveParams.tableName = null;
} else {
if (saveParams.dataSource == 3 && clickSelectNode.value.path) {
if (saveParams.dataSource == 3 && selectCurrPath.value) {
saveParams.filePath = {
url: clickSelectNode.value.path
url: selectCurrPath.value
};
} else {
saveParams.filePath = null;
......@@ -1486,7 +1494,7 @@ const changeStepHandlers = {
}
});
} else {
if (!clickSelectNode.value.path) {
if (!selectCurrPath.value) {
proxy.$ElMessage.error('请先上传文件');
return;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!