npm - openatc-components - Versions diffs - 0.2.7 → 0.2.8 - Mend

openatc-components 0.2.7 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

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

@@ -1,286 +1,134 @@
 <template>
   <div class="tentativeplan-control">
-    <div class="title" style="margin-bottom: 18px">
-      {{ $t('openatccomponents.overview.tentativeplan') }}
-    </div>
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.tentativeplan')}}</div>
     <el-row>
       <el-col :span="12">
-        <el-form
-          ref="manual"
-          label-position="left"
-          :model="manualInfo"
-          label-width="100px"
-        >
-          <el-form-item
-            :label="$t('openatccomponents.overview.patternid') + ':'"
-            prop="count"
-          >
-            <el-select
-              @change="selectPattern()"
-              v-model="manualInfo.tempPatternid"
-              class="col-inner"
-              size="small"
-              :placeholder="$t('openatccomponents.common.select')"
-            >
-              <el-option
-                v-for="item in patternSelect"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
-          </el-form-item>
-          <el-form-item
-            :label="$t('openatccomponents.overview.delay') + ':'"
-            prop="intersection"
-          >
-            <el-input-number
-              :placeholder="$t('openatccomponents.common.input')"
-              :min="0"
-              :max="65535"
-              :precision="0"
-              :step="1"
-              :controls="false"
-              v-model.number="manualInfo.tempDelay"
-              size="mini"
-            ></el-input-number>
-            <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
-          </el-form-item>
-        </el-form>
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+           <el-form-item
+                :label="$t('openatccomponents.overview.patternid') + ':'"
+                prop="count">
+                <el-select @change="selectPattern()" v-model="manualInfo.tempPatternid" class="col-inner"  size="small" :placeholder="$t('openatccomponents.common.select')">
+                  <el-option
+                    v-for="item in patternSelect"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.delay') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
       </el-col>
       <el-col :span="12">
-        <el-form
-          ref="manual"
-          label-position="left"
-          :model="manualInfo"
-          label-width="100px"
-        >
-          <el-form-item
-            :label="$t('openatccomponents.overview.patternoffset') + ':'"
-            prop="count"
-          >
-            <el-input-number
-              :placeholder="$t('openatccomponents.common.input')"
-              :min="0"
-              :max="65535"
-              :precision="0"
-              :step="1"
-              :controls="false"
-              v-model.number="manualInfo.offset"
-              size="mini"
-            ></el-input-number>
-            <!-- <el-input v-model="manualInfo.offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
-          </el-form-item>
-          <el-form-item
-            :label="$t('openatccomponents.overview.duration') + ':'"
-            prop="intersection"
-          >
-            <el-input-number
-              :placeholder="$t('openatccomponents.common.input')"
-              :min="0"
-              :max="65535"
-              :precision="0"
-              :step="1"
-              :controls="false"
-              v-model.number="manualInfo.duration"
-              size="mini"
-            ></el-input-number>
-            <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
-          </el-form-item>
-        </el-form>
+         <el-form
+           ref="manual"
+           label-position="left"
+           :model="manualInfo"
+           label-width="100px">
+           <el-form-item
+                :label="$t('openatccomponents.overview.patternoffset') + ':'"
+                prop="count">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.offset" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+            <el-form-item
+                :label="$t('openatccomponents.overview.duration') + ':'"
+                prop="intersection">
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            </el-form-item>
+           </el-form>
       </el-col>
     </el-row>
     <el-row>
-      <el-radio
-        style="margin-left: 30px"
-        v-model="isRing"
-        :label="false"
-        @change="changeRing"
-        >{{ $t('openatccomponents.common.ringStyle') }}</el-radio
-      >
-      <el-radio v-model="isRing" :label="true" @change="changeStage">{{
-        $t('openatccomponents.common.stageStyle')
-      }}</el-radio>
-      <!-- <div class="title" style="margin-top:18px; margin-bottom:10px">{{$t('openatccomponents.overview.patternstate')}}:
+        <div class="title" style="margin-top:18px; margin-bottom:10px">{{$t('openatccomponents.overview.patternstate')}}:
             <span>({{$t('openatccomponents.overview.cycle')}}: {{cycle}}  {{$t('openatccomponents.overview.patternoffset')}}: {{offset}})</span>
-        </div> -->
-      <!-- <stage-status
+        </div>
+        <stage-status
         :patternStatusList="patternOne.length===0?planPattern.rings:patternOne[0].rings"
         >
