openatc-components 0.2.85 → 0.2.87

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -22,7 +22,7 @@
         :phaseList="phaseList"
         :cycle="cycle"
         :syncTime="syncTime"
-        :style="{'margin-top':(cycle || !showBarrier)? '25px':'0'}"
+        :style="{'margin-top': '25px'}"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -531,6 +531,7 @@ export default {
     selectModel (value) {
       if (!this.isOperation) return
       this.preselectStages = -1
+      this.recoverLastModel = this.preselectModel // 记录恢复前选中的控制方式
       this.preselectModel = value
     },
     selectStages (value) {
@@ -625,6 +626,8 @@ export default {
           control.mode = key
         }
       })
+      console.log(that.preselectModel)
+      console.log(that.recoverLastModel)
       control.control = that.preselectModel
       // control.terminal = isNaN(parseInt(manualInfo.tempPatternid)) ? Number(manualInfo.tempPatternid.replace(/[^0-9]/ig, '')) : manualInfo.tempPatternid
       control.terminal = manualInfo.tempPatternid === undefined ? null : Number(manualInfo.tempPatternid)
@@ -641,8 +644,12 @@ export default {
         return
       }
       this.lockScreen()
+      debugger
       putTscControl(control).then(data => {
         that.unlockScreen()
+        if (control.control === 0) {
+          that.preselectModel = that.recoverLastModel
+        }
         let success = 0
         if (!data.data.success) {
           if (data.data.code === '4002' && data.data.data.errorCode === '4209') {
@@ -678,6 +685,9 @@ export default {
         }
       }).catch(error => {
         that.unlockScreen()
+        if (control.control === 0) {
+          that.preselectModel = that.recoverLastModel
+        }
         console.log(error)
       })
     },