提交代码

2026-02-05 09:51:45 +08:00 · 2026-02-05 09:51:45 +08:00 · eb25728cbb
commit eb25728cbb
parent 65e2f75b60
4 changed files with 82 additions and 27 deletions
--- a/business-css/frontend/src/components/antvx6/changeDialogsettings.vue
+++ b/business-css/frontend/src/components/antvx6/changeDialogsettings.vue
@ -175,6 +175,11 @@ const props = defineProps({
    type: Array,
    default: []
  },
+  delayList: {
+    required: false,
+    type: Array,
+    default: []
+  },
 })
 const isAcitve = ref(-1);

@ -221,10 +226,13 @@ function handleClick(item:any, index:any){
 function closeChangeDialogsettings(){
  emit('closeChangeDialogsettings',{})
 }
+const delayList:any = ref([])
 const formulaData:any = ref([])
 function selectedClick(item:any, index:any){
-
+  let tempItem = JSON.parse(JSON.stringify(item))
  formulaData.value.push(item)
+  tempItem.delay = 0
+  delayList.value.push(tempItem)
  let tempData:any = []
  formulaData.value.forEach((element:any) => {
    if(element.parentName != null){
@ -232,10 +240,9 @@ function selectedClick(item:any, index:any){
    }else{
      tempData.push(element)
    }
-    
  });
+
  formula.value = tempData.join('')
-    console.log(formulaData.value)
 }
 onMounted(() => {
  
@ -243,6 +250,7 @@ gettableData();

 formula.value  = props.formula
 formulaData.value = props.formulaData
+ delayList.value = props.delayList
 });

 function selectedSymbolClick(name:any){
@ -268,25 +276,36 @@ function delClick(index:any){
    }else{
      tempData.push(element)
    }
-    
  });
  formula.value = tempData.join('')
+
+  let tempList:any = []
+
+  for(let i=0;i<tempData.length;i++){
+    tempList.push(delayList.value[i])
+  }
+  delayList.value = tempList
 }