-        </stage-status> -->
-      <pattern-list
-        :key="keyChange"
-        :allPatternList="allPatternList"
-        :contrloType="!this.isRing ? 'ring' : 'stage'"
-        :stagesChange="
-          patternOne.length === 0
-            ? planPattern.stagesList
-            : patternOne[0].stagesList
-        "
-        :patternList="patternOne.length === 0 ? planPattern.rings : patternOne"
-        :patternStatusList="
-          patternOne.length === 0 ? planPattern.rings : patternOne[0].rings
-        "
-        :cycles="
-          patternOne.length === 0 ? planPattern.cycle : patternOne[0].cycle
-        "
-        :phaseList="phaseList"
-      >
-      </pattern-list>
+        </stage-status>
+        <pattern-list
+        :patternList="patternOne.length===0?planPattern.rings:patternOne"
+        :patternStatusList="patternOne.length===0?planPattern.rings:patternOne[0].rings"
+        :cycles="patternOne.length===0?planPattern.cycle:patternOne[0].cycle"
+        :phaseList="phaseList">
+        </pattern-list>
     </el-row>
     <el-row>
-      <el-tabs v-model="activeList" type="card">
-        <el-tab-pane
-          v-if="!isRing"
-          :label="$t('openatccomponents.pattern.ringConfig')"
-          name="ring"
-        >
-          <div style="width: 100%; overflow: hidden; margin-top: 20px">
-            <kan-ban
-              v-for="n in ringCount"
-              :key="n"
-              class="closephasekanban"
-              :index="n"
-              :options="options"
-              :list="
-                patternOne.length === 0
-                  ? planPattern.rings[n - 1]
-                  : patternOne[0].rings[n - 1]
-              "
-              :phaseList="phaseList"
-              :header-text="$t('openatccomponents.pattern.ring') + n"
-              @handleSplit="handleSplit"
-            >
-            </kan-ban>
-          </div>
-        </el-tab-pane>
-        <!-- <el-tab-pane v-if="isRing" :label="$t('openatccomponents.pattern.stageConfig')" name="kanban">
-              <div class="stage-panel-contener">
-                <StageKanban
-                  v-for="(stage, index) in scope.row.stagesList"
-                  class="kanban todo"
-                  :key="index"
-                  :stage="stage"
-                  :stageInfo="scope.row.stagesList"
-                  :isRing="isRing"
-                  :options="scope.row.options"
-                  :coordphaseOption="coordphaseOption"
-                  :rowIndex="scope.$index"
-                  :subIndex="index"
-                  @onStageSplitChange="onStageSplitChange"
-                  @stageSplitChange="stageSplitChange"
-                  @onStageDelaystartChange="onStageDelaystartChange"
-                  @onStageAdvanceendChange="onStageAdvanceendChange"
-                />
-                <div v-if="isRing" style="margin-left: 20px">
-                  <el-button
-                    type="primary"
-                    @click="addStage(scope.row.stagesList)"
-                    icon="el-icon-plus"
-                    circle
-                  ></el-button>
-                </div>
-              </div>
-            </el-tab-pane> -->
-        <el-tab-pane
-          v-if="isRing"
-          :label="$t('openatccomponents.pattern.stageConfig')"
-          name="ring"
-        >
-          <div class="stage-panel-contener">
-            <stage-bord
-              v-for="(stage, index) in patternOne.length === 0
-                ? planPattern.stagesList
-                : patternOne[0].stagesList"
-              class="kanban todo"
-              :key="index"
-              :stage="stage"
-              :options="options"
-              :isRing="isRing"
-              :stageInfo="
-                patternOne.length === 0
-                  ? planPattern.stagesList
-                  : patternOne[0].stagesList
-              "
-              :coordphaseOption="coordphaseOption"
-              :subIndex="index"
-              @onStageSplitChange="onStageSplitChange"
-              @stageSplitChange="stageSplitChange"
-              @onStageDelaystartChange="onStageDelaystartChange"
-              @onStageAdvanceendChange="onStageAdvanceendChange"
-            >
-            </stage-bord>
-            <div v-if="isRing" style="margin-left: 20px">
-              <el-button
-                type="primary"
-                @click="
-                  addStage(
-                    patternOne.length === 0
-                      ? planPattern.stagesList
-                      : patternOne[0].stagesList
-                  )
-                "
-                icon="el-icon-plus"
-                circle
-              ></el-button>
-            </div>
-          </div>
-        </el-tab-pane>
-        <el-tab-pane
-          v-if="!isRing"
-          :label="$t('openatccomponents.pattern.parameters')"
-          name="parame"
-        >
-          <el-row>
-            <expend-config
-              v-for="(j, index) in ringCounts"
-              :key="index"
-              class="expendkanban"
-              :options="options"
-              :header-text="$t('openatccomponents.pattern.ring') + j"
-              :list="
-                patternOne.length === 0
-                  ? planPattern.rings[j - 1]
-                  : patternOne[0].rings[j - 1]
-              "
-            >
-            </expend-config>
-            <div class="forbiddenstage">
-              {{ $t('openatccomponents.pattern.forbiddenstage') }}
-              <el-input
-                class="stage-value"
-                size="small"
-                v-model="forbiddenstage"
-              ></el-input>
-            </div>
-            <div class="forbiddenstage">
-              {{ $t('openatccomponents.pattern.screenstage') }}
-              <el-input
-                class="stage-value"
-                size="small"
-                v-model="screenstage"
-              ></el-input>
+    <el-tabs v-model="activeList" type="card">
+        <el-tab-pane :label="$t('openatccomponents.pattern.ringConfig')" name="ring">
+            <div style="width: 100%; overflow: hidden;margin-top: 20px;">
+                <kan-ban v-for="n in ringCount"
+                :key="n" class="closephasekanban"
+                :index="n"
+                :options="options"
+                :list="patternOne.length===0?planPattern.rings[n-1]:patternOne[0].rings[n-1]"
+                :phaseList="phaseList"
+                :header-text="$t('openatccomponents.pattern.ring')+n"
+                @handleSplit="handleSplit">
+                </kan-ban>
             </div>
