openatc-components 0.2.36 → 0.2.37

package/src/kisscomps/components/SchemeConfig/azimuthlocking/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="tentativeplan-control">
-      <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.azimuthlocking')}}</div> -->
+      <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.azimuthlocking')}}</div>
       <el-row>
         <el-col :span="12">
            <el-form
@@ -11,17 +11,17 @@
              <el-form-item
                   :label="$t('openatccomponents.overview.duration') + ':'"
                   prop="count">
-                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.duration" size="small"></el-input-number>
+                  <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-form-item>
               <el-form-item
                   :label="$t('openatccomponents.overview.yellowflash') + ':'"
                   prop="intersection">
-                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.yellowflash" size="small"></el-input-number>
+                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.yellowflash" size="mini"></el-input-number>
               </el-form-item>
               <el-form-item
                   :label="$t('openatccomponents.overview.mingreen') + ':'"
                   prop="intersection">
-                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.mingreen" size="small"></el-input-number>
+                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.mingreen" size="mini"></el-input-number>
               </el-form-item>
              </el-form>
         </el-col>
@@ -34,12 +34,12 @@
              <el-form-item
                   :label="$t('openatccomponents.overview.greenclear') + ':'"
                   prop="count">
-                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.greenclear" size="small"></el-input-number>
+                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.greenclear" size="mini"></el-input-number>
               </el-form-item>
               <el-form-item
                   :label="$t('openatccomponents.overview.allred') + ':'"
                   prop="intersection">
-                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.allred" size="small"></el-input-number>
+                  <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.allred" size="mini"></el-input-number>
               </el-form-item>
              </el-form>
         </el-col>
@@ -50,27 +50,27 @@
         </el-col>
         <el-col :span="19">
             <div class="control-model" v-for="(item, index) in imgs" :key="index">
-                <div :style="{'backgroundColor': item.bgcolor}" :class="{'single-model-select':spanIndex.indexOf(index)>-1}" class="single-model"  @click="boxShow(index,item)">
-                    <div v-if="item.class" :style="{color: themeColor}" :class="item.class" style="border:0px;font-size: 50px;"></div>
-                    <div class="single-model-name" :style="{color: themeColor}" style="margin-top: -4px;">{{item.name}}</div>
+                <div :class="{'single-model-select':spanIndex.indexOf(index)>-1}" class="single-model"  @click="boxShow(index,item)">
+                    <div v-if="item.class" :class="item.class" style="border:0px"></div>
+                    <div class="single-model-name">{{item.name}}</div>
                 </div>
             </div>
             <div v-if="currentName !==''" style="width: 100%; height: auto;overflow: hidden;">
             <div style="margin-top:20px" class="model-label-title">{{currentName}}{{$t('openatccomponents.overview.currentphase')}}:</div>
             <div class="control-model" v-for="(item, index) in sidewalkPhaseData" :key="index">
-                <div style="position:relative;"  class="single-model" :style="{'backgroundColor': item[0].bgcolor}">
-                <xdr-dir-selector Width="75PX" Height="75PX"  Widths="65PX" Heights="65PX" :Data="showStyle" :Datas="showStyles" :showlist="dirListSetTheme(item)"></xdr-dir-selector>
-                <div style="height:80px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
-                    <div class="current-stage-num" :style="{color: themeColor}" style="width:20%;">{{index + 1}}</div>
+                <div style="position:relative;"  class="single-model">
+                <xdr-dir-selector Width="75PX" Height="75PX"  Widths="65PX" Heights="65PX" :Data="showStyle" :Datas="showStyles" :showlist="item"></xdr-dir-selector>
+                <div style="height:65px;display:flex;flex-direction:row;justify-content:center;align-items:end;">
+                    <div class="current-stage-num" style="width:20%;">{{index + 1}}</div>
                     <div style="width:70%;">
-                    <i class="iconfont icon-feijidongche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
-                    <i class="iconfont icon-lukouzhilu" :style="{color: themeColor2}" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
-                    <i class="iconfont icon-BRT" :style="{color: themeColor2}" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
+                    <i class="iconfont icon-feijidongche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 6"></i>
+                    <i class="iconfont icon-lukouzhilu" style="font-size:16PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 1"></i>
+                    <i class="iconfont icon-BRT" style="font-size:11PX;color:#454545;margin-left:10PX" v-if="item[item.length-1].controltype === 4"></i>
                     <div style="transform:scale(0.65);margin-left:10PX">
