openatc-components 0.2.6 → 0.2.7

package/src/kisscomps/components/StageBord/StageBord.vue

@@ -1,9 +1,20 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
 <template>
 <div class="components-container board">
   <div class="common-board-column">
     <div class="common-board-column-header" style="position:relative">
       <span>{{$t('openatccomponents.pattern.stage')+(subIndex+1)}}</span>
-      <span v-if="this.contrloType === 'stage'" style="position: absolute;right: 0;">
+      <span v-if="isRing" style="position: absolute;right: 0;">
         <el-button type="primary" @click="deleteStage(subIndex)" icon="el-icon-close"></el-button>
       </span>
     </div>
@@ -17,7 +28,8 @@
           </el-col>
           <el-col :span="12">
             <el-input-number
-              v-if="this.contrloType === 'stage'"
+              v-if="isRing"
+              class="stage-value"
               :controls="false"
               size="small"
               :disabled="true"
@@ -25,7 +37,8 @@
               v-model.number="stage.stageSplit">
             </el-input-number>
             <el-input-number
-              v-if="this.contrloType === 'ring' || !this.contrloType"
+              v-if="!isRing"
+              class="stage-value"
               :controls="false"
               size="small"
               v-model.number="stage.split"
@@ -40,57 +53,74 @@
             {{this.$t('openatccomponents.pattern.phase')}}
           </el-col>
           <el-col :span="12">
-            <el-select v-if="this.contrloType === 'stage'" v-model="stage.stages" multiple :placeholder="$t('openatccomponents.common.select')">
+            <SelectCrossPhase
+            v-if="isRing"
+            type="phases"
+            :pattern="false"
+            :phaseOption="coordphaseOption"
+            multiple
+            :row="stage"
+            style="width:100%;">
+          </SelectCrossPhase>
+            <!-- <el-select v-if="isRing" v-model="stage.phases" multiple :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
                 :key="item.value"
                 :label="$t('openatccomponents.pattern.phase') + item.value"
                 :value="item.value">
               </el-option>
-            </el-select>
+            </el-select> -->
             <el-input
-              v-if="this.contrloType === 'ring' || !this.contrloType"
+              v-if="!isRing"
+              class="stage-value"
               size="small"
-              :value="stage.stageKanban?stage.stageKanban.join(','):''"
+              :value="stage.phases.join(',')"
               ref="type"
+              style="width:100%;align:left;"
               :disabled="true">
             </el-input>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
+        <el-row :gutter="0" v-if="isRing">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.green')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
+              class="stage-value"
               size="small"
               :controls="false"
+              :min="0"
               v-model.number="stage.green"
               @change="stageSplitChange">
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
+        <el-row :gutter="0" v-if="isRing">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.yellow')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
+              class="stage-value"
               size="small"
               :controls="false"
+              :min="0"
               v-model.number="stage.yellow"
               @change="stageSplitChange">
             </el-input-number>
           </el-col>
         </el-row>
-        <el-row :gutter="0" v-if="this.contrloType === 'stage'">
+        <el-row :gutter="0" v-if="isRing">
           <el-col :span="12">
             {{this.$t('openatccomponents.pattern.red')}}
           </el-col>
           <el-col :span="12">
             <el-input-number
+              class="stage-value"
               size="small"
               :controls="false"
+              :min="0"
               v-model.number="stage.red"
               @change="stageSplitChange">
             </el-input-number>
@@ -103,11 +133,12 @@
 </template>
 <script>
 import draggable from 'vuedraggable'
