Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into development-business-css

business-css/frontend/.env.development

@@ -6,3 +6,4 @@ NODE_ENV='development'
 VITE_APP_TITLE = '临界事故情景分析模拟系统'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/dev-api'
+VITE_APP_BASE_HTTP = 'http://localhost:3000'

business-css/frontend/.env.production

@@ -4,3 +4,4 @@ NODE_ENV='production'
 VITE_APP_TITLE = 'NewFrameWork2023-WEB'
 VITE_APP_PORT = 3000
 VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_HTTP = 'http://localhost:3000'

business-css/frontend/src/api/business/event/index.ts

@@ -1,13 +1,13 @@
 import request from '@/utils/request';
 
 // //获取所有项目列表
-// export function searchScenariosLsit(queryParams:any){
+export function searchEventsByScenarioId(queryParams:any){
-//   return request({
+  return request({
-//     url: '/events/by-project' ,
+    url: '/events/by-scenario' ,
-//     method: 'get',
+    method: 'get',
-//     params:queryParams
+    params:queryParams
-//   });
+  });
-// }
+}
 
 
 

business-css/frontend/src/components/antvx6/changesettings.vue

@@ -56,13 +56,6 @@ if(deviceTypetype.value == ''){
       deviceList.value = res.data;
     }
   })
-// topologyDevicesLsit(params).then((result:any) => {
-//   deviceList.value = result.records;
-// }).catch((err) => {
-
-// });
-
-
 }
 
 

business-css/frontend/src/components/antvx6/echartsModel.vue

@@ -0,0 +1,218 @@
+<!--  线 + 柱混合图 -->
+<template>
+  <div id="chartContainer" :class="className"  style="height: calc(100vh - 200px); width: 100%;" />
+</template>
+
+<script setup lang="ts">
+import {
+  ref,
+  nextTick,
+  onActivated,
+  onBeforeUnmount,
+  onDeactivated,
+  onMounted,
+} from 'vue';
+import { init, EChartsOption } from 'echarts';
+import { getByScenario } from "@/api/business/scenario";
+
+import * as echarts from 'echarts';
+import resize from '@/utils/resize';
+
+const props = defineProps({
+  deviceId: {
+    required: false,
+    type: String,
+    default: ''
+  },
+  scenarioId: {
+    required: false,
+    type: String,
+    default: ''
+  },
+  className: {
+    type: String,
+    default: '',
+  }
+});
+
+const { mounted, chart, beforeDestroy, activated, deactivated } = resize();
+function getName(code:any) {
+  let name = ''
+  switch (code) {
+    case 'width':
+     return name = "宽度cm";
+      break; 
+    case 'height':
+     return name = "高度cm";
+      break; 
+    case 'length':
+     return name = "长度cm";
+      break;   
+    case 'diameter':
+     return name = "外径cm";
+      break;            
+    case 'volume':
+     return name = "体积（单位：L）";
+      break; 
+    case 'flow_rate':
+     return name = "流量（单位：m3/h）";
+      break; 
+    case 'pulse_velocity':
+     return name = "脉冲速度（单位：Hz）";
+      break; 
+    case 'u_concentration':
+     return name = "铀浓度（g/L）";
+      break; 
+    case 'uo2_density':
+     return name = "氧化铀密度（g/cm3）";
+      break; 
+    case 'u_enrichment':
+     return name = "铀富集度（%）";
+      break; 
+    case 'pu_concentration':
+     return name = "钚浓度（g/L）";
+      break; 
+    case 'puo2_density':
+     return name = "氧化钚密度（g/cm3）";
+      break; 
+    case 'pu_isotope':
+     return name = "钚同位素比例（PU-240占比）%";
+      break; 
+    case 'hno3_acidity':
+     return name = "硝酸酸度（mol/L）";
+      break; 
+    case 'h2c2o4_concentration':
+     return name = "草酸浓度（mol/L）";
+      break; 
+    case 'organic_ratio':
+     return name = "有机相比例%";
+      break; 
+    case 'moisture_content':
+     return name = "含水率%";
+      break; 
+    default: 
+     return name = "";
+  } 
+    return name
+  }
+const option = ref<any>({
+  title: {
+    text: ''
+  },
+  tooltip: {
+    trigger: 'axis'
+  },
+  legend: {
+    data: []
+  },
+  grid: {
+    left: '3%',
+    right: '4%',
+    bottom: '3%',
+    containLabel: true
+  },
+  toolbox: {
+    feature: {
+      saveAsImage: {}
+    }
+  },
+  xAxis: {
+    type: 'category',
+    boundaryGap: false,
+    data: []
+  },
+  yAxis: {
+    type: 'value'
+  },
+  series: [
+  ]
+});
+function getScenarioResults(){
+  getByScenario({
+    scenarioId: props.scenarioId,
+    deviceId: props.deviceId,
+    pageNum:1,
+    pageSize:999
+  }).then((res:any) => {
+    option.value.xAxis.data = []
+    option.value.series = []
+    option.value.legend.data = []
+
+   let tempData = ['keff']
+   for(let i = 0;i<res.data.records.length;i++){
+    let tempAttrState = []
+    if(res.data.records[i].attrState != null){
+    
+       if(i === 0){
+          option.value.series.push({
+          name: 'keff',
+          type: 'line',
+          data:[]
+          })
+       }
+      tempAttrState.push({
+        name: 'keff',
+        value: res.data.records[i].keffValue,
+      })
+      let attrState = JSON.parse(res.data.records[i].attrState)
+      for (const key in attrState) {
+        if (!Object.hasOwn(attrState, key)) continue;
+        const element = attrState[key];
+        res.data.records[i][key] = element
+        if(i === 0){
+          tempData.push(getName(key) )
+          option.value.series.push({
+            name: getName(key),
+            type: 'line',
+            data:[]
+          })
+          
+        }
+ 
+        tempAttrState.push({
+          name: getName(key),
+          value: element,
+        })
+      }
+      if(i === 0 ){
+        option.value.legend.data = tempData
+      }
+    }
+    
+    option.value.xAxis.data.push(res.data.records[i].step)
+    for(let j = 0;j<tempAttrState.length;j++){
+      option.value.series[j].data.push(tempAttrState[j].value)   
+    }
+ 
+   }
+
+    initChart(option.value);
+  })
+}
+function initChart(option:any) {
+  const barChart = init(document.getElementById('chartContainer') as HTMLDivElement);
+
+  barChart.setOption(option);
+  chart.value = barChart;
+}
+
+onBeforeUnmount(() => {
+  beforeDestroy();
+});
+
+onActivated(() => {
+  activated();
+});
+
+onDeactivated(() => {
+  deactivated();
+});
+
+onMounted(() => {
+  mounted();
+  nextTick(() => {
+    
+    getScenarioResults()
+  });
+});
+</script>

business-css/frontend/src/components/antvx6/tableModel.vue