-                        <i class="iconfont icon-xuxiangwei-xin" :style="{color: themeColor2}" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                        <i class="iconfont icon-xuxiangwei-xin" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                     </div>
-                    <i class="iconfont icon-gongjiaoche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
-                    <i class="iconfont icon-youguidianche" :style="{color: themeColor}" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
+                    <i class="iconfont icon-gongjiaoche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 3"></i>
+                    <i class="iconfont icon-youguidianche" style="font-size:11PX;color:#606266;margin-left:10PX" v-if="item[item.length-1].controltype === 5"></i>
                     </div>
                 </div>
                 </div>
@@ -90,12 +90,10 @@
       </div> -->
       <div class="footer" v-if="realtimeStatusModalvisible">
           <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-          <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</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" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
           <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
       </div>
     </div>
@@ -103,7 +101,7 @@
 
 <script>
 import { getPhase } from './utils'
-import { getIframdevid, hasPermission, getTheme } from '../../../../utils/auth'
+import { getIframdevid } from '../../../../utils/auth'
 import { getlockPhase, lockPhase, getAllDerection } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
@@ -142,7 +140,6 @@ export default {
       images.forEach(v => {
         let obj = Object.assign({}, v)
         obj.name = this.$t(obj.name)
-        obj.bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
         arrays.push(obj)
       })
       let arr1Ids = this.allDirection.map(item => item.id)
@@ -173,9 +170,7 @@ export default {
         mingreen: 15,
         duration: 600,
         yellowflash: 3
-      },
-      themeColor: getTheme() === 'light' ? '#606266' : '#fff',
-      themeColor2: getTheme() === 'light' ? '#454545' : '#fff'
+      }
     }
   },
   created () {
@@ -248,12 +243,7 @@ export default {
         }
         this.lockList = res.data.data
         let ringDataModel = new RingDataModel({}, res.data.data)
-        this.sidewalkPhaseData = ringDataModel.getlockData().map(ele => {
-          return ele.map(item => ({
-            ...item,
-            bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
-          }))
-        })
+        this.sidewalkPhaseData = ringDataModel.getlockData()
       })
     },
     boxShow (index, data) {
@@ -266,27 +256,6 @@ export default {
       }
       this.getLockPhase(data)
       this.currentName = data.name
-      this.clickType(index)
-    },
-    resetToDefaultThemeColor (List) {
-      for (let i = 0; i < List.length; i++) {
-        if (List[i].clicked) {
-          delete List[i].clicked
-        }
-        List[i].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
-      }
-    },
-    highlightThemeColor (List, index) {
-      for (let i = 0; i < List.length; i++) {
-        if (i === index) {
-          List[i].clicked = true
-          List[i].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
-        }
-      }
-    },
-    clickType (value) {
-      this.resetToDefaultThemeColor(this.imgs)
-      this.highlightThemeColor(this.imgs, value)
     },
     handleClose () {
       this.$emit('closePhaseBack')
@@ -325,25 +294,6 @@ export default {
         //   this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
         // }
       })
-    },
-    toAutoControl () {
-      this.$emit('toAutoControl')
-    },
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
-    },
-    dirListSetTheme (list) {
-      let dirArr = []
-      let color = getTheme() === 'light' ? '#606266' : '#F1F3F4'
-      for (let rec of list) {
-        let recd = {
-          ...rec,
-          color: color
-        }
-        dirArr.push(recd)
-      }
-      return dirArr
     }
   }
 }
