From 176c7671378317dec3b52e506ec9e6d59bc11b21 Mon Sep 17 00:00:00 2001
From: limengnan <420004014@qq.com>
Date: Thu, 19 Mar 2026 13:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/antvx6/changesettings.vue  | 18 ++++++++---
 .../modelTrainTask/index.vue                  | 14 ++++-----
 .../views/component/scenario/condition.vue    | 31 +++++++++++++++++--
 .../component/scenario/createscenario.vue     |  2 +-
 .../src/views/component/scenario/index.vue    |  2 +-
 5 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/business-css/frontend/src/components/antvx6/changesettings.vue b/business-css/frontend/src/components/antvx6/changesettings.vue
index edad849..68fec2f 100644
--- a/business-css/frontend/src/components/antvx6/changesettings.vue
+++ b/business-css/frontend/src/components/antvx6/changesettings.vue
@@ -328,14 +328,24 @@ function closeChangeDialogsettings(e:any){ // 变动公式值设置关闭
               <div class="materialmodel-title-line"></div>
               <div>延时设置</div>
             </div>
-            <div style="display: flex;align-items: center;">
+             <div v-for="(item, index) in formulaInfo.delayList" :key="index" 
+                style="padding: 10px 0;display: flex;align-items: center;margin-bottom: 10px;">
+                <div>{{"(" + item.parentName +'.'+ item.name+")"}}：</div>
+                <el-input v-model="item.delay" style="width: 200px" placeholder="" disabled="true">
+                  <template #append>
+                    s
+                  </template>
+                </el-input>
+              </div>
+
+            <!-- <div style="display: flex;align-items: center;">
               <el-form-item label="关联设备" >
                 <el-input v-model="formulaInfo.correlation" style="width: 100%" placeholder=""></el-input>
               </el-form-item>
-              <!-- <el-form-item label="延时时间" >
+              <el-form-item label="延时时间" >
                 <el-input v-model="formulaInfo.delay" style="width: 100%" placeholder=""></el-input>
-              </el-form-item> -->
-            </div>
+              </el-form-item>
+            </div> -->
           </el-form>
           <span class="dialog-footer"
             style="display: flex;display: -webkit-flex; justify-content: flex-end;-webkit-justify-content: flex-end;">
diff --git a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue
index ba1d3e4..1be56b7 100644
--- a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue
+++ b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue
@@ -497,7 +497,7 @@ const objectSpanMethod = ({
     </div>
     <el-dialog v-model="dialogVisibles" :close-on-click-modal="false"
      :modal="false" draggable :before-close="handleClose" :title="title"
-      append-to-body width="1145px" height="600px">
+      append-to-body width="1145px" height="600px" class="modelTrainTask-dialog">
       <el-form ref="infoForm" :model="info" :rules="rules" label-width="100px" 
       style="margin-top: 20px;">
       <div style="height: calc(100vh - 260px);overflow: auto;">
@@ -553,9 +553,9 @@ const objectSpanMethod = ({
           </div>
           </div> -->
         </el-form-item> 
-        <el-form-item label="特征映射快照"  style="width: 100%;" >
+        <!-- <el-form-item label="特征映射快照"  style="width: 100%;" >
            <el-input type="textarea" v-model="info.featureMapSnapshot" style="width: 100%" placeholder="输入特征映射快照"></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </div>
     
         <span class="dialog-footer"
@@ -754,7 +754,7 @@ const objectSpanMethod = ({
   height: 40px;
 }
 
-.adddevice_navigation_left{
+.modelTrainTask-dialog  .adddevice_navigation_left{
   width: 110px;
   height: 32px;
   line-height: 32px;
@@ -767,14 +767,14 @@ const objectSpanMethod = ({
   color: #363636;
   background-image: url('@/assets/x6/navleft.png');
 }
-.adddevice_navigation_left:hover{
+.modelTrainTask-dialog  .adddevice_navigation_left:hover{
   color: #266fff ;
 }
-.adddevice_navigation_activeleft{
+.modelTrainTask-dialog  .adddevice_navigation_activeleft{
   background-image: url('@/assets/x6/navleft_active.png');
   color: #fff !important;
 }
-.adddevice_navigation_right{
+.modelTrainTask-dialog .adddevice_navigation_right{
    width: 110px;
   height: 32px;
   line-height: 32px;
diff --git a/business-css/frontend/src/views/component/scenario/condition.vue b/business-css/frontend/src/views/component/scenario/condition.vue
index c1c8094..da084d6 100644
--- a/business-css/frontend/src/views/component/scenario/condition.vue
+++ b/business-css/frontend/src/views/component/scenario/condition.vue
@@ -10,9 +10,9 @@ import { ElForm, ElMessage, ElMessageBox } from "element-plus";
 import Page from '@/components/Pagination/page.vue'
 import { getDictItemById } from '@/api/dict';
 import { topologyDevicesLsit } from '@/api/business/project';
-
+import { getToken } from '@/utils/auth';
 import { searchEventsByScenarioId } from '@/api/business/event';
-
+const url = import.meta.env.VITE_APP_BASE_API;
 const conditionData:any = ref([{ // 套件数据
 
 }])
@@ -275,6 +275,22 @@ function getDeviceInfo(e:any){ // 获取设备信息
 
   
 }
+
+const upload:any = ref(null)
+function handleSuccess(file: any) {
+  if(file.code =="0"){
+    file.data.forEach((item:any) => {
+      menuList.value[menuIndex.value].segments[segmentationIndex.value].timeline.push(item)
+    })
+    ElMessage({
+      message: "导入成功！",
+      type: "success",
+    });
+    upload.value.clearFiles()
+  }
+ 
+}
+
 </script>
 
 <template>
@@ -332,6 +348,17 @@ function getDeviceInfo(e:any){ // 获取设备信息
             <el-input v-model="menuList[menuIndex].segments[segmentationIndex].end" style="width: 160px" placeholder="">
               <template #append>s</template>
             </el-input>
+
+          <el-upload
+              ref="upload"
+              class="upload-demo"
+              accept=".xlsx"
+              :action=" url +  '/events/upload-excel'"
+              :show-file-list="false"
+              :on-success="handleSuccess">
+              <el-button type="primary" style="margin: 0 10px;"  v-if="isEdit == true">
+                导入数据</el-button>
+            </el-upload>
           </div>
 
           <div class="segmentation_custom_attrs_box">
diff --git a/business-css/frontend/src/views/component/scenario/createscenario.vue b/business-css/frontend/src/views/component/scenario/createscenario.vue
index eb37f79..a853a2b 100644
--- a/business-css/frontend/src/views/component/scenario/createscenario.vue
+++ b/business-css/frontend/src/views/component/scenario/createscenario.vue
@@ -188,7 +188,7 @@ onMounted(() => {
             <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-form-item label="算法类型：">
               <el-select v-model="info.algorithmType" placeholder="请选择" style="width:100%;" clearable>
                 <el-option v-for="item in algorithmTypeData" :key="item.algorithmType" :label="item.name" :value="item.algorithmType"  />
               </el-select>
diff --git a/business-css/frontend/src/views/component/scenario/index.vue b/business-css/frontend/src/views/component/scenario/index.vue
index 4a46e4c..83e9417 100644
--- a/business-css/frontend/src/views/component/scenario/index.vue
+++ b/business-css/frontend/src/views/component/scenario/index.vue
@@ -466,7 +466,7 @@ function initDeviceData(){
         <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-form-item label="算法类型：" :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>