-            <div class="forbiddenstage">
-              {{ $t('openatccomponents.pattern.coordinatestage') }}
-              <el-input
-                class="stage-value"
-                size="small"
-                v-model="coordinatestage"
-              ></el-input>
-            </div>
-          </el-row>
         </el-tab-pane>
-        <el-tab-pane
-          v-if="!isRing"
-          :label="$t('openatccomponents.pattern.overLap')"
-          name="overlap"
-        >
-          <el-row :gutter="20">
-            <el-col :span="24">
-              <over-lap
+        <!-- <el-tab-pane :label="$t('openatccomponents.pattern.stageConfig')" name="kanban">
+            <el-scrollbar :vertical="true">
+                <div class="stage-panel-contener">
+                    <stage-board v-for="(stage,index) in patternOne.length===0?stagesList:patternOne[0].stagesList"
+                        class="closephasekanban"
+                        :key="index"
+                        :stage="stage"
+                        :options="options"
+                        :stageInfo="patternOne.length===0?stagesList:patternOne[0].stagesList"
+                        :coordphaseOption="coordphaseOption"
+                        :subIndex="index"
+                        @onStageSplitChange="onStageSplitChange"
+                        @stageSplitChange="stageSplitChange"
+                        @onStageDelaystartChange="onStageDelaystartChange"
+                        @onStageAdvanceendChange="onStageAdvanceendChange"
+                        >
+                    </stage-board>
+                </div>
+            </el-scrollbar>
+        </el-tab-pane> -->
+            <el-tab-pane :label="$t('openatccomponents.pattern.parameters')" name="parame">
+                <el-row>
+                    <expend-config
+                    v-for="(j,index) in ringCounts"
+                    :key="index"
+                    class="expendkanban"
+                    :options="options"
+                    :header-text="$t('openatccomponents.pattern.ring')+j"
+                    :list="patternOne.length===0?planPattern.rings[j-1]:patternOne[0].rings[j-1]"
+                    >
+                    </expend-config>
+                    <div class="forbiddenstage">
+                        {{$t('openatccomponents.pattern.forbiddenstage')}}
+                        <el-input class="stage-value" size="small" v-model="forbiddenstage"></el-input>
+                    </div>
+                    <div class="forbiddenstage">
+                        {{$t('openatccomponents.pattern.screenstage')}}
+                        <el-input class="stage-value" size="small" v-model="screenstage"></el-input>
+                    </div>
+                    <div class="forbiddenstage">
+                        {{$t('openatccomponents.pattern.coordinatestage')}}
+                        <el-input class="stage-value" size="small" v-model="coordinatestage"></el-input>
+                    </div>
+                </el-row>
+            </el-tab-pane>
+            <el-tab-pane :label="$t('openatccomponents.pattern.overLap')" name="overlap">
+                <el-row :gutter="20">
+                <el-col :span="24" >
+                    <over-lap
                     :stageList="stagesList"
                     :overlap="overlap"
                     :checked="true"
