From 061ddc16f43a016a19f02b88a934995cb4aae28c Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Wed, 21 Jan 2026 13:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/business/database/material/index.ts   | 11 ++++
 .../src/components/antvx6/echartsModel.vue    |  6 +-
 .../src/components/antvx6/materialmodel.vue   |  4 +-
 .../src/components/antvx6/tableModel.vue      | 60 ++++++++++---------
 .../src/views/business/algorithm/index.vue    |  2 +-
 .../business/database/criticalData/index.vue  |  8 +--
 .../views/business/database/device/index.vue  |  4 +-
 .../business/database/material/index.vue      |  8 ++-
 .../src/views/business/project/index.vue      |  5 +-
 .../src/views/component/scenario/index.vue    |  6 +-
 10 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/business-css/frontend/src/api/business/database/material/index.ts b/business-css/frontend/src/api/business/database/material/index.ts
index 0bf5e00..908cf00 100644
--- a/business-css/frontend/src/api/business/database/material/index.ts
+++ b/business-css/frontend/src/api/business/database/material/index.ts
@@ -12,6 +12,17 @@ export function searchMaterialsPage(queryParams:any){
 
 
 
+
+//拓扑图新增或更新项目
+export function saveOrUpdate(data:any){
+  return request({
+    url:'/materials/saveOrUpdate' ,
+    method: 'Post',
+    data: data
+  });
+}
+
+
 //新增项目
 export function addMaterials(data:any){
   return request({
diff --git a/business-css/frontend/src/components/antvx6/echartsModel.vue b/business-css/frontend/src/components/antvx6/echartsModel.vue
index f5cb537..f3e3b8c 100644
--- a/business-css/frontend/src/components/antvx6/echartsModel.vue
+++ b/business-css/frontend/src/components/antvx6/echartsModel.vue
@@ -117,7 +117,11 @@ const option = ref<any>({
   },
   toolbox: {
     feature: {
-      saveAsImage: {}
+      saveAsImage: {
+          title: '导出图片', // 自定义hover提示文字
+          name: '导出图片', // 自定义导出文件名
+          pixelRatio: 2 // 提高导出图片清晰度（可选）
+        }
     }
   },
   xAxis: {
diff --git a/business-css/frontend/src/components/antvx6/materialmodel.vue b/business-css/frontend/src/components/antvx6/materialmodel.vue
index 7f7ba6b..e2b96ad 100644
--- a/business-css/frontend/src/components/antvx6/materialmodel.vue
+++ b/business-css/frontend/src/components/antvx6/materialmodel.vue
@@ -7,7 +7,7 @@ export default {
 <script setup lang="ts">
 import { onMounted, ref, nextTick } from "vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
-import { searchMaterialsPage, addMaterials,updateMaterials} from "@/api/business/database/material";
+import { searchMaterialsPage, saveOrUpdate} from "@/api/business/database/material";
 
 const emit = defineEmits([ 'closeMaterialModel']);
 
@@ -63,7 +63,7 @@ function confirmClick(formEl: any) {
         moistureContent: info.value.moistureContent,
         customAttrs: JSON.stringify(customAttrsData.value)
       }
-      addMaterials(params).then((res:any) => {
+      saveOrUpdate(params).then((res:any) => {
         if(res == true){
           emit('closeMaterialModel', params) 
         }
diff --git a/business-css/frontend/src/components/antvx6/tableModel.vue b/business-css/frontend/src/components/antvx6/tableModel.vue
index 6891c3e..f4802f7 100644
--- a/business-css/frontend/src/components/antvx6/tableModel.vue
+++ b/business-css/frontend/src/components/antvx6/tableModel.vue
@@ -9,6 +9,7 @@ import { onMounted, ref, nextTick } from "vue";
 import { ElForm, ElMessage, ElMessageBox, selectEmits } from "element-plus";
 import Page from '@/components/Pagination/page.vue'
 import { getByScenario } from "@/api/business/scenario";
+const apiUrl = import.meta.env.VITE_APP_BASE_API; // 基础路径
 const emit = defineEmits([ 'closeEditdevice']);
 
 const props = defineProps({
@@ -76,36 +77,39 @@ onMounted(() => {
 
 <template>
   <div class="editdevice-box">
-      <el-table  :data="scenarioResultData" style="width: 100%; height: calc(100vh - 275px);margin-bottom: 10px;" border
-        :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
-        <el-table-column type="selection" width="50" align="center"></el-table-column>
-        <el-table-column prop="step" label="时间" width="100"></el-table-column>
-        <el-table-column prop="keffValue" label="keff" min-width="100"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'diameter')" prop="diameter" label="直径cm" min-width="100"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'height')" prop="height" label="高度cm" min-width="100"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'width')" prop="width" label="宽度cm" min-width="100"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'length')" prop="length" label="长度cm" min-width="100"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'volume')" prop="volume" label="体积（单位：L）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'flow_rate')" prop="flow_rate" label="流量（单位：m3/h）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'pulse_velocity')" prop="pulse_velocity" label="脉冲速度（单位：Hz）" min-width="160"></el-table-column>
-     
+    <div style="margin-bottom: 10px;display: flex;justify-content: flex-end;">
+      <a :href=" apiUrl + '/scenario-results/exportResultsAsExcel?scenarioId='+props.scenarioId+'&deviceId='+props.deviceId" target="_blank" rel="noopener noreferrer">
+        <el-button  type="primary">导出</el-button>   
+      </a>
+    </div>
 
+    <el-table  :data="scenarioResultData" style="width: 100%; height: calc(100vh - 315px);margin-bottom: 10px;" border
+      :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
+      <el-table-column type="selection" width="50" align="center"></el-table-column>
+      <el-table-column prop="step" label="时间" width="100"></el-table-column>
+      <el-table-column prop="keffValue" label="keff" min-width="100"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'diameter')" prop="diameter" label="直径cm" min-width="100"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'height')" prop="height" label="高度cm" min-width="100"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'width')" prop="width" label="宽度cm" min-width="100"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'length')" prop="length" label="长度cm" min-width="100"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'volume')" prop="volume" label="体积（单位：L）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'flow_rate')" prop="flow_rate" label="流量（单位：m3/h）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'pulse_velocity')" prop="pulse_velocity" label="脉冲速度（单位：Hz）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'u_concentration')" prop="u_concentration" label="铀浓度（g/L）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'uo2_density')" prop="uo2_density" label="氧化铀密度（g/cm3）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'u_enrichment')" prop="u_enrichment" label="铀富集度（%）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'pu_concentration')" prop="pu_concentration" label="钚浓度（g/L）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'puo2_density')" prop="puo2_density" label="氧化钚密度（g/cm3）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'pu_isotope')" prop="pu_isotope" label="钚同位素比例（PU-240占比）%" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'hno3_acidity')" prop="hno3_acidity" label="硝酸酸度（mol/L）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'h2c2o4_concentration')" prop="h2c2o4_concentration" label="草酸浓度（mol/L）" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'organic_ratio')" prop="organic_ratio" label="有机相比例%" min-width="160"></el-table-column>
+      <el-table-column v-if="getIf(selectData,'moisture_content')" prop="moisture_content" label="含水率%" min-width="160"></el-table-column>
+    </el-table>
+    <div  style="display: flex; justify-content: flex-end;">
+    <Page :total="total" v-model:size="queryParams.size" v-model:current="queryParams.current" @pagination="getScenarioResults" ></Page>
 
