merge

src/views/data/analysis/components/analysisDataDialog.vue

@@ -162,34 +162,17 @@ const { RESULT_ACHIEVE_STATUS, TASK_ACHIEVE_STATUS, PERFORMANCE_TYPE, PERFORMANC
   'PERFORMANCE_TYPE'
 );
 const props = defineProps({
-  // 演示使用 增加了modelValue
-  modelValue: {
-    type: Boolean,
-    default: false,
-  },
   analysisData: {
     type: Object,
     default: () => {},
   },
 });
-// 演示使用 增加了watch
-watch(
-  () => props.modelValue,
-  (val: boolean) => {
-    if (val) {
-      diaVisible.value = true;
-    } else {
-      diaVisible.value = false;
-    }
-  }
-);
 
 const cloumnWidth = ref('200');
 
 const checkTableRef = ref();
 
-// 演示使用 true改为了false
-const diaVisible = ref(false);
+const diaVisible = ref(true);
 
 const checkAnalysisList = ref<any>([]);
 const checktableData = ref<any>([]);

src/views/data/analysis/components/calculationFileResult.vue

@@ -21,14 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -38,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {

src/views/data/analysis/components/modelFileResult.vue

@@ -21,14 +21,13 @@
           <div v-else>
             <el-button type="primary" link @click="reviewFun(item)">预览</el-button>
             <el-button type="primary" link @click="downLoadFun(item)">下载</el-button>
-            <el-button type="primary" link @click="compareFun(item)">对比</el-button>
+            <!-- <el-button type="primary" link @click="compareFun(item)">对比</el-button> -->
           </div>
         </div>
       </template>
     </BaseTable>
     <FilePreview v-model="previewVisible" :fileId="fileId"></FilePreview>
-    <!-- 演示使用 v-if改为了v-model -->
-    <compareTextFile v-model="compareVisible" @close="compareVisible = false"></compareTextFile>
+    <!-- <compareTextFile v-if="compareVisible" @close="compareVisible = false"></compareTextFile> -->
   </div>
 </template>
 
@@ -38,7 +37,7 @@ import BaseTable from '@/components/common/table/baseTable.vue';
 import { objectTypeArrayRemovesDuplicates } from '@/utils/common';
 import FilePreview from '@/components/common/filePreview/index.vue';
 import { downloadFileByStream, fileUploadAllocationIconFun } from '@/utils/file';
-import compareTextFile from './compareTextFile.vue';
+// import compareTextFile from './compareTextFile.vue';
 
 const props = defineProps({
   checkTaskInfo: {

src/views/data/analysis/index.vue

@@ -266,9 +266,8 @@
       :run-info="currentRunInfo"
       @close="showRunDetailDialog = false"
     />
-    <!-- 演示使用 v-if改为了v-model -->
     <analysisDataDialog
-      v-model="loadcaseAnalysisVisable"
+      v-if="loadcaseAnalysisVisable"
       @close="closeAnalysisFun"
       :analysis-data="selectAnalysisData"
     />

src/views/task/execution/components/leftTaskTree/index.vue

@@ -113,13 +113,13 @@
         >
           <el-icon> <CirclePlus /> </el-icon>新建算例
         </p>
-        <p
+        <!-- <p
           class="menuButton"
           v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK"
           @click="showDiaFun('updateTask')"
         >
           <el-icon> <Operation /> </el-icon>状态修改
-        </p>
+        </p> -->
         <!-- <p class="menuButton" v-if="rightClickNodeInfo?.nodeType === NODE_TYPE.TASK" @click="showDiaFun('inputParam')">
           <el-icon>
             <SetUp />