openatc-components 0.3.97 → 0.3.99

package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue

@@ -212,8 +212,8 @@ export default {
       Detector: [], // 管理所有检测器
       DetectorChart: [], // 管理所有检测器统计图
       motorwayicon: '',
-      IconLengh: 60,
-      IconWdith: 134,
+      IconLengh: 33,
+      IconWdith: 109,
       textareaW: 200,
       textareaH: 100,
       pedW: 206,
@@ -389,8 +389,8 @@ export default {
         h: this.IconWdith,
         angle: 0
       }
-      this.IconLengh = 60
-      this.IconWdith = 134
+      this.IconLengh = 33
+      this.IconWdith = 109
       let Motorwaysitem = {
         index: this.index,
         id: this.motorid,

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -222,10 +222,6 @@ export default {
       type: Boolean,
       devault: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String
     },
@@ -722,7 +718,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         this.isLoaded = true
@@ -1044,10 +1040,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         let channelList = res.data.data.channelList.filter(ele => ele.type !== undefined)

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -41,7 +41,6 @@
       :clickMode="clickMode"
       :isThirdSignal="isThirdSignal"
       :channelType="channelType"
-      :isShowMessage ="isShowMessage"
       @handleClickCrossIcon="handleClickCrossIcon" />
   </div>
 </div>
@@ -85,10 +84,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     roadDirection: {
       type: String,
       default: 'right'

package/package/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -23,7 +23,6 @@
         :stateName="stateName"
         :isShowMode="isShowMode"
         :isShowState="isShowState"
-        :isShowMessage ="isShowMessage"
         :isShowInterval="isShowInterval"
         @onSelectStages="onSelectStages"/>
   </div>
@@ -74,10 +73,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isShowMessage: {
-      type: Boolean,
-      default: true
-    },
     isShowState: {
       type: Boolean,
       devault: false
@@ -145,7 +140,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           if (this.isResend) {
             this.reSend()
           }
@@ -197,7 +192,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale) + ' - ' + commomMsg)
             if (this.isResend) {
               this.reSend()
             }
@@ -213,7 +208,7 @@ export default {
             }
           }
           msg = msg + ' - ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           this.clearPatternInterval() // 清除其他定时器
           if (this.isResend) {
             this.reSend()
@@ -227,7 +222,7 @@ export default {
         this.controlData = this.controlFormat.handleGetData(param)
         this.$emit('getTscControl', data)
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -240,7 +235,7 @@ export default {
         if (!res.data.success) {
           let commomMsg = this.$t('openatccomponents.overview.signalID') + ': ' + this.AgentId
           let msg = getMessageByCode(res.data.code, this.$i18n.locale) + ', ' + commomMsg
-          this.isShowMessage && this.$message.error(msg)
+          this.$message.error(msg)
           return
         }
         let devParams = res.data.data.jsonparam
@@ -300,7 +295,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -335,7 +330,7 @@ export default {
         }
         if (!data.data.success) {
           if (data.data.code === '4003') {
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             return
           }
           let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
@@ -344,10 +339,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           return
         }
@@ -364,7 +359,7 @@ export default {
           controlData: controlData
         }
       }).catch(error => {
-        this.isShowMessage && this.$message.error(error)
+        this.$message.error(error)
         console.log(error)
       })
     },
@@ -373,10 +368,10 @@ export default {
         let res = data.data
         if (!res.success) {
           if (res.code === '4003') {
-            this.isShowMessage && this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
             return
           }
-          this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
           return
         }
         this.phaseList = res.data.data.phaseList

package/package/kisscomps/components/OverviewComponent/index.vue

@@ -11,17 +11,15 @@
  **/
 <template>
   <div class="container-main">
-    <div :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
+    <div class="overview-component-content" :style="{'transform': `scale(${shrink})`, 'transform-origin': 'left top', 'height': '100%'}">
       <div class="tuxingjiemian" v-show="curHomePage === 'Graphical' || curHomePage === 'Channelization'" :class="{'minifont': curBodyWidth <= 650}">
-        <div class="tuxing-left" :class="{'changeWidth': graphicMode}" ref="tuxingLeft">
+        <div :class="{'changeWidth': graphicMode, 'tuxing-left': !onlyShowIntersectionMap}" ref="tuxingLeft">
           <intersection-base-map
             v-if="curHomePage === 'Graphical'"
             ref="intersectionMap"
             :stateName="stateName"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
-            :isShowMessage ="isShowMessage"
-            :isShowInterval="isShowInterval"
             :roadDirection="roadDirection" />
           <channelization
             v-if="curHomePage === 'Channelization'"
@@ -29,7 +27,7 @@
             :AgentId="agentId"
             :crossStatusData="crossStatusData"
             :detectorStatusData="detectorStatusData" />
-          <div class="pattern-status" v-if="!graphicMode && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
+          <div class="pattern-status" v-if="!graphicMode && !onlyShowIntersectionMap && crossStatusData.control !== 1 && crossStatusData.control !== 2 && crossStatusData.control !== 3">
             <div class="pattern-name cross-mess">{{$t('openatccomponents.overviewcomponent.patternstate')}}</div>
             <div class="pattern-message">({{$t('openatccomponents.overviewcomponent.cycle')}}: {{controlData.cycle}}  {{$t('openatccomponents.overviewcomponent.patternoffset')}}: {{controlData.patternoffset}} {{$t('openatccomponents.overviewcomponent.coordinationtime')}}: {{controlData.offset}})</div>
               <span class="pattern-explain"><el-checkbox v-model="checked">{{$t('openatccomponents.overviewcomponent.overLap')}}</el-checkbox></span>
@@ -93,7 +91,7 @@
           </div>
         </div>
 
-        <div ref="tuxingRight" class="tuxing-right" >
+        <div ref="tuxingRight" class="tuxing-right" v-if="!onlyShowIntersectionMap">
           <scheme-config
             ref="rightpanel"
             :statusData="crossStatusData"
@@ -134,23 +132,18 @@ export default {
       type: String,
       default: 'right'
     },
-    isShowInterval: {
-      type: Boolean,
-      default: true
-    },
-    isShowMessage: {
+    isfromatc: {
       type: Boolean,
       default: true
     },
-    isfromatc: {
+    onlyShowIntersectionMap: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   data () {
     return {
       stateName: this.$t('openatccomponents.overview.offline'),
-      curBodyWidth: 1920,
       controlData: {},
       checked: false,
       overlap: [],
@@ -328,10 +321,10 @@ export default {
           //   let childErrorCode = data.data.data.errorCode
           //   if (childErrorCode) {
           //     let childerror = getMessageByCode(data.data.data.errorCode, _this.$i18n.locale)
-          //     _this.isShowMessage && _this.$message.error(parrenterror + ',' + childerror)
+          //     _this.$message.error(parrenterror + ',' + childerror)
           //   }
           // } else {
-          //   _this.isShowMessage && _this.$message.error(parrenterror)
+          //   _this.$message.error(parrenterror)
           // }
           _this.curHomePage = 'Graphical'
           return
@@ -371,7 +364,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -381,10 +374,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           if (this.isResend) {
             this.reSend()
@@ -446,7 +439,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -454,7 +447,7 @@ export default {
             // this.devStatus = 2
             this.clearPatternInterval() // 清除其他定时器
             this.clearVolumeInterval()
-            this.isShowMessage && this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
             if (this.isResend) {
               this.reSend()
             }
@@ -466,10 +459,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           this.clearPatternInterval() // 清除其他定时器
           this.clearVolumeInterval()
@@ -489,7 +482,7 @@ export default {
         console.log('this.controlData', this.controlData)
         this.checkStage(this.controlData)
       }).catch(error => {
-        // this.isShowMessage && this.$message.error(error)
+        // this.$message.error(error)
         console.log(error)
       })
     },
@@ -712,7 +705,7 @@ export default {
     queryDevParams () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam
@@ -744,7 +737,7 @@ export default {
             let success = data.data.data.content.success
             if (success !== 0) {
               let errormsg = 'openatccomponents.overview.putTscControlError' + success
-              this.isShowMessage && this.$message.error(this.$t(errormsg))
+              this.$message.error(this.$t(errormsg))
               return
             }
           }
@@ -754,10 +747,10 @@ export default {
             let childErrorCode = data.data.data.errorCode
             if (childErrorCode) {
               let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
-              this.isShowMessage && this.$message.error(parrenterror + ',' + childerror)
+              this.$message.error(parrenterror + ',' + childerror)
             }
           } else {
-            this.isShowMessage && this.$message.error(parrenterror)
+            this.$message.error(parrenterror)
           }
           return
         }
@@ -769,7 +762,7 @@ export default {
     getPlatform () {
       queryDevice(this.AgentId).then(res => {
         if (!res.data.success) {
-          this.isShowMessage && this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
           return
         }
         let devParams = res.data.data.jsonparam

package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -50,7 +50,7 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
               </div>
             </el-tooltip>
         </el-col>
@@ -79,9 +79,13 @@ export default {
   },
   data () {
     return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
       styles: {
         left: '1px',
-        top: '0'
+        top: '0px'
       },
       typeOptions: [{
         value: 'flow-split-opt'
@@ -97,6 +101,9 @@ export default {
       type: String,
       default: 'Header'
     },
+    id: {
+      type: Number
+    },
     rings: {
       type: Object
     },
@@ -209,6 +216,7 @@ export default {
                   }
                 }
               }
+              this.$emit('optimizesucess', this.id)
             }
           }).catch(error => {
             console.log(error)
@@ -232,6 +240,7 @@ export default {
                 }
               }
             }
+            this.$emit('optimizesucess', this.id)
           }
         }).catch(error => {
           console.log(error)

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

@@ -14,8 +14,9 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-            <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+          <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
+            <div style="position: relative;" :style="{'height': '34px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
+              <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">{{$t('openatccomponents.phase.phase')}}{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -25,7 +26,18 @@
                     </div>
                     <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
                       <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
-                      <div class="ring-nums">{{item.split}}</div>
+                      <div v-if="isMove" class="ring-nums">{{item.split}}</div>
+                      <el-input-number
+                        v-if="!isMove"
+                        class="ring-nums"
+                        size="small"
+                        :controls="false"
+                        :min="0"
+                        :step="1"
+                        v-model.number="item.split"
+                        @change="handleEdit(item)"
+                        style="width: 24px"
+                      ></el-input-number>
                     </div>
                   </div>
                 </el-tooltip>
@@ -41,7 +53,8 @@
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.flashgreen.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','float':'left','background': 'linear-gradient(to right, #ffffff 50%, #7ccc66 0)','background-size': '4px 100%'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
               <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.redWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f27979'}"></div>
-              </div>
+            </div>
+          </draggable>
           </div>
         <div v-if="showBarrier">
           <div v-for="(item, index) in barrierList" :key="index + '1'">
@@ -100,6 +113,7 @@
 <script>
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
 import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+import draggable from 'vuedraggable'
 // import PatternWalkSvg from '../IntersectionMap/crossDirection/baseImg/PatternWalkSvg'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
@@ -107,6 +121,7 @@ export default {
   name: 'pattern-list',
   components: {
     // patternwalksvg,
+    draggable,
     xdrdirselector
   },
   data () {
@@ -114,6 +129,7 @@ export default {
       barrierHeight: '',
       stageCycle: '',
       barrierList: [],
+      barrierArr: [],
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
@@ -142,6 +158,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    isMove: {
+      type: Boolean,
+      default: true
+    },
     controlPhase: {
       type: Object
     },
@@ -343,11 +363,11 @@ export default {
       handler: function (val, oldVal) {
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
-          setTimeout(() => {
-            this.handleCurrentChange(this.patternStatusList)
-            this.handleBarrierHeight()
-          }, 10)
+          // setTimeout(() => {
+          this.handleCurrentChange(this.patternStatusList)
           this.handleBarrierHeight()
+          // }, 10)
+          // this.handleBarrierHeight()
         }
       },
       // 深度观察监听
@@ -375,6 +395,60 @@ export default {
     }
   },
   methods: {
+    move (e) {
+      // 这里的e表示即将停靠的元素。
+      let result = this.barrierArr.filter(item => item.includes(e.relatedContext.element.id))[0]
+      if (!result.includes(e.draggedContext.element.id)) {
+        return false
+      }
+    },
+    endDrag (index) {
+      // 拖动后对原数据排序
+      const idIndexMap = {}
+      this.patternInfo.forEach((subArray, subArrayIndex) => {
+        subArray.forEach((item, index) => {
+          idIndexMap[item.id] = { subArrayIndex, index }
+        })
+      })
+      this.patternStatusList.forEach((subArray, subArrayIndex) => {
+        if (subArray.length > 0) {
+          subArray.sort((aItem, bItem) => {
+            const aIndex = idIndexMap[aItem.id] ? idIndexMap[aItem.id].index : Infinity
+            const bIndex = idIndexMap[bItem.id] ? idIndexMap[bItem.id].index : Infinity
+            return aIndex - bIndex
+          })
+        }
+      })
+    },
+    handleEdit (val) {
+      this.patternStatusList.map(d => {
+        d.map(r => {
+          if (r.id === val.id) {
+            r.value = val.split
+          }
+        })
+      })
+      // this.handleCurrentChange(this.patternStatusList)
+      this.$emit('handleSplitMove', this.patternId)
+    },
+    getMaxCycle (pattern) {
+      // let rings = pattern.rings
+      let maxCycle = 0
+      for (let ring of pattern) {
+        if (ring.length === 0) continue
+        let cycle = 0
+        for (let r of ring) {
+          if (r.mode === 7) { // 忽略相位不计周期
+            continue
+          }
+          cycle = cycle + r.value
+        }
+        if (cycle > maxCycle) {
+          maxCycle = cycle
+        }
+      }
+      return maxCycle
+    },
     getPed (data) {
       let ped = []
       for (let stg of data) {
@@ -1179,6 +1253,7 @@ export default {
           }
         }
         let resArr = ringArr.map(item => item.data)
+        this.barrierArr = resArr
         let ringTeam = this.step1(this.phaseList, resArr)
         let ringTeams = ringTeam.filter(item => item.length !== 0)
         if (this.patternList) {
@@ -1267,30 +1342,16 @@ export default {
           }
           obj.split = split
           obj.cycle = cycle
-          const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
-          const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
-          if (isZero <= 0) {
-            if (ring.sum) {
-              obj.sum = ring.sum
-              obj.redWidth = ((((currPhase.redclear + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            } else {
-              obj.redWidth = (((currPhase.redclear / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            }
-            obj.greenWidth = (((split - (currPhase.redclear / allAdd) - (currPhase.yellow / allAdd) - (currPhase.flashgreen / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.yellowWidth = (((currPhase.yellow / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.flashgreen = (((currPhase.flashgreen / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+          if (ring.sum) {
+            obj.sum = ring.sum
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
           } else {
-            if (ring.sum) {
-              obj.sum = ring.sum
-              obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            } else {
-              obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            }
-            obj.mode = ring.mode
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
           }
+          obj.mode = ring.mode
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1456,9 +1517,7 @@ export default {
         newMin.push(minNum)
         let newmaxNum = Math.max.apply(Math, newMax)// 每组最大值
         let newminNum = Math.min.apply(Math, newMin)
-        if (newArr.length > 1) {
-          this.newCycle = newmaxNum + newminNum
-        }
+        this.newCycle = newmaxNum + newminNum
         if (newmaxNum === newminNum) {
           this.max = newmaxNum + newminNum
           pattern.map(d => {

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

@@ -39,7 +39,6 @@
               :overlap="overlap"
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
-              :funcSort="funcSort"
               :isShowBack="isShowBack"
               :isShowRecovery="isShowRecovery"
               :isShowImplement="isShowImplement"
@@ -103,7 +102,6 @@
             :overlap="overlap"
             :patternSelect="patternSelect"
             :allPatternList="allPatternList"
-            :funcSort="funcSort"
             :isShowBack="isShowBack"
             :isShowRecovery="isShowRecovery"
             :isShowImplement="isShowImplement"
@@ -515,6 +513,14 @@ export default {
   async mounted () {
     this.resetcomponent = true
     this.init()
+    if (this.realtimeStatusModalvisible === false) {
+      this.changeStatus()
+    }
+    this.setPropsToken(this.Token)
+    this.hiddenPartControl()
+    // await this.getPhase()
+    this.getFault()
+    this.initData()
   },
   methods: {
     resetComponent () {
@@ -530,7 +536,6 @@ export default {
         this.changeStatus()
       }
       this.setPropsToken(this.Token)
-      this.hiddenPartControl()
       // await this.getPhase()
       this.getFault()
       this.initData()