-        <el-table-column v-if="getIf(selectData,'u_concentration')" prop="u_concentration" label="铀浓度（g/L）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'uo2_density')" prop="uo2_density" label="氧化铀密度（g/cm3）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'u_enrichment')" prop="u_enrichment" label="铀富集度（%）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'pu_concentration')" prop="pu_concentration" label="钚浓度（g/L）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'puo2_density')" prop="puo2_density" label="氧化钚密度（g/cm3）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'pu_isotope')" prop="pu_isotope" label="钚同位素比例（PU-240占比）%" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'hno3_acidity')" prop="hno3_acidity" label="硝酸酸度（mol/L）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'h2c2o4_concentration')" prop="h2c2o4_concentration" label="草酸浓度（mol/L）" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'organic_ratio')" prop="organic_ratio" label="有机相比例%" min-width="160"></el-table-column>
-        <el-table-column v-if="getIf(selectData,'moisture_content')" prop="moisture_content" label="含水率%" min-width="160"></el-table-column>
-      </el-table>
-      <div  style="display: flex; justify-content: flex-end;">
-      <Page :total="total" v-model:size="queryParams.size" v-model:current="queryParams.current" @pagination="getScenarioResults" ></Page>
-
-      </div>
+    </div>
     
   </div>
 
diff --git a/business-css/frontend/src/views/business/algorithm/index.vue b/business-css/frontend/src/views/business/algorithm/index.vue
index 6a90c38..2b1b362 100644
--- a/business-css/frontend/src/views/business/algorithm/index.vue
+++ b/business-css/frontend/src/views/business/algorithm/index.vue
@@ -252,7 +252,7 @@ function changeStatus(row: any) {
             {{ dateFormat(scope.row.updatedAt) }}
           </template>
         </el-table-column>
-        <el-table-column prop="updatedAt" label="是否激活" width="90" align="center">
+        <el-table-column prop="status" label="是否激活" width="90" align="center">
           <template #default="scope">
             <el-switch
               v-model="scope.row.status"
diff --git a/business-css/frontend/src/views/business/database/criticalData/index.vue b/business-css/frontend/src/views/business/database/criticalData/index.vue
index bad3804..be5c068 100644
--- a/business-css/frontend/src/views/business/database/criticalData/index.vue
+++ b/business-css/frontend/src/views/business/database/criticalData/index.vue
@@ -295,8 +295,8 @@ onMounted(() => {
       <div
         style="display: flex;display: -webkit-flex; justify-content: space-between; -webkit-justify-content: space-between;margin-bottom: 10px">
         <div style="display: flex;display: -webkit-flex;">
-          <el-input v-model="input" placeholder="请输入设备名称" @keyup.enter="gettableData" style="width: 200px" clearable />
-          <el-button type="primary" style="margin-left: 10px" @click="gettableData">搜索</el-button>
+          <!-- <el-input v-model="input" placeholder="请输入设备名称" @keyup.enter="gettableData" style="width: 200px" clearable />
+          <el-button type="primary" style="margin-left: 10px" @click="gettableData">搜索</el-button> -->
         </div>
         <div style="display: flex;display: -webkit-flex;">
           <el-button  type="primary" @click="addClick">
@@ -329,9 +329,9 @@ onMounted(() => {
         <el-table-column prop="isotopicAbundance" label="同位素丰度" min-width="100"></el-table-column>
         <el-table-column prop="keffValue" label="对应Keff值" min-width="100"></el-table-column>
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
-        <el-table-column prop="updatedAt" label="创建时间" width="200">
+        <el-table-column prop="createdAt" label="创建时间" width="200">
           <template #default="scope">
-            {{ dateFormat(scope.row.updatedAt) }}
+            {{ dateFormat(scope.row.createdAt) }}
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="80" align="center">
diff --git a/business-css/frontend/src/views/business/database/device/index.vue b/business-css/frontend/src/views/business/database/device/index.vue
index 4913386..51fe37d 100644
--- a/business-css/frontend/src/views/business/database/device/index.vue
+++ b/business-css/frontend/src/views/business/database/device/index.vue
@@ -427,9 +427,9 @@ onMounted(() => {
 
 
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
-        <el-table-column prop="updatedAt" label="创建时间" width="200">
+        <el-table-column prop="createdAt" label="创建时间" width="200">
           <template #default="scope">
-            {{ dateFormat(scope.row.updatedAt) }}
+            {{ dateFormat(scope.row.createdAt) }}
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="80" align="center">
diff --git a/business-css/frontend/src/views/business/database/material/index.vue b/business-css/frontend/src/views/business/database/material/index.vue
index 9cd3e05..d84726c 100644
--- a/business-css/frontend/src/views/business/database/material/index.vue
+++ b/business-css/frontend/src/views/business/database/material/index.vue
@@ -189,8 +189,10 @@ function editClick(row: any) {
   title.value = "修改物料数据";
   info.value = JSON.parse(JSON.stringify(row));
 
-  if(row.customAttrs != null){
+  if(row.customAttrs != null && row.customAttrs != ""){
     customAttrsData.value = JSON.parse(row.customAttrs);
+  }else{
+    customAttrsData.value = []
   }
   dialogVisible.value = true;
 }
@@ -337,9 +339,9 @@ onMounted(() => {
         <el-table-column prop="name" label="物料名称" min-width="180"></el-table-column>
         <!-- <el-table-column prop="description" label="物料数据描述" min-width="100"></el-table-column> -->
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
-        <el-table-column prop="updatedAt" label="创建时间" width="200">
+        <el-table-column prop="createdAt" label="创建时间" width="200">
           <template #default="scope">
-            {{ dateFormat(scope.row.updatedAt) }}
+            {{ dateFormat(scope.row.createdAt) }}
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="80" align="center">
diff --git a/business-css/frontend/src/views/business/project/index.vue b/business-css/frontend/src/views/business/project/index.vue
index 16443e8..6ef0879 100644
--- a/business-css/frontend/src/views/business/project/index.vue
+++ b/business-css/frontend/src/views/business/project/index.vue
@@ -88,6 +88,7 @@ function confirmClick(formEl: any) {
       } else if (info.value.projectId) {
         const params = {
           name: info.value.name,
+          code: info.value.code,
           description: info.value.description,
           projectId: info.value.projectId,          
         };
@@ -227,9 +228,9 @@ function closeAntvx6() {
         <el-table-column prop="name" label="项目名称" width="180"></el-table-column>
         <el-table-column prop="description" label="项目描述" min-width="100"></el-table-column>
         <el-table-column prop="modifier" label="创建人" width="120"></el-table-column>
-        <el-table-column prop="updatedAt" label="创建时间" width="200">
+        <el-table-column prop="createdAt" label="创建时间" width="200">
           <template #default="scope">
-            {{ dateFormat(scope.row.updatedAt) }}
+            {{ dateFormat(scope.row.createdAt) }}
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="190">
diff --git a/business-css/frontend/src/views/component/scenario/index.vue b/business-css/frontend/src/views/component/scenario/index.vue
index 6b080ae..ba89053 100644
--- a/business-css/frontend/src/views/component/scenario/index.vue
+++ b/business-css/frontend/src/views/component/scenario/index.vue
@@ -366,11 +366,11 @@ function changeShowResult(isShow:boolean){ // 切换显示结果模型
         :header-cell-style="{ background: 'rgb(250 250 250)', color: '#383838', height: '50px' }">
         <el-table-column type="selection" width="50" align="center"></el-table-column>
         <el-table-column prop="name" label="事故情景名称" min-width="180"></el-table-column>
-        <el-table-column prop="name" label="算法模型" min-width="180"></el-table-column>
+        <el-table-column prop="algorithmType" label="算法模型" min-width="180"></el-table-column>
 
-         <el-table-column prop="updatedAt" label="模拟时间" width="200">
+         <el-table-column prop="createdAt" label="模拟时间" width="200">
           <template #default="scope">
-            <span v-if="scope.row.updatedAt != null">{{ dateFormat(scope.row.updatedAt) }}</span>  
+            <span v-if="scope.row.createdAt != null">{{ dateFormat(scope.row.createdAt) }}</span>  
             <span v-else>--</span>
           </template>
         </el-table-column>