@@ -6,7 +6,8 @@ export default {
 
 <script setup lang="ts">
 import { onMounted, ref, nextTick } from "vue";
-import { ElForm, ElMessage, ElMessageBox } from "element-plus";
+import { ElForm, ElMessage, ElMessageBox, selectEmits } from "element-plus";
+import Page from '@/components/Pagination/page.vue'
 import { getByScenario } from "@/api/business/scenario";
 const emit = defineEmits([ 'closeEditdevice']);
 
@@ -23,16 +24,47 @@ const props = defineProps({
   },
 
 })
+const queryParams = ref({
+  current: 1,
+  size: 10,
+})
+const total = ref(0)
 const scenarioResultData:any = ref([]) 
+
+const selectData = ref<any>([])
+function  getIf(list:any,code:any){
+  for(let i = 0;i<list.length;i++){
+    if(list[i] == code){
+      return true
+    }
+  }
+
+}
 function getScenarioResults(){
   scenarioResultData.value = []
   getByScenario({
     scenarioId: props.scenarioId,
     deviceId: props.deviceId,
-    pageNum:1,
+    pageNum:queryParams.value.current,
-    pageSize:999
+    pageSize:queryParams.value.size
   }).then((res:any) => {
+   for(let i = 0;i<res.data.records.length;i++){
+    if(res.data.records[i].attrState != null){
+      let attrState = JSON.parse(res.data.records[i].attrState)
+      for (const key in attrState) {
+        if (!Object.hasOwn(attrState, key)) continue;
+        const element = attrState[key];
+        res.data.records[i][key] = element
+        if(i == 0){
+          selectData.value.push(key)
+        }
+       
+      }
+      
+    }
+   }
     scenarioResultData.value = res.data.records
+    total.value = res.data.total
   })
 }
 onMounted(() => {
@@ -44,86 +76,41 @@ 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>
      
 
+
+        <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>
 
 </template>
 
 <style scoped>
-.editdevice-box{
+
-  width: 100%;
-  height: calc(100vh - 200px);
-}
-.editdevice_navigation_left{
-  width: 110px;
-  height: 32px;
-  line-height: 32px;
-  text-align: center;
-  cursor: pointer;
-  font-family: 'Arial Normal', 'Arial';
-  font-weight: 400;
-  font-style: normal;
-  font-size: 14px;
-  color: #363636;
-  background-image: url('@/assets/x6/navleft.png');
-}
-.editdevice_navigation_left:hover{
-  color: #266fff ;
-}
-.editdevice_navigation_activeleft{
-  background-image: url('@/assets/x6/navleft_active.png');
-  color: #fff !important;
-}
-.editdevice_navigation_right{
-   width: 110px;
-  height: 32px;
-  line-height: 32px;
-  text-align: center;
-  cursor: pointer;
-  font-family: 'Arial Normal', 'Arial';
-  font-weight: 400;
-  font-style: normal;
-  font-size: 14px;
-  color: #363636;
-  background-image: url('@/assets/x6/navright.png');
-}
-.editdevice_navigation_right:hover{
-  color: #266fff ;
-}
-.editdevice_navigation_activeright{
-  background-image: url('@/assets/x6/navright_active.png');
-  color: #fff !important;
-}
 </style>
-<style>
- .el-table .el-table--enable-row-hover .el-table__body tr:hover > td{
-  background-color: #194764 !important;
-}
-
- .editdevice-box .el-table .el-table__row.current-row td{
-  background-color: #f3faff !important;
-  border-top:1px solid #14aaff;
-  border-bottom:1px solid #14aaff
-}
-.editdevice-box .el-table .el-table__row.current-row td:last-child{
-  border-right:1px solid #14aaff;
-}
-.editdevice-box .el-table .el-table__row.current-row td:first-child{
-  border-left:1px solid #14aaff;
-}
-.editdevice-box .el-table .el-table__row.current-row:last-child td{
-  border-bottom:1px solid #14aaff
-}
-.el-table__inner-wrapper:before{
-  background-color: transparent !important;
-  border-top: 1px solid var(--el-table-border-color);
-}
- .el-table--border:before{
-  background-color: transparent !important;
-  border-top: 1px solid var(--el-table-border-color);
-}
-</style>
-
-
-

business-css/frontend/src/components/antvx6/viewx6.vue

@@ -19,15 +19,10 @@ import { updateProjects,projectsById} from "@/api/business/project";
 
 import { getByScenario } from "@/api/business/scenario";
 import textimg from '@/assets/x6/text.png'
-import chartsimg from '@/assets/x6/charts.png'
+import echartsimg from '@/assets/x6/charts.png'
 
-
-import Createscenario from '@/views/component/scenario/createscenario.vue'
-import ScenarioModel from '@/views/component/scenario/index.vue'
 import TableModels from './tableModel.vue';
-import EditdeviceModel from './editdevice.vue';
+import EchartsModels from './echartsModel.vue';
-import MaterialModels from './materialmodel.vue';
-import ChangesettingsModels from './changesettings.vue';
 
 const route = useRoute();
 const router = useRouter()
@@ -70,7 +65,6 @@ function getScenarioResults(){
       for(let i = 0;i<customImageData.value.length;i++){
         if(key == customImageData.value[i].id){
           customImageData.value[i].scenarioResults = element
-         console.log(customImageData.value[i])
          addAttrText(customImageData.value[i])
         }
        }
@@ -78,11 +72,30 @@ function getScenarioResults(){
   })
 }
 function addAttrText(item:any){
-  item.attrs.text = item.deviceName
+  // item.attrs.text = item.deviceInfo.name
+  graph.addNode({
+    x: item.position.x ,
+    y: item.position.y + 150,
+    width: 100,
+    height: 40,
+    label: item.deviceInfo.name,
+    attrs: {
+      body: {
+        stroke: 'transparent',
+        fill: 'transparent',
+        strokeWidth: 1,
+      },
+      text: {
+        text: '',
+        fill:  '#363636', 
+        fontSize: 16,
+      },
+    },
+  })
 
   graph.addNode({
     x: item.position.x ,
-    y: item.position.y + 160,
+    y: item.position.y + 180,
     width: 100,
     height: 30,
     label: 'keff：' + item.scenarioResults[item.scenarioResults.length - 1].keffValue,
@@ -94,7 +107,7 @@ function addAttrText(item:any){
       },
       text: {
         text: '',
-        fill:  item.scenarioResults[item.scenarioResults.length - 1].keffValue > 0.98 ? '#ff4d4f' : '#363636', // 蓝色文字
+        fill:  item.scenarioResults[item.scenarioResults.length - 1].keffValue > 0.98 ? '#ff4d4f' : '#363636', 
         fontSize: 14,
       },
     },
@@ -102,16 +115,16 @@ function addAttrText(item:any){
   graph.addNode({
     shape: 'image-node',
     x: item.position.x + 135 ,
-    y: item.position.y + 167,
+    y: item.position.y + 186,
     width: 14,
     height: 14,
     correlationId: item.id,
-    type:'charts',
+    type:'echarts',
     attrs: {
       img: {
         width: 14,
           height: 14,
-        'xlink:href': chartsimg,
+        'xlink:href': echartsimg,
       },
       label: {
         text: '',
@@ -121,7 +134,7 @@ function addAttrText(item:any){
   graph.addNode({
     shape: 'image-node',
     x: item.position.x + 110 ,
-    y: item.position.y + 167,
+    y: item.position.y + 186,
     width: 14,
     height: 14,
     correlationId: item.id,
@@ -137,7 +150,118 @@ function addAttrText(item:any){
       },
     },
   })
+  let tempData:any = []
+  if(item.scenarioResults[item.scenarioResults.length - 1].attrState){
+    let attrState = JSON.parse(item.scenarioResults[item.scenarioResults.length - 1].attrState)
+    for (const key in attrState) {
+      if (!Object.hasOwn(attrState, key)) continue;
+      const element = attrState[key];
+      tempData.push({
+        name: key,
+        value: element
+      })
+    }
+  }
+  appendAttrText(item,tempData)
 }
+function getName(code:any) {
+  let name = ''
+  switch (code) {
+    case 'width':
+     return name = "宽度cm";
+      break; 
+    case 'height':
+     return name = "高度cm";
+      break; 
+    case 'length':
+     return name = "长度cm";
+      break;   
+    case 'diameter':
+     return name = "外径cm";
+      break;            
+    case 'volume':
+     return name = "体积（单位：L）";
+      break; 
+    case 'flow_rate':
+     return name = "流量（单位：m3/h）";
+      break; 
+    case 'pulse_velocity':
+     return name = "脉冲速度（单位：Hz）";
+      break; 
+    case 'u_concentration':
+     return name = "铀浓度（g/L）";
+      break; 
+    case 'uo2_density':
+     return name = "氧化铀密度（g/cm3）";
+      break; 
+    case 'u_enrichment':
+     return name = "铀富集度（%）";
+      break; 
+    case 'pu_concentration':
+     return name = "钚浓度（g/L）";
+      break; 
+    case 'puo2_density':
+     return name = "氧化钚密度（g/cm3）";
+      break; 
+    case 'pu_isotope':
+     return name = "钚同位素比例（PU-240占比）%";
+      break; 
+    case 'hno3_acidity':
+     return name = "硝酸酸度（mol/L）";
+      break; 
+    case 'h2c2o4_concentration':
+     return name = "草酸浓度（mol/L）";
+      break; 
+    case 'organic_ratio':
+     return name = "有机相比例%";
+      break; 
+    case 'moisture_content':
+     return name = "含水率%";
+      break; 
+    default: 
+     return name = "";
+  } 
+    return name
+  }
+function appendAttrText(item:any,data:any){
+  if(isDisplay.value == false){ 
+    return
+  }
+
+  for(let i = 0;i<data.length;i++){
+    graph.addNode({
+      x: item.position.x,
+      y: item.position.y + 203 + i * 25,
+      width: 260,
+      height: 30,
+      // label:  data[i].name + '：' + data[i].value,
+      attrs: {
+        body: {
+          stroke: 'transparent',
+          fill: 'transparent',
+          strokeWidth: 1,
+        },
+        label: {
+          textAnchor: 'left',
+          refX: 0,
+          text: getName(data[i].name) + '：' + data[i].value,
+          textWrap: {
+            width: 250,
+            height: 30,
+            ellipsis: true,
+          },
+        },
+        text: {
+          text: '',
+          fill:  '#363636', // 蓝色文字
+          fontSize: 12,
+        },
+      },
+    })
+  }
+ 
+}
+
 function groupByDeviceId(data:any) { // 按设备id分组
   // 边界检查：确保输入是数组
   if (!Array.isArray(data)) {
@@ -397,12 +521,15 @@ onMounted(() => {
         textAnchor: 'middle',
         dy: 10,
       },
+      '.': {
+        class: 'custom-image-node',
+      },
     },
   },
   true,
 )
 //   Graph.registerNode(
-//   'image-charts',
+//   'image-echarts',
 //   {
 //     inherit: 'rect',
 //     width: 120,
@@ -470,40 +597,18 @@ onMounted(() => {
   })
 
 
-  
+  graph.on('node:click', ( e:any ) => {
-
+    const node = e.node
-  // #endregion
+    if(node == null)return
-
+    if(node.store == null)return
-  // #region 使用插件
+    if(node.store.data == null)return
-  // graph
+    if(node.store.data.type == 'echarts'){
-  // .use(
+      deviceId.value = node.store.data.correlationId
-  //     new Transform({
+      isEchartsModel.value = true
-  //       resizing: false, // 通过拖拽边缘调整节点大小
-  //       rotating: false, // 允许旋转节点
-  //       // scaling 不是 Transform 插件的有效配置项，已移除
-  //     }),
-  //   )
-  //   .use(
-  //     new Selection({
-  //       rubberband: true,
-  //       showNodeSelectionBox: true,
-  //     }),
-  //   )
-  //   .use(new Snapline())
-  //   .use(new Keyboard())
-  //   .use(new Clipboard())
-  //   .use(new History())
-  // #endregion
-
-
-  graph.on('node:click', ({ e, node }) => {
-    if(node?.store?.data?.type == 'charts'){
-      deviceId.value = node?.store?.data?.correlationId
-     
       return
     }
-    if(node?.store?.data?.type == 'text'){
+    if(node.store.data.type == 'text'){
-      deviceId.value = node?.store?.data?.correlationId
+      deviceId.value = node.store.data.correlationId
        isTableModel.value = true
       return
     }
@@ -516,11 +621,6 @@ onMounted(() => {
 const left = ref(0) 
 const top = ref(0) 
 const isMenuShow = ref(false)
-const selectedNode:any = ref(null)
-
-function closeAntvx6() {
-  router.push('/business/project/index')
-}
 
 function bigClick(){
   graph.zoom(0.1)
@@ -531,13 +631,39 @@ function smallClick(){
 
 
 
-const isTableModel = ref(false)
+const isTableModel = ref(false) // 表格弹窗
+const isEchartsModel = ref(false) // 图表弹窗
 
 function dialogTableModel(){ // 关闭变动设置弹窗
   isTableModel.value = false;
 }
 
+function dialogEchartsModel(){ // 关闭变动设置弹窗
+  isEchartsModel.value = false;
+}
 
+function isDisplayClick(){
+  if(isDisplay.value == true){
+    isDisplay.value = false
+      let tempGraph:any =   graph.toJSON().cells
+      for(let i = 0;i<tempGraph.length;i++){
+        if(tempGraph[i].shape == 'rect' || tempGraph[i].shape == 'image-node'){
+          graph.removeCell(tempGraph[i].id)
+        }
+      }
+  }else{
+    isDisplay.value = true
+    for (const key in scenarioResults.value) {
+      if (!Object.hasOwn(scenarioResults.value, key)) continue;
+      for(let i = 0;i<customImageData.value.length;i++){
+        if(key == customImageData.value[i].id){
+          addAttrText(customImageData.value[i])
+        }
+      }
+    }
+  }
+
+}
 
 </script>
  
@@ -545,9 +671,10 @@ function dialogTableModel(){ // 关闭变动设置弹窗
   <div class="app-layout" @click="isMenuShow = false">
     <div class="antvx6-header">
       <div class="header-left-box">
-        <div class="return-icon-box" @click="closeAntvx6"  title="返回工作台">
+       <!-- <div class="return-icon-box" @click="closeAntvx6"  title="返回工作台">
           <img src="@/assets/x6/return.png" alt="图标" style="cursor: pointer;">
         </div>
+        -->
         <div class="project-name">{{ projectInfo.name }}</div>
         <!-- <div class="return-icon-box" @click="analysisAdd"  title="新增模拟分析">
           <img src="@/assets/x6/add.png" alt="图标" style="cursor: pointer;">
@@ -565,7 +692,7 @@ function dialogTableModel(){ // 关闭变动设置弹窗
           <img src="@/assets/x6/reduce.png">
           <div class="operation-icon-text">缩小</div>
         </div>
-        <div class="operation-icon-box" @click="isDisplay = !isDisplay">
+        <div class="operation-icon-box" @click="isDisplayClick">
           <img v-if="isDisplay" src="@/assets/x6/display.png">
           <img v-else src="@/assets/x6/hide.png">
           <div class="operation-icon-text">显示</div>
@@ -582,23 +709,13 @@ function dialogTableModel(){ // 关闭变动设置弹窗
           <img src="@/assets/x6/del.png" alt="图标" title="删除"  style="cursor: pointer;"
           @click="deleteNode"> -->
       </div>
-      <div class="line-style-box">
-         <div class="expansionandcontraction-box" v-if="isExpansionandcontraction == false" @click="isExpansionandcontraction = true">
-          <img src="@/assets/x6/expansionandcontraction-left.png">
-        </div>
-        <div v-if="isExpansionandcontraction == true" style="display: flex;align-items: center;">
-          <div class="expansionandcontraction-box" @click="isExpansionandcontraction = false">
-            <img src="@/assets/x6/expansionandcontraction-right.png">
-          </div>
-          <div class="style-content-box">
-            <div class="style-content-box-title">样式</div>
-          </div>
-        </div>
-        
-      </div>
     </div>
     <el-dialog v-model="isTableModel" :close-on-click-modal="false" :modal="false" draggable :before-close="dialogTableModel" title="设备分析列表"  append-to-body width="1430px">
-      <TableModels  v-id="isTableModel" :deviceId="deviceId" :scenarioId="scenarioId"/>
+      <TableModels  v-if="isTableModel" :deviceId="deviceId" :scenarioId="scenarioId"/>
+    </el-dialog>
+
+    <el-dialog v-model="isEchartsModel" :close-on-click-modal="false" :modal="false" draggable :before-close="dialogEchartsModel" title="设备分析图像"  append-to-body width="1430px">
+      <EchartsModels  v-if="isEchartsModel" :deviceId="deviceId" :scenarioId="scenarioId"/>
     </el-dialog>
   </div>
 </template>
@@ -878,3 +995,39 @@ function dialogTableModel(){ // 关闭变动设置弹窗
   padding-left: 15px;
 }
 </style>
+
+<style>
+  .el-dialog {
+    padding: 0 !important;
+    border-radius: 10px !important;
+    border: 1px solid #363636 !important;
+}
+  .el-dialog .el-dialog__header {
+    display: flex;
+    display: -webkit-flex;
+    justify-content: flex-start;
+    -webkit-justify-content: flex-start;
+    align-items: center;
+    -webkit-align-items: center;
+    padding: 10px 20px;
+    background-color: #f1f3f8 !important;
+    font-family: 'Arial Negreta', 'Arial Normal', 'Arial', sans-serif;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 16px;
+    color: #1B1B1B;
+    text-align: left;
+    border-radius: 10px 10px 0 0;
+    height: 50px;
+}
+.el-dialog .el-dialog__close {
+    font-size: 22px;
+    color: rgb(80, 80, 80);
+}
+
+</style>
+<style >
+.custom-image-node {
+  cursor: pointer;
+}
+</style>

business-css/frontend/src/views/component/scenario/condition.vue

@@ -11,6 +11,7 @@ import Page from '@/components/Pagination/page.vue'
 import { getDictItemById } from '@/api/dict';
 import { topologyDevicesLsit } from '@/api/business/project';
 
+import { searchEventsByScenarioId } from '@/api/business/event';
 
 const conditionData:any = ref([{ // 套件数据
 
@@ -30,12 +31,18 @@ const props = defineProps({ // 接收父组件传递的项目信息
     type: String,
     default: ''
   },
+  isEdit: {
+    required: true,
+    type: Boolean,
+    default: false
+  },
 });
+const isEdit = ref(props.isEdit)
 function submitClick() {
+  debugger
   return menuList.value
 }
 function initDeviceData(){
-  console.log(props.projectInfo)
   topologyDevicesLsit({
     id: props.projectInfo.projectId
   }).then((res:any) => {
@@ -44,9 +51,34 @@ function initDeviceData(){
     }
   })
 }
+function initConditionData(){
+  searchEventsByScenarioId({
+    scenarioId: props.scenarioId
+  }).then((res:any) => {
+    if(res.length > 0){
+      menuList.value = []
+    }
+    for(let i = 0; i < res.length; i++){
+      if(res[i].attrChanges != null && res[i].attrChanges != ''){
+        let attrChanges = JSON.parse(res[i].attrChanges)
+        menuList.value.push({
+          ...attrChanges,
+          eventId: res[i].eventId,
+        })
+  
+        getTimelineList()
+      }
+    }
+    if(res.length > 0){
+    getDeviceInfo(menuList.value[0].device)
+    }
+
+  })
+}
 onMounted(() => {
   DicInit()
-initDeviceData()
+  initDeviceData()
+  initConditionData()
 });
 const deviceData:any = ref([]) // 始发设备数据
 const attributeData:any = ref([]) // 设备属性数据
@@ -94,6 +126,7 @@ function addAttr(){ // 添加自定义属性
 function menuClick(index:any){ // 点击菜单切换
   menuIndex.value = index;
   segmentationIndex.value = 0;
+   getTimelineList()
 }
 function addMenu(){ //添加导菜单
   menuList.value.push({
@@ -124,6 +157,9 @@ function DicInit() {
   getDictItemById(params).then((result: any) => {
     attributeData.value = result.data.records;
   }).catch((err: any) => {
+    if(menuList.value[menuIndex.value].target.entityType == 'device'){
+     getDeviceInfo(menuList.value[menuIndex.value].device)
+    }
   });
   let paramss = {
     dictId: '9d87f873bc80e79c6d399131cbe01016',
@@ -132,6 +168,9 @@ function DicInit() {
   }
   getDictItemById(paramss).then((result: any) => {
     materialData.value = result.data.records;
+    if(menuList.value[menuIndex.value].target.entityType == 'device'){
+     getDeviceInfo(menuList.value[menuIndex.value].device)
+    }
   }).catch((err: any) => {
   });
 }
@@ -173,6 +212,25 @@ function changeMaterial(e:any){ // 设备属性改变时，清空变化物料
   
    getDeviceInfo(e)
 }
+// 查询字典项
+// async function DicInit() {
+//   let params = {
+//     dictId: 'dc7419e5f8a655966e6bb90b0cb5c0c2',
+//     size:99,
+//     current:1
+//   }
+
+//   const attributeResult = await getDictItemById(params)
+//   attributeData.value = attributeResult.data.records;
+//   let paramss = {
+//     dictId: '9d87f873bc80e79c6d399131cbe01016',
+//     size:99,
+//     current:1
+//   }
+//   const materialResult = await getDictItemById(paramss)
+//     materialData.value = materialResult.data.records;
+//     initConditionData()
+// }
 
 
 const devicename = ref('') // 选中始发设备
@@ -181,13 +239,21 @@ const timelineList:any = ref([]) // 时间线数据
 
 function getTimelineList(){
   timelineList.value = []
-  menuList.value.forEach((item:any) => {
+  // menuList.value.forEach((item:any) => {
+  //   item.segments.forEach((segment:any) => {
+  //     segment.timeline.forEach((timeline:any) => {
+  //       console.log(timeline)
+  //       timelineList.value.push(timeline)
+  //     })
+  //   })
+  // })
+  let item =  menuList.value[menuIndex.value]
     item.segments.forEach((segment:any) => {
       segment.timeline.forEach((timeline:any) => {
+        console.log(timeline)
         timelineList.value.push(timeline)
       })
     })
-  })
 }
 function getDeviceInfo(e:any){ // 获取设备信息
   devicename.value = ""
@@ -227,25 +293,26 @@ function getDeviceInfo(e:any){ // 获取设备信息
         :class="{'condition-item-active': index == menuIndex}" @click="menuClick(index)">
           {{ item.label }}
         </div>
-        <img src="@/assets/add.png" alt="" class="condition-img" @click="addMenu">
+        <img src="@/assets/add.png" v-if="isEdit == true" alt="" class="condition-img" @click="addMenu">
       </div>
 
       <el-form ref="infoForm"  label-width="120px">
         <el-form-item label="始发设备(物料)" prop="code">
-          <el-select v-model="menuList[menuIndex].device" placeholder="请选择" style="width:100%;" clearable @change="getDeviceInfo">
+          <el-select v-model="menuList[menuIndex].device" placeholder="请选择" style="width:100%;" clearable @change="getDeviceInfo"
+          :disabled="isEdit == false">
             <el-option v-for="item in deviceData" :key="item.deviceName" :label="item.deviceName +'('+item.materialName+')'" :value="item.deviceName"  />
           </el-select>
         </el-form-item>
         <div style="display: flex; width: 100%;justify-content: space-between;">
           <el-form-item label="设备属性" prop="name" style="width: 49%;">
             <el-select v-model="menuList[menuIndex].attribute" placeholder="请选择" style="width:100%;" clearable 
-            :disabled="menuList[menuIndex].material!='' && menuList[menuIndex].material!=null" @change="changeAttribute">
+            :disabled="(menuList[menuIndex].material!='' && menuList[menuIndex].material!=null) || isEdit == false" @change="changeAttribute">
               <el-option v-for="item in attributeData" :key="item.itemCode" :label="item.dictName" :value="item.itemCode"  />
             </el-select>
           </el-form-item>
           <el-form-item label="变化物料" style="width: 49%;">
             <el-select v-model="menuList[menuIndex].material" placeholder="请选择" style="width:100%;" clearable
-            :disabled="menuList[menuIndex].attribute!='' && menuList[menuIndex].attribute!=null" @change="changeMaterial">
+            :disabled="(menuList[menuIndex].attribute!='' && menuList[menuIndex].attribute!=null)|| isEdit == true" @change="changeMaterial">
               <el-option v-for="item in materialData" :key="item.itemCode" :label="item.dictName" :value="item.itemCode"  />
             </el-select>
           </el-form-item>
@@ -254,9 +321,9 @@ function getDeviceInfo(e:any){ // 获取设备信息
           <div v-for="(item, index) in menuList[menuIndex].segments" :key="index" class="segmentation-item" 
             :class="{'segmentation-item-active': index == segmentationIndex}" @click="segmentationIndex = index">
             <span>{{ item.segmentId }}</span>
-            <svg t="1766969938271" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4998" width="14" height="14"><path d="M571.01312 523.776l311.3472-311.35232c15.7184-15.71328 15.7184-41.6256 0-57.344l-1.69472-1.69984c-15.7184-15.71328-41.6256-15.71328-57.34912 0l-311.3472 311.77728-311.35232-311.77728c-15.7184-15.71328-41.63072-15.71328-57.344 0l-1.69984 1.69984a40.0128 40.0128 0 0 0 0 57.344L452.92544 523.776l-311.35232 311.35744c-15.71328 15.71328-15.71328 41.63072 0 57.33888l1.69984 1.69984c15.71328 15.7184 41.6256 15.7184 57.344 0l311.35232-311.35232 311.3472 311.35232c15.72352 15.7184 41.63072 15.7184 57.34912 0l1.69472-1.69984c15.7184-15.70816 15.7184-41.6256 0-57.33888l-311.3472-311.35744z" p-id="4999" fill="currentColor"></path></svg>
+            <svg  v-if="isEdit == true" t="1766969938271" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4998" width="14" height="14"><path d="M571.01312 523.776l311.3472-311.35232c15.7184-15.71328 15.7184-41.6256 0-57.344l-1.69472-1.69984c-15.7184-15.71328-41.6256-15.71328-57.34912 0l-311.3472 311.77728-311.35232-311.77728c-15.7184-15.71328-41.63072-15.71328-57.344 0l-1.69984 1.69984a40.0128 40.0128 0 0 0 0 57.344L452.92544 523.776l-311.35232 311.35744c-15.71328 15.71328-15.71328 41.63072 0 57.33888l1.69984 1.69984c15.71328 15.7184 41.6256 15.7184 57.344 0l311.35232-311.35232 311.3472 311.35232c15.72352 15.7184 41.63072 15.7184 57.34912 0l1.69472-1.69984c15.7184-15.70816 15.7184-41.6256 0-57.33888l-311.3472-311.35744z" p-id="4999" fill="currentColor"></path></svg>
           </div>
-          <div class="segmentation-item-add" @click="addSegmentation">
+          <div class="segmentation-item-add" @click="addSegmentation"  v-if="isEdit == true">
             + 新增分段
           </div>
         </div>
@@ -291,12 +358,12 @@ function getDeviceInfo(e:any){ // 获取设备信息
               <el-input v-model="item.value" style="width: 100%" placeholder=""></el-input>
             </div>
 
-            <div class="segmentation_custom_attrs_content4" @click="removeAttr(indexs)">
+            <div class="segmentation_custom_attrs_content4" >
-              删除
+               <span @click="removeAttr(indexs)"  v-if="isEdit == true">删除</span>
             </div>
           </div>
         </div>
-        <div class="addAttrBox" @click="addAttr">
+        <div class="addAttrBox" @click="addAttr"  v-if="isEdit == true">
           <svg t="1766543724217" style="margin-right: 5px;" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6518" width="16" height="16"><path d="M105 480a8 8 0 0 1 8-8h799a8 8 0 0 1 8 8v64a8 8 0 0 1-8 8H113a8 8 0 0 1-8-8v-64z" fill="#266FFF" p-id="6519"></path><path d="M480 920a8 8 0 0 1-8-8V112a8 8 0 0 1 8-8h64a8 8 0 0 1 8 8v800a8 8 0 0 1-8 8h-64z" fill="#266FFF" p-id="6520"></path></svg>
           添加一行
         </div>

business-css/frontend/src/views/component/scenario/index.vue

@@ -8,14 +8,17 @@ export default {
 import { onMounted, ref, nextTick } from "vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
 import { searchScenariosLsit,addScenarios,updateScenarios,deleteScenarios,deleteBatchScenarios} from "@/api/business/scenario";
-
+import { getActiveAlgorithms } from "@/api/business/scenario";
+import ConditionModel from '@/views/component/scenario/condition.vue'
 import { simulationInit,simulationRun } from "@/api/business/project";
-
 import Page from '@/components/Pagination/page.vue'
 import { getDictItemById } from '@/api/dict';
-// import ConditionModel from '@/views/component/scenario/condition.vue'
 import Createscenario from '@/views/component/scenario/createscenario.vue'
 import { eventsBatchSave } from '@/api/business/event';
+import { topologyDevicesLsit } from '@/api/business/project';
+import TableModels from '@/components/antvx6/tableModel.vue';
+import EchartsModels from '@/components/antvx6/echartsModel.vue';
+const webUrl = import.meta.env.VITE_APP_BASE_HTTP; // 基础路径
 const algorithmTypeData: any = ref([]); // 算法类型数据
 const stepsActive = ref(0); // 步骤导航栏当前激活的步骤索引
 const props = defineProps({ // 接收父组件传递的项目信息
@@ -25,7 +28,6 @@ const props = defineProps({ // 接收父组件传递的项目信息
     default: {}
   }
 });
-
 // 搜索框
 const queryParams = ref({
   current: 1,
@@ -72,7 +74,8 @@ const info: any = ref({
   description: "",
 });
 const scenarioId = ref(""); // 事故情景id
-const dialogVisible = ref(false);
+const dialogVisible = ref(false); // 新增事故情景弹窗是否显示
+const dialogEditVisible = ref(false); // 修改或查看事故情景弹窗是否显示
 function addClick() {
   title.value = "新增事故情景";
   info.value = {
@@ -85,82 +88,35 @@ function addClick() {
 }
 
 const isSwitch = ref(false); // 事故情景id
-//新建事故情景-确认按钮/修改按钮
-function confirmClick(formEl: any) {
-  console.log(info.value)
-  formEl.validate((valid: any) => {
-    if (valid) {
-
-      if (!info.value.scenarioId) {
-        const params = {
-          projectId: props.projectInfo.projectId,
-          name: info.value.name,
-          algorithmType: info.value.algorithmType,
-          description: info.value.description,
-        };
-        if(isSwitch.value == true){
-          return ;
-        }
-        isSwitch.value = true
-        addScenarios(params).then((res:any) => {
-          isSwitch.value = false;
-          if(res && res.code == 0) {
-            scenarioId.value = res.scenarioId;
-            gettableData();
-            ElMessage({
-              type: "success",
-              message: "新增成功",
-            });
-            stepsActive.value = 1;
-          } else {
-            ElMessage({
-              type: "error",
-              message: "新增失败",
-            });
-          }
-        }).catch(() => {
-          isSwitch.value = false;
-        })
-      } else if (info.value.scenarioId) {
-        const params = {
-          scenarioId: info.value.scenarioId,
-          projectId: info.value.projectId,
-          name: info.value.name,
-          algorithmType: info.value.algorithmType,
-          description: info.value.description,
-        };
-        updateScenarios(params).then((res) => {
-          gettableData();
-          dialogVisible.value = false;
-        });
-      } else {
-        return false;
-      }
-    }
-  });
-}
 
 //新建角色-取消按钮
 function handleClose() {
-  dialogVisible.value = false;
+  dialogEditVisible.value = false;
   if (infoForm.value != null) infoForm.value.resetFields();
 }
-function handleScenarioClose(){
-  dialogVisible.value = false;
-  gettableData();
-  if (infoForm.value != null) infoForm.value.resetFields();
-
-}
 //新建事故情景
 const rules = ref({
   name: [{ required: true, message: "请输入事故情景名称", trigger: "blur" }],
   algorithmType: [{ required: true, message: "请选择算法类型", trigger: "change" }],
 });
 //修改事故情景
-function editClick(row: any) {
+function editClick(row: any,type: string) {
-  title.value = "修改事故情景";
+  title.value =type + "事故情景";
   info.value = JSON.parse(JSON.stringify(row));
-  dialogVisible.value = true;
+  
+  dialogEditVisible.value = true;
+}
+const isEdit = ref(false);
+function departureClick(row: any,type: string) {
+  title.value =type;
+  if(type == "初始条件设置"){
+    isEdit.value = true;
+  } else {
+    isEdit.value = false;
+  }
+  info.value = JSON.parse(JSON.stringify(row));
+  scenarioId.value = row.scenarioId;
+  isShowCondition.value = true;
 }
 
 //删除事故情景
@@ -226,38 +182,27 @@ function dateFormat(row: any) {
 }
 const getAlgorithmType = async () => {
   try {
-    let params = {
+    const result:any = await getActiveAlgorithms();
-      dictId: '595502b91e7741b5033b53622d8731a3',
+      algorithmTypeData.value = result
-      size:99,
-      current:1
-    }
-    const result:any = await getDictItemById(params);
-    if (result.code == '0') {
-      algorithmTypeData.value = result.data.records
-    }
   } catch (error) {
   }
 }
-const conditionModel = ref()
 function submitClick(){
-  const tempData = conditionModel.value?.submitClick()
-  let data:any = []
 
-  tempData.forEach((item: any) => {
+  let data  = {
-    data.push({
+    scenarioId: info.value.scenarioId,
-      triggerTime:'0',
+    algorithm_type: info.value.algorithmType,
-      attrChanges:JSON.stringify(item) ,
+    name: info.value.name,
-      scenarioId: scenarioId.value
+    description: info.value.description,
-    })
+  }
-  })
+  updateScenarios(data).then((res:any) => {
-
+    if (res == true) {
-  eventsBatchSave(data).then((res:any) => {
+      ElMessage({
-    if (res.code == '0') {
+        type: "success",
-      // ElMessage({
+        message: "保存成功",
-      //   type: "success",
+      });
-      //   message: "保存成功",
+      dialogEditVisible.value = false;
-      // });
+      gettableData();
-      dialogVisible.value = false;
     }
   })
 
@@ -288,8 +233,24 @@ function confirmationAnalysis(row: any) {
           let data = {
             data: res.data 
           }
-          simulationRun(row.projectId, row.scenarioId, data  || {}).then((res) => {
+          simulationRun(row.projectId, row.scenarioId, data  || {}).then((res:any) => {
-            gettableData();
+            if(res.code == '0'){
+              ElMessage({
+                type: "success",
+                message: "模拟计算成功",
+              });
+              gettableData();
+              setTimeout(() => {
+                window.open(webUrl + '/#/viewanalysis?projectId='+ row.projectId +'&scenarioId='+ row.scenarioId, '_blank');
+              }, 1000);
+
+            }else{
+              ElMessage({
+                type: "error",
+                message: "模拟运行失败，请检查后端服务是否正常",
+              });
+            }{}
+          
           }).catch((error) => {
             console.error('模拟运行失败:', error);
             ElMessage({
@@ -303,16 +264,85 @@ function confirmationAnalysis(row: any) {
             message: "模拟初始化失败",
           });
         }
-        
-
-       
       });
     })
 }
+const isShowCondition = ref<boolean>(false); // 是否显示条件模型
+const conditionModelRef = ref<any>() // 条件模型实例
+function handleScenarioClose(){
+  isShowCondition.value = false;
+}
+function submitConditionClick(){
+  const tempData = conditionModelRef.value?.submitClick()
+  let data:any = []
+  tempData.forEach((item: any) => {
+    data.push({
+      triggerTime:'0',
+      eventId: item.eventId ==null? '' : item.eventId,
+      attrChanges:JSON.stringify(item) ,
+      scenarioId: scenarioId.value
+    })
+  })
+
+  eventsBatchSave(data).then((res:any) => {
+    if (res.code == '0') {
+      isShowCondition.value = false;
+      gettableData();
+       ElMessage({
+        type: "success",
+        message: "修改成功",
+      });
+    }
+  })
 
   
+}
 
+function resultClick(row:any){
+  isAcitve.value = 0
+   scenarioId.value = row.scenarioId,
+  getMenuData()
+  isShowResult.value = true;
+}
+const isShowResult = ref<boolean>(false); // 是否显示结果模型
+const deviceList:any = ref([]) // 变动设备列表
+const isAcitve:any = ref(-1) // 选中项
+const deviceId:any = ref('') // 变动设备id
+function getMenuData() {
+  topologyDevicesLsit({
+    id: props.projectInfo.projectId
+  }).then((res:any) => {
+    if (res.code == 0) {
+      deviceList.value = res.data;
+      deviceId.value = res.data[0].deviceId
+    }
+  })
+}
+// const title = ref<string>('') // 标题
+function handleClick(item:any, index:any){
+  // formulaInfo.value.correlation =  JSON.parse(JSON.stringify(item.deviceName))
+  isAcitve.value = index
 
+  deviceId.value = ""
+  setTimeout(() => {
+    deviceId.value = item.deviceId
+  }, 
+  200);
+}
+function handleResultClose(){ // 关闭结果模型
+  isShowResult.value = false;
+}
+const isEchartsModel = ref<boolean>(false) // 是否显示echarts模型
+
+function changeShowResult(isShow:boolean){ // 切换显示结果模型
+  isEchartsModel.value = isShow
+  let tempId = deviceId.value
+  deviceId.value = ''
+  setTimeout(() => {
+    deviceId.value = tempId
+  }, 
+  200);
+}
 </script>
 
 <template>
@@ -358,25 +388,24 @@ function confirmationAnalysis(row: any) {
               style="display: flex;display: -webkit-flex; justify-content: space-around;-webkit-justify-content: space-around; ">
              
               <img  src="@/assets/table/edit.png" alt="" title="修改" v-if="scope.row.status == 0"
-                @click="editClick(scope.row)" style="cursor: pointer; ">
+                @click="editClick(scope.row,'修改')" style="cursor: pointer; ">
+
               <img  src="@/assets/table/view.png" alt="" title="查看" v-if="scope.row.status != 0"
-                @click="editClick(scope.row)" style="cursor: pointer; ">
+                @click="editClick(scope.row,'查看')" style="cursor: pointer; ">
 
               <img  src="@/assets/table/shifa.png" alt="" title="始发事件" v-if="scope.row.status == 0"
-                @click="editClick(scope.row)" style="cursor: pointer; ">
+                @click="departureClick(scope.row,'初始条件设置')" style="cursor: pointer; ">
               <img  src="@/assets/table/see.png" alt="" title="查看始发事件" v-if="scope.row.status != 0"
-                @click="editClick(scope.row)" style="cursor: pointer; ">
+                @click="departureClick(scope.row,'查看初始条件')" style="cursor: pointer; ">
 
               <img  src="@/assets/table/moni.png" alt="" title="模拟计算" v-if="scope.row.status == 0"
                 @click="confirmationAnalysis(scope.row)" style="cursor: pointer; ">
               <img  src="@/assets/table/moni_disabled.png" alt="" title="查看始发事件" v-if="scope.row.status != 0">
 
               <img  src="@/assets/table/result.png" alt="" title="计算结果" v-if="scope.row.status == 2"
-                @click="editClick(scope.row)" style="cursor: pointer; ">
+                @click="resultClick(scope.row)" style="cursor: pointer; ">
               <img  src="@/assets/table/result_disabled.png" alt="" title="计算结果" v-if="scope.row.status != 2">
             
-
-
               <img  src="@/assets/table/del.png" alt="" title="删除"
                 @click="delAloneClick(scope.row)" style="cursor: pointer; "> 
             </span>
@@ -387,38 +416,71 @@ function confirmationAnalysis(row: any) {
 
     </div>
     <Createscenario v-if="dialogVisible" :projectInfo="projectInfo" @closeCreatescenario ="closeCreatescenario"/>
-    <!-- <el-dialog v-model="dialogVisible" :close-on-click-modal="false"
+    <el-dialog v-model="dialogEditVisible" :close-on-click-modal="false"
-    :modal="false" draggable :before-close="handleScenarioClose" title="新增事故情景"
+    :modal="false" draggable :before-close="handleClose" title="新增事故情景"
+      append-to-body width="590px">
+      
+
+      <el-form ref="infoForm" :model="info" :rules="rules" label-width="140px" style="width:500px">
+        <el-form-item label="事故情景名称：" prop="name">
+          <el-input v-model="info.name" style="width: 100%" placeholder="输入事故情景名称" :disabled="title == '查看事故情景'"></el-input>
+        </el-form-item>
+        <el-form-item label="算法类型：" prop="algorithmType" :disabled="title == '查看事故情景'">
+          <el-select v-model="info.algorithmType" placeholder="请选择" style="width:100%;" clearable :disabled="title == '查看事故情景'">
+              <el-option v-for="item in algorithmTypeData" :key="item.algorithmType" :label="item.name" :value="item.algorithmType"  />
+            </el-select>
+        </el-form-item>
+        <el-form-item label="事故情景描述：" :disabled="title == '查看事故情景'">
+          <el-input type="textarea" v-model="info.description"  :rows="6" style="width: 100%" placeholder="请输入事故情景描述"  :disabled="title == '查看事故情景'"></el-input>
+        </el-form-item>
+      </el-form>
+      <div style="text-align: right;">
+        <el-button   @click="handleClose">取消</el-button> 
+        <el-button  type="primary" @click="submitClick" v-if="title == '修改事故情景'">确定</el-button> 
+      </div>
+    </el-dialog>
+
+  <el-dialog v-model="isShowCondition" :close-on-click-modal="false"
+    :modal="false" draggable :before-close="handleScenarioClose" :title="title"
       append-to-body width="1000px">
-      <div class="scenario-setting-box">
+      <ConditionModel v-if="isShowCondition"  ref="conditionModelRef" :projectInfo="projectInfo" :scenarioId="scenarioId"
-        <el-steps style="width: 500px;margin:0 auto " :active="stepsActive" align-center>
+      :isEdit="isEdit"
-          <el-step title="事故情景设置"/>
+       />
-          <el-step title="初始条件设置" />
-        </el-steps>
-      </div>
-      <div class="scenario-setting-bottombox">
-        <el-form ref="infoForm" :model="info" :rules="rules" label-width="140px" style="width:600px" 
-        v-if="stepsActive == 0">
-            <el-form-item label="事故情景名称：" prop="name">
-              <el-input v-model="info.name" style="width: 100%" placeholder="输入事故情景名称" ></el-input>
-            </el-form-item>
-            <el-form-item label="算法类型：" prop="algorithmType">
-              <el-select v-model="info.algorithmType" placeholder="请选择" style="width:100%;" clearable>
-                <el-option v-for="item in algorithmTypeData" :key="item.id" :label="item.dictName" :value="item.itemCode"  />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="事故情景描述：">
-              <el-input type="textarea" v-model="info.description"  :rows="6" style="width: 100%" placeholder="请输入事故情景描述"></el-input>
-            </el-form-item>
-          </el-form>
-          <ConditionModel v-if="stepsActive == 1" ref="conditionModel" :projectInfo="projectInfo" :scenarioId="scenarioId" />
-      </div>
       <div style="text-align: center;">
-        <el-button v-if="stepsActive == 0" type="primary" @click="confirmClick(infoForm)">下一步</el-button>
+         <el-button  @click="handleScenarioClose">取消</el-button> 
-        <el-button v-else type="primary" @click="submitClick">下一步</el-button> 
+        <el-button  type="primary" @click="submitConditionClick" v-if="title == '初始条件设置'">确定</el-button> 
+      </div>
+    </el-dialog>
+
+
+    <el-dialog v-model="isShowResult" :close-on-click-modal="false"
+    :modal="false" draggable :before-close="handleResultClose" :title="title"
+      append-to-body width="calc(100% - 100px)" class="resultmodel-dialog-box">
+      <div style="display: flex;">
+        <div class="choiceMateria-left">
+          <div class="choiceMateria-left-title">设备列表</div>
+          <div style="height: calc(100% - 70px);overflow: auto;margin-top: 10px;">
+            <div v-for="(item, index) in deviceList" :key="index" class="choiceMateria-left-item"
+              :class="{'choiceMateria-item-active': index == isAcitve}"
+              @click="handleClick(item, index)">
+              {{ item.deviceName }}
+            </div>
+          </div>
+        </div>
+        <div style="padding-left: 45px;padding-top: 40px;  width: calc(100% - 290px);    height: calc(100vh - 100px);">
+          <div style="display: flex; margin-bottom: 20px; border-bottom: 1px solid #e5e5e5;padding-bottom: 5px;">
+            <div @click="changeShowResult(false)" class="adddevice_navigation_left" :class="{'adddevice_navigation_activeleft':!isEchartsModel}">列表</div>
+            <div @click="changeShowResult(true)" class="adddevice_navigation_right" :class="{'adddevice_navigation_activeright':isEchartsModel}">图形</div>
+          </div>
+
+          <TableModels  v-if="isShowResult && isEchartsModel == false && deviceId !=''" :deviceId="deviceId" :scenarioId="scenarioId"/>
+          <EchartsModels  v-if="isShowResult && isEchartsModel == true && deviceId !=''" :deviceId="deviceId" :scenarioId="scenarioId"/>
+        </div>
+
       </div>
       
-    </el-dialog> -->
+    </el-dialog>
+
   </div>
 </template>
 
@@ -589,4 +651,91 @@ function confirmationAnalysis(row: any) {
   align-items: center;
 }
 
+.choiceMateria-left{
+  width: 240px;
+  height: calc(100vh - 200px);
+  border-right: 1px solid rgba(240, 240, 240, 1);
+  box-sizing: border-box;
+}
+.choiceMateria-left-title{
+  width: 240px;
+  height: 44px;
+  line-height: 44px;
+  font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 14px;
+  color: #1B1B1B;
+  padding-left: 16px;
+  border-bottom: 1px solid rgba(240, 240, 240, 1);
+}
+.choiceMateria-left-item{
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    padding-left: 16px;
+    font-family: 'Arial Normal', 'Arial';
+    font-weight: 400;
+    font-style: normal;
+    font-size: 14px;
+    color: #333333;
+    cursor: pointer;
+}
+.choiceMateria-left-item:hover{
+  background-color: #f5f8ff;
+}
+.choiceMateria-item-active{
+    background-color: #f5f8ff;
+    color: #266fff;
+}
+
+
+
+
+.adddevice_navigation_left{
+  width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navleft.png');
+}
+.adddevice_navigation_left:hover{
+  color: #266fff ;
+}
+.adddevice_navigation_activeleft{
+  background-image: url('@/assets/x6/navleft_active.png');
+  color: #fff !important;
+}
+.adddevice_navigation_right{
+   width: 110px;
+  height: 32px;
+  line-height: 32px;
+  text-align: center;
+  cursor: pointer;
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: #363636;
+  background-image: url('@/assets/x6/navright.png');
+}
+.adddevice_navigation_right:hover{
+  color: #266fff ;
+}
+.adddevice_navigation_activeright{
+  background-image: url('@/assets/x6/navright_active.png');
+  color: #fff !important;
+}
+</style>
+
+<style>
+.resultmodel-dialog-box.el-dialog .el-dialog__body{
+  padding: 0 !important;
+}
 </style>

business-css/frontend/vite.config.ts

@@ -25,7 +25,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
       proxy: {
         [env.VITE_APP_BASE_API]: {
           // 线上API地址
-          //target: 'http://192.168.1.20:8090/',
+          // target: 'http://192.168.1.166:8090/',
           // 本地API地址
            target: 'http://localhost:8090',
           changeOrigin: true,