-
+import SelectCrossPhase from '../SelectCrossPhase/index.vue'
 export default {
-  name: 'stage-board',
+  name: 'stage-bord',
   components: {
-    draggable
+    draggable,
+    SelectCrossPhase
   },
   data () {
     return {
@@ -127,8 +158,8 @@ export default {
         return []
       }
     },
-    contrloType: {
-      type: String
+    isRing: {
+      type: Boolean
     },
     options: {
       type: Object,
@@ -141,7 +172,7 @@ export default {
       default () {
         return {
           split: 0,
-          stages: [],
+          // stages: [],
           phases: [],
           stageSplit: 0,
           green: 0,
@@ -162,23 +193,30 @@ export default {
   created () {
   },
   watch: {
-    stage: {
-      handler: function () {
-        if (this.contrloType) {
-          let n = this.rowIndex
-          const globalParamModel = this.$store.getters.globalParamModel
-          let pattern = globalParamModel.getParamsByType('patternList')[n]
-          globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        }
-      },
-      deep: true
-    }
+    // stage: {
+    //   handler: function () {
+    //     if (this.isRing) {
+    //       let n = this.rowIndex
+    //       const globalParamModel = this.$store.getters.globalParamModel
+    //       let pattern = globalParamModel.getParamsByType('patternList')[n]
+    //       globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
+    //     }
+    //   },
+    //   deep: true
+    // }
   },
   mounted () {
   },
   methods: {
     deleteStage (index) {
       this.stageInfo.splice(index, 1)
+      this.stageInfo.forEach((item, index) => {
+        item.key = index
+      })
+      // let n = this.rowIndex
+      // const globalParamModel = this.$store.getters.globalParamModel
+      // let pattern = globalParamModel.getParamsByType('patternList')[n]
+      // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
     },
     getMaxCycle (pattern) {
       let rings = pattern.stagesList
@@ -227,16 +265,23 @@ export default {
     width: 100%;
     height: auto;
     margin: 5px 0;
+    text-align: left;
     line-height: 40px;
-    // color: #FFFFFF;
     padding: 1px 1px;
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #299BCC;
     border-color: #299BCC;
-    // color: #FFFFFF;
+    color: #FFFFFF;
+  }
+  .stage-value {
+    text-align: left;
+    width: 100%;
   }
 </style>
 <style lang="scss">
+.stage-value .el-input__inner {
+    text-align: center;
+  }
 </style>

package/src/kisscomps/components/patternList/patternList.vue

@@ -11,6 +11,7 @@
     :patternList="patternList"
     :controlPhase="controlPhase"
     :showCondition="showCondition"
+    :allPatternList="allPatternList"
     :localPatternList="localPatternList"
     :phaseList="phaseList"
     :showBarrier="showBarrier"
@@ -507,6 +508,9 @@ export default {
       type: Boolean,
       default: false
     },
+    allPatternList: {
+      type: Array
+    },
     controlPhase: {
       type: Object
     },

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/views/overView.vue

@@ -19,7 +19,7 @@ export default {
       isShowMode: true,
       modeName: '交警遥控',
       controlName: '步进',
-      agentId: 'bclsnl',
+      agentId: 'jmlxhl',
       Token: 'eyJraWQiOiIxNzA4OTA5NDk2ODcxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcwODk1MjY5NiwiaWF0IjoxNzA4OTA5NDk2fQ.FI0gzBQFLyQsj95LG56lVZxb6WYlr2-datNsyv6fF-I',
       reqUrl: 'http://192.168.13.103:10003/openatc'
     }

package/src/views/schemeconfig.vue

@@ -55,8 +55,8 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: 'bclsnl',
-      Token: 'eyJraWQiOiIxNzEzNDkyMDM3Mzc5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxMzUzNTIzNywiaWF0IjoxNzEzNDkyMDM3fQ.SONz4foJQutGgyF_CJhcQRimDcYwbsJyMzdjZg9cgLE',
+      agentId: '12004-950',
+      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
       Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
       boxVisible: false,
       dialogWidth: '80%',

package/static/styles/schemeconfig.scss

@@ -333,7 +333,7 @@
   }
 }
 .tentativeplan-control{
-  height: 100%;
+  // height: 100%;
   padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
   overflow: hidden !important;