@@ -351,6 +301,13 @@ export default {
 
   <style lang="scss" scoped>
 .single-model-select {
+    margin-right: 10px;
+    text-align: center;
+    cursor:pointer;
+    width: 70px;
+    height: 65px;
     background-color: #a2cfff;
+    border-radius: 6px;
+    // border: solid 1PX #409eff;
   }
   </style>

package/src/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue

@@ -11,7 +11,7 @@
  **/
 <template>
   <div class="manual-control-modal closephase-control">
-    <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div> -->
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaseclosecontrol')}}</div>
     <el-row>
       <el-col :span="24">
          <el-form
@@ -22,12 +22,12 @@
             <el-form-item
                 :label="$t('openatccomponents.overview.delay') + ':'"
                 prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="mini"></el-input-number>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="mini"></el-input-number>
             </el-form-item>
            </el-form>
       </el-col>
@@ -62,20 +62,16 @@
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
         <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</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" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import { hasPermission } from '../../../../utils/auth'
-
 export default {
   name: 'closePhaselControl',
   props: {
@@ -175,13 +171,6 @@ export default {
           this.closePhaseRings[i].phases = sortedlist
         }
       }
-    },
-    toAutoControl () {
-      this.$emit('toAutoControl')
-    },
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
     }
   },
   mounted () {

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

@@ -10,8 +10,8 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="lockingphase-control manual-control-modal">
-    <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
+  <div class="manual-control-modal lockingphase-control">
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div>
     <el-row>
       <el-col :span="24">
          <el-form
@@ -23,27 +23,27 @@
            <el-form-item
                 :label="$t('openatccomponents.phase.greenclear') + ':'"
                 prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="mini"></el-input-number>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDuration" size="mini"></el-input-number>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.yellowflash') + ':'"
                 prop="intersection">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempYellow" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempYellow" size="mini"></el-input-number>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.allred') + ':'"
                 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-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempRedclear" size="mini"></el-input-number>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.phase.mingreen') + ':'"
                 prop="count">
-              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempMingreen" size="small"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempMingreen" size="mini"></el-input-number>
             </el-form-item>
            </el-form>
       </el-col>
@@ -78,7 +78,6 @@
     </el-row>
     <div class="footer">
         <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleLockPhase()">{{lockPhaseBtnName}}</el-button>
     </div>
   </div>
@@ -86,8 +85,6 @@
 
 <script>
 import RingDataModel from '../../../../utils/RingDataModel.js'
-import { hasPermission } from '../../../../utils/auth'
-
 export default {
   name: 'LockPhaselControl',
   props: {
@@ -185,13 +182,6 @@ export default {
           this.closePhaseRings[i].phases = sortedlist
         }
       }
-    },
-    toAutoControl () {
-      this.$emit('toAutoControl')
-    },
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
     }
   }
 }

package/src/kisscomps/components/SchemeConfig/manualControlModal/index.vue

@@ -60,7 +60,7 @@
         </div>
         <div class="stage-label">{{$t('openatccomponents.overview.stage')}}:</div>
         <div style="width: 100%; height: auto;overflow: hidden;" v-if="isHasPermission('configer:manual:dwell')">
-          <Stages :crossStatusData="manuals?manualsStage:realtimeStage"
+          <Stages :crossStatusData="crossStatusData"
                   :phaseList="phaseList"
                   :preselectStages="preselectStages"
                   :preselectModel="preselectModel"

package/src/kisscomps/components/SchemeConfig/priorityControl/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="priority-control">
-    <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div> -->
+    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.prioritycontrol')}}</div>
     <el-row>
       <el-col :span="12">
          <el-form
@@ -11,8 +11,8 @@
             <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.delay" size="small"></el-input-number>
-               <!-- <el-input v-model="manualInfo.tempDelay" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+                <el-input-number :placeholder="$t('openatccomponents.common.input')" :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.delay" 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-item
                 :label="$t('openatccomponents.overview.priorityType') + ':'"
@@ -25,7 +25,7 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
@@ -38,8 +38,8 @@
             <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="small"></el-input-number>
-               <!-- <el-input v-model="manualInfo.duration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+                <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-item
                 :label="$t('openatccomponents.overview.priorityPhase') + ':'"
@@ -56,7 +56,7 @@
                     </div>
                   </el-option>
                 </el-select>
-               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
@@ -79,19 +79,17 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
         <el-button @click="handleClose()">{{$t('openatccomponents.button.Back')}}</el-button>
-        <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</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" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
         <el-button type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
     </div>
   </div>
@@ -99,7 +97,7 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
-import { getTheme, hasPermission } from '../../../../utils/auth'
+import { getTheme } from '../../../../utils/auth'
 import { getDirName } from './utils'
 export default {
   name: 'prioritycontrol',
@@ -189,13 +187,6 @@ export default {
         level: this.manualInfo.level
       }
       this.$emit('closePhaseControl', submitdata)
-    },
-    toAutoControl () {
-      this.$emit('toAutoControl')
-    },
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
     }
   }
 }

package/src/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue

@@ -80,7 +80,7 @@
     >{{$t('openatccomponents.overview.controlmode')}}</div>
     <el-button
       type="primary"
-      style="float: right; margin-right: 20px;margin-top: 16px;font-size: 14px;"
+      style="float: right; margin-right: 20px;margin-top: 40px;font-size: 14px;"
       size="mini"
       v-if="isHasPermission('configer:manual') && isHasPermission('configer:manual:renew')"
       @click="changeStatus"

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

@@ -1,8 +1,8 @@
 <template>
   <div class="tentativeplan-control">
-    <!-- <div class="title" style="margin-bottom: 18px">
+    <div class="title" style="margin-bottom: 18px">
       {{ $t('openatccomponents.overview.tentativeplan') }}
-    </div> -->
+    </div>
     <el-row>
       <el-col :span="12">
         <el-form