@@ -288,50 +136,33 @@
                     :cycle="overLapCycle"
                     >
                     </over-lap>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane
-          v-if="!isRing"
-          :label="$t('openatccomponents.pattern.patternOptimize')"
-          name="patternOptimize"
-        >
-          <pattern-optimize
-            v-for="n in optimizes"
-            :key="n"
-            class="expendkanban"
-            :list="
-              patternOne.length === 0
-                ? planPattern.rings[n - 1]
-                : patternOne[0].rings[n - 1]
-            "
-            :rings="patternOne.length === 0 ? planPattern : patternOne[0]"
-            :phaseList="phaseList"
-            :options="options"
-            :header-text="$t('openatccomponents.pattern.ring') + n"
-            :index="n"
-            :nowNumber="n"
-            @handleSplit="handleSplit"
-          >
-          </pattern-optimize>
-        </el-tab-pane>
-      </el-tabs>
+                </el-col>
+                </el-row>
+            </el-tab-pane>
+            <el-tab-pane :label="$t('openatccomponents.pattern.patternOptimize')" name="patternOptimize">
+                <pattern-optimize
+                v-for="n in optimizes"
+                :key="n" class="expendkanban"
+                :list="patternOne.length===0?planPattern.rings[n-1]:patternOne[0].rings[n-1]"
+                :rings="patternOne.length===0?planPattern:patternOne[0]"
+                :phaseList="phaseList"
+                :options="options"
+                :header-text="$t('openatccomponents.pattern.ring')+n"
+                :index="n"
+                :nowNumber="n"
+                @handleSplit="handleSplit"
+                >
+                </pattern-optimize>
+            </el-tab-pane>
+        </el-tabs>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
-      <el-button @click="handleClose()">{{
-        $t('openatccomponents.button.Back')
-      }}</el-button>
-      <el-button type="primary" @click="handleManualControl()">{{
-        $t('openatccomponents.overview.implement')
-      }}</el-button>
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.implement')}}</el-button>
     </div>
     <div class="footer" v-if="!realtimeStatusModalvisible">
-      <el-button @click="handleClose()">{{
-        $t('openatccomponents.button.Back')
-      }}</el-button>
-      <el-button type="primary" @click="handleManualControl()">{{
-        $t('openatccomponents.overview.comfirm')
-      }}</el-button>
+        <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
+        <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
 </template>