-// const deviceMaterialData:any = ref([])
 function confirmClick(){
   let deviceMaterialData:any = []
-   formulaData.value.forEach((element:any) => {
+   formulaData.value.forEach((element:any,index:any) => {
      if(element.type != null){
-        deviceMaterialData.push(element)
+        let tempItem = JSON.parse(JSON.stringify(element))
+        tempItem.delay = delayList.value[index].delay
+        deviceMaterialData.push(tempItem)
      }
    
  });
+  debugger
   emit('closeChangeDialogsettings',{
     formula: formula.value,
     formulaData: formulaData.value,
-     deviceMaterialData: deviceMaterialData
+     deviceMaterialData: deviceMaterialData,
+     delayList: delayList.value
   })
 }
+
+
 </script>

 <template>
@ -329,7 +348,7 @@ function confirmClick(){
        <div @click="selectedSymbolClick(' - ')">-</div>
      </div>
      <div class="calculator-box">
-        <div style="width: 220px;" @click="selectedSymbolClick(0)">0</div>
+        <div style="width: 180px;" @click="selectedSymbolClick(0)">0</div>
        <div @click="selectedSymbolClick('.')">.</div>
        <div @click="selectedSymbolClick(' + ')">+</div>
      </div>
@ -338,8 +357,18 @@ function confirmClick(){
      </div>
      <el-button type="primary" @click="delClick">撤 回</el-button>
      <el-button type="primary" @click="confirmClick">确 定</el-button> 
-       <!-- 
-     -->
+    </div>
+    <div>
+      <div class="choiceMateria-left-title">延时时间设置</div>
+      <div v-for="(item, index) in delayList" :key="index" 
+      style="padding: 10px 0;">
+        <div style="padding-bottom: 10px;">{{"(" + item.parentName +'.'+ item.name+")"}}：</div>
+         <el-input v-model="item.delay" style="width: 200px" placeholder="">
+          <template #append>
+            s
+          </template>
+        </el-input>
+      </div>
    </div>
  </div>

@ -358,7 +387,7 @@ function confirmClick(){
    align-items: center;
  }
  .calculator-box div{
-    width: 100px;
+    width: 80px;
    height: 80px;
    line-height: 80px;
    text-align: center;
--- a/business-css/frontend/src/components/antvx6/changesettings.vue
+++ b/business-css/frontend/src/components/antvx6/changesettings.vue
@ -80,7 +80,6 @@ function getInit(row:any){
      key: "铀浓度（g/L）",
      name: "u_concentration",
      value:  row.uConcentration,
-      
      unit: "g/L",
      formula: '',
      correlation: '',
@ -204,22 +203,33 @@ function confirmTableClick(){ // 确认变动公式设置
  tableData.value[tableIndex.value].delay = formulaInfo.value.delay
  tableData.value[tableIndex.value].formulaData = formulaInfo.value.formulaData
  tableData.value[tableIndex.value].deviceMaterialData = formulaInfo.value.deviceMaterialData
+  tableData.value[tableIndex.value].delayList = formulaInfo.value.delayList
+  
  isDialogFormula.value = false
 }
 const formula:any = ref('')
 const formulaData:any = ref([])
-
+const delayList:any = ref([])
 const isChangeDialogsettings:any = ref(false) // 变动公式设置弹窗

 function openChangeDialogsettings(){ // 打开变动公式值设置弹窗
  formula.value = ''
  formulaData.value = []
-  if(tableData.value[tableIndex.value].formula !=null && tableData.value[tableIndex.value].formula != ""){
-    formula.value = tableData.value[tableIndex.value].formula
+  delayList.value = []
+  if(formulaInfo.value.formula !=null && formulaInfo.value.formula != ""){
+    formula.value = formulaInfo.value.formula
  }     
-  if(tableData.value[tableIndex.value].formulaData !=null && tableData.value[tableIndex.value].formulaData != ""){
-    formulaData.value = tableData.value[tableIndex.value].formulaData
+  if(formulaInfo.value.formulaData !=null && formulaInfo.value.formulaData.length > 0){
+    formulaData.value = formulaInfo.value.formulaData
  }
+  if(formulaInfo.value.delayList !=null && formulaInfo.value.delayList.length > 0){
+    delayList.value = formulaInfo.value.delayList
+  }
+
+    // formulaInfo.value.formula = e.formula
+    // formulaInfo.value.formulaData = e.formulaData
+    // formulaInfo.value.deviceMaterialData = e.deviceMaterialData
+    // formulaInfo.value.delayList = e.delayList
  isChangeDialogsettings.value = true
 }

@ -230,6 +240,7 @@ function closeChangeDialogsettings(e:any){ // 变动公式值设置关闭
    formulaInfo.value.formula = e.formula
    formulaInfo.value.formulaData = e.formulaData
    formulaInfo.value.deviceMaterialData = e.deviceMaterialData
+    formulaInfo.value.delayList = e.delayList
    isChangeDialogsettings.value = false
 }
 </script>
@ -321,9 +332,9 @@ function closeChangeDialogsettings(e:any){ // 变动公式值设置关闭
              <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>
+              </el-form-item> -->
            </div>
          </el-form>
          <span class="dialog-footer"
@ -339,7 +350,7 @@ function closeChangeDialogsettings(e:any){ // 变动公式值设置关闭
 <el-dialog v-model="isChangeDialogsettings" :close-on-click-modal="false" :modal="false" draggable 
        :before-close="dialogChangeDialogsettings" title="变动公式值设置"  append-to-body width="1280px" class="materialmodel-dialog-box">
        <ChangeDialogsettings v-if="isChangeDialogsettings" :projectInfo="projectInfo"
-        :formula = "formula" :formulaData= "formulaData"
+        :formula = "formula" :formulaData= "formulaData" :delayList="delayList"
        @closeChangeDialogsettings="closeChangeDialogsettings" />
  </el-dialog>

--- a/business-css/frontend/src/components/antvx6/index.vue
+++ b/business-css/frontend/src/components/antvx6/index.vue
@ -1245,7 +1245,7 @@ function saveDesign() { // 保存设计
                  entityId: cells[i].changesettings[j].deviceMaterialData[k].parentId  , //materialId :  cdeeca2e-1e0c-4bdd-b946-f347c104752c
                  property: cells[i].changesettings[j].deviceMaterialData[k].key, // 铀浓度（g/L）
                  coefficient: setFormulaInit(cells[i].changesettings[j].formula)[k], //0.2
-                  delay: { enabled: true, time: delay, unit: 's' } // 5
+                  delay: { enabled: true, time: cells[i].changesettings[j].deviceMaterialData[k].delay, unit: 's' } // 5
                })
              }
              tempData[key] = {
--- a/business-css/frontend/src/views/component/scenario/condition.vue
+++ b/business-css/frontend/src/views/component/scenario/condition.vue
@ -134,7 +134,22 @@ function menuClick(index:any){ // 点击菜单切换
   getTimelineList()
 }
 function addMenu(){ //添加导菜单
-  menuList.value.unshift({
+  // menuList.value.unshift({
+  //   label: '条件' + (menuList.value.length + 1),
+  //   target:{
+  //     entityType: '',
+  //     entityId: '',
+  //     property: '',
+  //   },
+  //   unit: 'cm',
+  //   segments: [{
+  //     segmentId: '分段-1',
+  //     start:null,
+  //     end:null,
+  //     timeline:[]
+  //   }]
+  // })
+    menuList.value.push({
    label: '条件' + (menuList.value.length + 1),
    target:{
      entityType: '',
@ -149,7 +164,7 @@ function addMenu(){ //添加导菜单
      timeline:[]
    }]
  })
-  menuIndex.value = 0
+  // menuIndex.value = 0
 }