openatc-components 0.5.74 → 0.5.76

package/package/kisscomps/components/SchemeConfig/lockingPhaselControlModal/index.vue

@@ -54,6 +54,14 @@
                prop="intersection">
              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempRedclear" size="small"></el-input-number>
            </el-form-item>
+           <el-form-item
+               :label="$t('openatccomponents.overview.lockingtype')"
+               prop="group">
+             <el-select v-model="manualInfo.group" size="small" style="width: 100%;">
+               <el-option :label="$t('openatccomponents.overview.phasepass')" :value="0"></el-option>
+               <el-option :label="$t('openatccomponents.overview.stagepass')" :value="1"></el-option>
+             </el-select>
+           </el-form-item>
           </el-form>
      </el-col>
     </el-row>
@@ -140,7 +148,8 @@ export default {
         tempDuration: 600, // 控制方式手动操作的情况下的持续时间的临时值。
         tempYellow: 3,
         tempRedclear: 2,
-        tempMingreen: 15
+        tempMingreen: 15,
+        group: 0
       },
       lockingOption: [{
         value: 0
@@ -187,6 +196,9 @@ export default {
       if (this.manualInfo.tempMingreen !== undefined) {
         submitdata.data.mingreen = Number(this.manualInfo.tempMingreen)
       }
+      if (this.manualInfo.group !== undefined) {
+        submitdata.data.group = Number(this.manualInfo.group)
+      }
       submitdata.data.phases = this.phases
       this.$emit('closePhaseControl', submitdata)
     },

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue

@@ -41,19 +41,22 @@
 
         <div class="stage-part" v-if="preselecttype === '阶段锁定'">
           <div class="stage-label">{{$t('openatccomponents.overview.stage')}}</div>
-          <div style="width: 100%; height: auto;overflow: hidden;display: flex;align-items: center;" v-if="isHasPermission('configer:manual:dwell')">
-            <div style="flex: 1;">
-              <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
-                      :phaseList="phaseList"
-                      :preselectStages="preselectStages"
-                      :preselectModel="preselectModel"
-                      :isShowCurrentStage="false"
-                      @onSelectStages="selectStages"></Stages>
-            </div>
-            <div style="display: flex;gap: 10px;margin-left: 15px;">
-              <div class="single-model stage-btn stage-btn-extend" @click="selectStages(998)" :class="preselectStages === 998 ? 'stage-btn-active' : ''">延长</div>
-              <div class="single-model stage-btn stage-btn-shorten" @click="selectStages(999)" :class="preselectStages === 999 ? 'stage-btn-active' : ''">缩短</div>
-            </div>
+          <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
+            <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
+                    :phaseList="phaseList"
+                    :preselectStages="preselectStages"
+                    :preselectModel="preselectModel"
+                    :isShowCurrentStage="false"
+                    @onSelectStages="selectStages">
+              <template v-slot:after-stages>
+                <div class="control-model">
+                  <div class="single-model stage-btn stage-btn-extend" @click="selectStages(998)" :class="preselectStages === 998 ? 'stage-btn-active' : ''">延长</div>
+                </div>
+                <div class="control-model">
+                  <div class="single-model stage-btn stage-btn-shorten" @click="selectStages(999)" :class="preselectStages === 999 ? 'stage-btn-active' : ''">缩短</div>
+                </div>
+              </template>
+            </Stages>
           </div>
         </div>
 

package/package/kisscomps/components/Stages/index.vue

@@ -46,6 +46,7 @@
             </div>
           </div>
         </div>
+        <slot name="after-stages"></slot>
       </div>
   </div>
 </template>
@@ -203,16 +204,19 @@ export default {
     }
   },
   watch: {
-    preselectStages: { 
+    preselectStages: {
       handler: function (val, oldVal) {
-        if(this.preselectStages === -1 && this.preselectModel !== -1) {
+        if (this.preselectStages > 0 && this.preselectStages <= this.stagesList.length) {
+          this.currentStage = this.preselectStages
+        } else {
           this.currentStage = -1
         }
+        this.clickType(this.stagesList, this.currentStage)
       },
       // 深度观察监听
       deep: true
     },
-    preselectModel: { 
+    preselectModel: {
       handler: function (val, oldVal) {
         if(this.preselectStages === -1 && this.preselectModel !== -1) {
           this.currentStage = -1
@@ -228,6 +232,12 @@ export default {
         } else {
           this.presetStageIndex = this.presetIndex
         }
+        if (this.preselectStages > 0 && this.preselectStages <= this.stagesList.length) {
+          this.currentStage = this.preselectStages
+        } else {
+          this.currentStage = -1
+        }
+        this.clickType(this.stagesList, this.currentStage)
       },
       // 深度观察监听
       deep: true