openatc-components 0.0.44-hotfix → 0.0.47

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -30,7 +30,7 @@
                   </div>
                 </el-tooltip>
                 <div style="position:relative; width:50px;" v-for="(bus,index3) in busPhaseData" :key="index3">
-                  <i class="iconfont icon-lukouquhua" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
+                  <i class="iconfont icon-lukouzhilu" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 1 && bus.phaseid===item.id"></i>
                   <i class="iconfont icon-BRT" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 4 && bus.phaseid===item.id"></i>
                   <i class="iconfont icon-xuxiangwei" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 99 && bus.phaseid===item.id"></i>
                   <i class="iconfont icon-feijidongche" style="position: absolute;top: 8px;font-size:12px;color:#454545;" v-if="bus.controltype === 6 && bus.phaseid===item.id"></i>

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

@@ -182,6 +182,12 @@ export default {
     }
   },
   computed: {
+    rings () {
+      return this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
+    },
+    cycle () {
+      return this.patternOne.length === 0 ? this.planPattern.cycle : this.patternOne[0].cycle
+    },
     offset () {
       return this.patternOne.length === 0 ? 0 : this.patternOne[0].offset
     },
@@ -1400,7 +1406,9 @@ export default {
         duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }
-      //   submitdata.data.phases = this.handleSubmitPhaseClose()
+      submitdata.data.offset = this.offset
+      submitdata.data.cycle = this.cycle
+      submitdata.data.rings = this.rings
       this.$emit('closePhaseControl', submitdata)
     }
   }

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

@@ -24,19 +24,21 @@
                                 :Width="'55'"
                                 :Height="'55'" />
               </template> -->
-                <PatternWalkSvg class="patternWalk"
+                <patternwalksvg class="patternWalk"
                           :showWalk="item[0].peddirection"
                           :sidewalkPhaseData="item[0].sidewalkPhaseData"
-                          :Width="'55'"
-                          :Height="'55'" />
+                          :Width="'40'"
+                          :Height="'40'" />
               <xdr-dir-selector Width="40PX" Height="40PX" :showlist="item"></xdr-dir-selector>
               <div style="display:flex;flex-direction:row;justify-content:center;align-items:center;">
                 <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                 <div style="width:70%;">
                   <i class="iconfont icon-feijidongche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 6"></i>
-                  <i class="iconfont icon-lukouquhua" style="position: absolute;top: 8px;font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 1"></i>
-                  <i class="iconfont icon-BRT" style="position: absolute;top: 8px;font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 4"></i>
-                  <i class="iconfont icon-xuxiangwei" style="position: absolute;top: 8px;font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                  <i class="iconfont icon-lukouzhilu" style="font-size:16PX;color:#454545;" v-if="item[item.length-1].controltype === 1"></i>
+                  <i class="iconfont icon-BRT" style="position: absolute;top: 8PX;font-size:11PX;color:#454545;" v-if="item[item.length-1].controltype === 4"></i>
+                  <div style="transform:scale(0.65);margin-left:-6px;">
+                    <i class="iconfont icon-xuxiangwei" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                  </div>
                   <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 3"></i>
                   <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;" v-if="item[item.length-1].controltype === 5"></i>
                 </div>
@@ -55,8 +57,12 @@
 <script>
 /* eslint-disable */
 import RingDataModel from '../../../utils/RingDataModel.js'
+import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 export default {
   name: 'Stages',
+  components: {
+    patternwalksvg
+  },
   props: {
     isShowCurrentStage: {
       type: Boolean,