@@ -30,7 +30,7 @@
               >
               </el-option>
             </el-select>
-            <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <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') + ':'"
@@ -44,9 +44,9 @@
               :step="1"
               :controls="false"
               v-model.number="manualInfo.tempDelay"
-              size="small"
+              size="mini"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.tempDelay" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
         </el-form>
       </el-col>
@@ -69,9 +69,9 @@
               :step="1"
               :controls="false"
               v-model.number="manualInfo.offset"
-              size="small"
+              size="mini"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.offset" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <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') + ':'"
@@ -85,20 +85,17 @@
               :step="1"
               :controls="false"
               v-model.number="manualInfo.duration"
-              size="small"
+              size="mini"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.duration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <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
-        v-model="isRing"
-        :label="false"
-        @change="changeRing"
-        >{{ $t('openatccomponents.common.ringStyle') }}</el-radio
-      >
+      <el-radio 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>
@@ -130,11 +127,11 @@
       </pattern-list>
     </el-row>
     <el-row>
-      <el-tabs v-model="activeList" type="card">
+      <el-tabs v-model="activeTab" type="card">
         <el-tab-pane
           v-if="!isRing"
           :label="$t('openatccomponents.pattern.ringConfig')"
-          name="ring"
+          name="kanban"
         >
           <div style="width: 100%; overflow: hidden; margin-top: 20px">
             <kan-ban
@@ -280,14 +277,14 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <over-lap
-                    :stageList="stagesList"
-                    :overlap="overlap"
-                    :checked="true"
-                    :tentative="true"
-                    :cycleChange="false"
-                    :cycle="overLapCycle"
-                    >
-                    </over-lap>
+                :stageList="stagesList"
+                :overlap="overlap"
+                :checked="true"
+                :tentative="true"
+                :cycleChange="false"
+                :cycle="overLapCycle"
+              >
+              </over-lap>
             </el-col>
           </el-row>
         </el-tab-pane>
@@ -321,7 +318,6 @@
       <el-button @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
       <el-button type="primary" @click="handleManualControl()">{{
         $t('openatccomponents.overview.implement')
       }}</el-button>
@@ -330,7 +326,6 @@
       <el-button @click="handleClose()">{{
         $t('openatccomponents.button.Back')
       }}</el-button>
-      <el-button type="primary" plain @click="toAutoControl()" v-if="isHasPermission('configer:manual:renew')">{{$t('openatccomponents.overview.recovery')}}</el-button>
       <el-button type="primary" @click="handleManualControl()">{{
         $t('openatccomponents.overview.comfirm')
       }}</el-button>
@@ -339,8 +334,6 @@
 </template>
 
 <script>
-import { hasPermission } from '../../../../utils/auth'
-
 export default {
   name: 'tentativeplancontrol',
   props: {
@@ -364,7 +357,15 @@ export default {
       type: Array
     }
   },
+  watch: {
+    isRing (newVal) {
+      this.activeTab = newVal ? 'ring' : 'kanban'
+    }
+  },
   computed: {
+    computedActiveTab () {
+      return this.isRing ? 'ring' : 'kanban'
+    },
     rings () {
       return this.patternOne.length === 0 ? this.planPattern.rings : this.patternOne[0].rings
     },
@@ -396,7 +397,8 @@ export default {
       max: '',
       contrloType: '',
       patternCycleEqual: true,
-      activeList: 'ring',
+      // activeList: 'ring',
+      activeTab: 'kanban',
       isRing: false,
       // isChange: false,
       ringCount: 1,
@@ -989,7 +991,7 @@ export default {
             stage.map(item => {
               for (let ring of rings) {
                 for (let ringItem of ring) {
-                  if (item === ringItem.id && (ringItem.mode !== 7 && ringItem.mode !== 8 && ringItem.mode !== 9)) {
+                  if (item === ringItem.id && (ringItem.mode !== 7 && ringItem.mode !== 8)) {
                     newStage.push(item)
                   }
                 }
@@ -1166,6 +1168,9 @@ export default {
         } else {
           submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
         }
+        this.patternOne[0].stagesList.forEach((stage) => {
+          delete stage.split
+        })
         submitdata.data.stagesList = this.patternOne[0].stagesList
       }
       submitdata.data.offset = this.offset
@@ -1179,13 +1184,6 @@ export default {
       if (this.patternCycleEqual) {
         this.$emit('closePhaseControl', submitdata)
       }
-    },
-    toAutoControl () {
-      this.$emit('toAutoControl')
-    },
-    isHasPermission (path) {
-      let res = hasPermission(path)
-      return res
     }
   }
 }