@@ -384,7 +215,6 @@ export default {
     return {
       stagesList: [],
       phaseRings: [],
-      keyChange: false,
       overLapCycle: 0,
       options: {
         group: 'pattern'
@@ -392,8 +222,6 @@ export default {
       max: '',
       patternCycleEqual: true,
       activeList: 'ring',
-      isRing: false,
-      // isChange: false,
       ringCount: 1,
       ringCounts: 1,
       barriers: [],
@@ -419,137 +247,9 @@ export default {
     this.initData()
   },
   methods: {
-    addStage (row) {
-      // this.isChange = false
-      if (row.length > 15) {
-        this.$message.error(
-          this.$t('edge.pattern.mostlist')
-        )
-        return
-      }
-      if (this.patternOne.length !== 0) {
-        this.patternOne[0].stagesList.push({
-          key: row.length,
-          green: 25,
-          yellow: 3,
-          red: 2,
-          phases: [],
-          stageSplit: 30
-        })
-      } else {
-        this.planPattern.stagesList.push({
-          key: row.length,
-          green: 25,
-          yellow: 3,
-          red: 2,
-          phases: [],
-          stageSplit: 30
-        })
-      }
-    },
-    changeRing () {
-      // this.contrloType = 'stage'
-      this.isRing = false
-      // const globalParamModel = this.$store.getters.globalParamModel
-      // let pattern = globalParamModel.getParamsByType('patternList')
-      // let pattern = this.allPatternList
-      this.getCycle()
-      this.patternOne = this.allPatternList.filter(item => {
-        return item.id === Number(this.manualInfo.tempPatternid)
-      })
-      // if (this.isChange) {
-      //   for (let i = 0; i < pattern.length; i++) {
-      this.handleStageData(this.patternOne.rings)
-      //   }
-      // } else {
-      //   for (let i = 0; i < pattern.length; i++) {
-      //     this.setStageList(pattern[i].stagesList, pattern[i].id)
-      //   }
-      // }
-    },
-    changeStage () {
-      this.isRing = true
-      this.getStageCycle()
-    },
-    getStageCycle () {
-      // this.patternOne.length === 0 ? this.allPatternList this.patternOne
-      if (this.patternOne.length === 0) {
-        this.setStageList(this.planPattern.stagesList, this.planPattern.id)
-      } else {
-        //   this.patternOne = this.allPatternList.filter(item => {
-        //   return item.id === Number(this.manualInfo.tempPatternid)
-        // })
-        this.setStageList(this.patternOne[0].stagesList, this.patternOne[0].id)
-      }
-      // let pattern = this.allPatternList
-      // for (let i = 0; i < pattern.length; i++) {
-      // this.patternOne[0].cycle = this.changeStageCycle(pattern[i])
-      // }
-    },
-    // changeStageCycle (pattern) {
-    //   let rings = pattern.stagesList
-    //   let stageCycleList = rings.map(item => {
-    //     if (item.stageSplit) {
-    //       return item.stageSplit
-    //     } else {
-    //       return 0
-    //     }
-    //   })
-    //   let maxCycle = stageCycleList.reduce((a, b) => {
-    //     return a + b
-    //   }, 0)
-    //   return maxCycle
-    // },
-    setStageList (stageChange, id) {
-      // let patternList = this.globalParamModel.getParamsByType('patternList')
-      // let patternList = this.allPatternList
-      let stagesList = []
-      for (let i = 0; i < stageChange.length; i++) {
-        let stage = JSON.parse(JSON.stringify(stageChange[i]))
-        let stageItem = this.getStageItems(stage.phases, i, stageChange)
-        stagesList.push(JSON.parse(JSON.stringify(stageItem)))
-      }
-      (this.patternOne.length === 0 ? this.planPattern : this.patternOne).map(item => { // 添加特征参数stage
-        if (item.id === id) {
-          if (this.isRing) {
-            item.contrloType = 'stage'
-          } else {
-            item.contrloType = 'ring'
-          }
-          item.stagesList = JSON.parse(JSON.stringify(stagesList.filter(item => item.stageSplit)))
-        }
-      })
-      this.stagesList = stagesList.filter(item => item.stageSplit)
-    },
-    getStageItems (stageArr, i, stageChange) {
-      let res = {
-        key: i,
-        split: this.narr[i], // 阶段绿性比
-        phases: stageArr,
-        delaystart: 0,
-        advanceend: 0
-      }
-      for (let rings of stageChange) {
-        if (i === rings.key) {
-          res.green = rings.green ? rings.green : rings.green === 0 ? 0 : 25
-          res.yellow = rings.yellow ? rings.yellow : rings.yellow === 0 ? 0 : 3
-          res.red = rings.red ? rings.red : rings.red === 0 ? 0 : 2
-          res.phases = rings.phases ? rings.phases : stageArr
-          // res.stageSplit = rings.split ? rings.split : 30
-          if (rings.split) {
-            res.stageSplit = rings.split
-          } else if (rings.stageSplit) {
-            res.stageSplit = rings.stageSplit
-          } else {
-            res.stageSplit = 0
-          }
-        }
-      }
-      return res
-    },
     tranform (arr) { // 分barrier
       let newMap = new Map()
-      arr.forEach(({ id, current }) => {
+      arr.forEach(({id, current}) => {
         const find = newMap.get(current.join())
         if (find) newMap.get(current.join()).push(id)
         else newMap.set(current.join(), [id])
@@ -722,7 +422,7 @@ export default {
           if (listObj[b]) {
             const find = retItem.find(r => r.ring === listObj[b])
             if (find) find.data.push(b)
-            else retItem.push({ ring: listObj[b], data: [b] })
+            else retItem.push({ring: listObj[b], data: [b]})
           }
         })
         ret.push(retItem)
@@ -733,7 +433,6 @@ export default {
       let Pattern = {
         offset: 0,
         cycle: 0,
-        stagesList: [],
         rings: [[], [], [], []]
       }
       var newPattern = JSON.parse(JSON.stringify(Pattern))
@@ -826,13 +525,13 @@ export default {
       }
     },
     stageSplitChange (diff, rowIndex, subIndex) {
-      let row = this.patternOne.length === 0 ? this.planPattern : this.patternOne
-      let ringsList = this.patternOne.length === 0 ? row.stagesList : row[0].stagesList
+      let row = this.patternList[rowIndex]
+      let ringsList = row.stagesList
       for (let rings of ringsList) {
-        // if (subIndex === rings.key) {
-        rings.stageSplit = (rings.green ? rings.green : 0) + (rings.yellow ? rings.yellow : 0) + (rings.red ? rings.red : 0)
-        continue
-        // }
+        if (subIndex === rings.key) {
+          rings.stageSplit = (rings.green ? rings.green : 0) + (rings.yellow ? rings.yellow : 0) + (rings.red ? rings.red : 0)
+          continue
+        }
       }
     },
     onStageDelaystartChange (diff, rowIndex, subIndex) {
@@ -884,9 +583,6 @@ export default {
       this.patternOne = this.allPatternList.filter(item => {
         return item.id === selectId
       })
-      // if (this.patternOne[0].contrloType === 'stage') {
-      //   this.changeStage()
-      // }
       this.manualInfo.offset = this.offset
       for (let rings of this.patternOne[0].rings) {
         if (rings.length === 0) continue
@@ -1025,13 +721,12 @@ export default {
     },
     initData () {
       // 判断有几个环，就创建几个看板
-      // let phaseList = this.globalParamModel.getParamsByType('phaseList')
-      // this.coordphaseOption = this.phaseList.map(ele => {
-      //   return {
-      //     value: ele.id
-      //   }
-      // })
-      this.coordphaseOption = this.phaseList
+      //   let phaseList = this.globalParamModel.getParamsByType('phaseList')
+      this.coordphaseOption = this.phaseList.map(ele => {
+        return {
+          value: ele.id
+        }
+      })
       //   this.overlap = this.globalParamModel.getParamsByType('overlaplList')
       //   this.agentId = getIframdevid()
       let rings = []
@@ -1048,10 +743,10 @@ export default {
       this.ringCounts = this.ringCounts.sort(this.sortNumbers) // 把数组中的值按照从小到大的顺序重新排序
       this.optimizes = Array.from(new Set(rings)) // 去除数组重复的元素
       this.optimizes = this.optimizes.sort(this.sortNumbers) // 把数组中的值按照从小到大的顺序重新排序
-      //   this.increaseId()
-      //   this.getCycle()
-      //   this.updatePhaseDescription()
-      //   this.getOptionsOfRing()
+    //   this.increaseId()
+    //   this.getCycle()
+    //   this.updatePhaseDescription()
+    //   this.getOptionsOfRing()
     },
     sortNumbers (a, b) {
       return a - b
@@ -1079,20 +774,6 @@ export default {
       }
       return isequal
     },
-    getMaxCycleStage (pattern) {
-      let rings = pattern.stagesList
-      let stageCycleList = rings.map(item => {
-        if (item.stageSplit) {
-          return item.stageSplit
-        } else {
-          return 0
-        }
-      })
-      let maxCycle = stageCycleList.reduce((a, b) => {
-        return a + b
-      }, 0)
-      return maxCycle
-    },
     getMaxCycle (pattern) {
       let rings = pattern.rings
       let maxCycle = 0
@@ -1138,31 +819,13 @@ export default {
         // duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }
-      if (this.manualInfo.tempPatternid) {
-        submitdata.terminal = Number(this.manualInfo.tempPatternid)
-      }
       if (this.patternOne.length === 0) {
-        if (this.isRing) {
-          submitdata.data.cycle = this.getMaxCycleStage(this.planPattern)
-        } else {
-          submitdata.data.cycle = this.getMaxCycle(this.planPattern)
-        }
-        submitdata.data.stagesList = this.planPattern.stagesList
+        submitdata.data.cycle = this.getMaxCycle(this.planPattern)
       } else {
-        if (this.isRing) {
-          submitdata.data.cycle = this.getMaxCycleStage(this.patternOne[0])
-        } else {
-          submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
-        }
-        submitdata.data.stagesList = this.patternOne[0].stagesList
+        submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
       }
       submitdata.data.offset = this.offset
-      if (this.patternOne.length === 0) {
-        submitdata.data.rings = this.planPattern.rings
-      } else {
-        submitdata.data.rings = this.patternOne[0].rings
-      }
-      // submitdata.data.rings = this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
+      submitdata.data.rings = this.rings
       // this.checkPatternRules(submitdata.data.rings)
       if (this.patternCycleEqual) {
         this.$emit('closePhaseControl', submitdata)