openatc-components 0.1.114 → 0.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.114",
+  "version": "0.1.115",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

package/src/kisscomps/components/DrawChannelization/drawsvg/detectorAssociatedComponent.vue

@@ -136,7 +136,7 @@ export default {
   }
   .icon-fangda {
     font-size: 24px;
-    color: #409EFF;
+    color: #299BCC;
   }
   .add-disabled {
     color: #bcbec2;

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/countdownSvg.vue

@@ -226,11 +226,11 @@ export default {
 }
 .highlightBg {
   border-radius: 50%;
-  background-color: #409eff;
+  background-color: #299BCC;
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 </style>

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/detectorIconSvg.vue

@@ -194,7 +194,7 @@ export default {
   background-color: transparent;
 }
 .highlightBg {
-  background-color: #409eff;
+  background-color: #299BCC;
 }
 .defaultVehicleBorder {
   border: 2px solid #00FF00;
@@ -204,7 +204,7 @@ export default {
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 </style>

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/motorwayIconSvg.vue

@@ -313,7 +313,7 @@ export default {
   data () {
     return {
       defaultColor: '#fff', // 默认状态颜色
-      highlightColor: '#409EFF', // 选中高亮状态颜色
+      highlightColor: '#299BCC', // 选中高亮状态颜色
       item: {},
       reset: true,
       iconnameArr: [],

package/src/kisscomps/components/DrawChannelization/drawsvg/iconSvg/pedroadIconSvg.vue

@@ -54,7 +54,7 @@ export default {
   data () {
     return {
       defaultColor: '#fff', // 默认状态颜色
-      highlightColor: '#409EFF', // 选中高亮状态颜色
+      highlightColor: '#299BCC', // 选中高亮状态颜色
       item: {},
       reset: true,
       rectArr: [],

package/src/kisscomps/components/IntersectionMap/crossDirection/baseImg/refreshSvg.vue

@@ -54,7 +54,7 @@ export default {
 </script>
 <style scoped>
  .st0 {
-    fill: #409eff;
+    fill: #299BCC;
   }
 .refresh {
     cursor: pointer;

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

@@ -908,7 +908,7 @@ export default {
 }
 .centerText .text {
   display: inline-block;
-  color: #409eff;
+  color: #299BCC;
   margin-top: 20px;
 }
 

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

@@ -49,7 +49,7 @@
           </div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
-          <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#409EFF'}">{{ timeNumDevide }}</div>
+          <div class="curTimeDiv" :style="{'left':paddingLeft, 'background-color': '#299BCC'}">{{ timeNumDevide }}</div>
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
@@ -1242,15 +1242,15 @@ export default {
 <style lang="scss">
     // el-tooltip样式
 .el-tooltip__popper.is-light {
-  background: #409EFF !important;
-  border: 1px solid #409EFF !important;
+  background: #299BCC !important;
+  border: 1px solid #299BCC !important;
   color: #FFFFFF !important;
 }
 .el-tooltip__popper.is-light[x-placement^="top"] .popper__arrow {
-  border-top-color: #409EFF !important;
+  border-top-color: #299BCC !important;
 }
 .el-tooltip__popper.is-light[x-placement^="top"] .popper__arrow::after {
-  border-top-color: #409EFF !important;
+  border-top-color: #299BCC !important;
 }
 </style>
 <style lang="scss" scoped>
@@ -1332,7 +1332,7 @@ export default {
     position: absolute;
     top: -10px;
     width: 2px;
-    background-color: #409EFF;
+    background-color: #299BCC;
   }
   .curTimeDiv {
     position: absolute;
@@ -1344,7 +1344,7 @@ export default {
     width: 60px;
     height: 19px;
     color:#FFFFFF;
-    background-color: #409EFF;
+    background-color: #299BCC;
   }
 }
 .ring-first {

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

@@ -101,7 +101,7 @@
 
 <script>
 import { getPhase } from './utils'
-// import { getIframdevid } from '../../../../utils/auth'
+import { getIframdevid } from '../../../../utils/auth'
 import { getlockPhase, lockPhase } from '../../../../api/control'
 import Stages from '../../Stages/index'
 import RingDataModel from '../../../../utils/RingDataModel.js'
@@ -190,8 +190,9 @@ export default {
     },
     getLockPhase (val) {
       this.directions = [this.checkId(val)]
+      let iframdevid = getIframdevid()
       let param = {
-        'agentid': 'config_test',
+        'agentid': iframdevid,
         'direction': this.directions
       }
       getlockPhase(param).then(res => {
@@ -223,8 +224,9 @@ export default {
         this.$message.error(this.$t('openatccomponents.overview.directionnull'))
         return
       }
+      let iframdevid = getIframdevid()
       let submitdata = {
-        agentid: 'config_test',
+        agentid: iframdevid,
         direction: this.directions,
         greenflash: this.manualInfo.greenclear,
         duration: this.manualInfo.duration,
@@ -234,10 +236,22 @@ export default {
 
       }
       lockPhase(submitdata).then(res => {
-        if (res.data.success !== true) {
+        if (!res.data.success) {
+          if (res.data.code === '4002' && res.data.data.errorCode === '4209') {
+            let success = res.data.data.content.success
+            if (success !== 0) {
+              let errormsg = 'openatccomponents.overview.putTscControlError' + success
+              this.$message.error(this.$t(errormsg))
+              return
+            }
+          }
           this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
         }
         this.$alert(this.$t('openatccomponents.common.download'), { type: 'success' })
+        // if (res.data.success !== true) {
+        //   this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+        // }
       })
     }
   }

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

@@ -233,8 +233,8 @@ export default {
     box-sizing: border-box;
   }
   .el-button--primary:hover, .el-button--primary:focus{
-    background: #409EFF;
-    border-color: #409EFF;
+    background: #299BCC;
+    border-color: #299BCC;
     // color: #FFFFFF;
   }
 </style>

package/src/node_modules/.package_versions.json

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

package/src/utils/RingDataModel.js

@@ -183,7 +183,6 @@ export default class RingDataModel {
   }
   getStageData () {
     let data = this.crossStatusData
-    console.log(data, 'data')
     let stagesTemp = []
     let busPhaseData = this.getBusPos()
     let sidewalkPhaseData = this.getPedPhasePos()
@@ -194,11 +193,12 @@ export default class RingDataModel {
       let stageControType = 0
       let peddirections = []
       for (let stg of stage) {
+        let phaseMode = data.phase.filter(item => item.id === stg)
         let currPhase = this.phaseList.filter((item) => {
           return item.id === stg
         })[0]
         if (!currPhase) return
-        if (currPhase !== undefined) {
+        if (currPhase !== undefined && phaseMode[0].mode !== 1) {
           directionList = [...currPhase.direction, ...directionList]
         }
         if (currPhase.peddirection) {

package/static/styles/channelizatioon.scss

@@ -341,7 +341,7 @@
         }
         .icon-fangda {
           font-size: 24PX;
-          color: #409EFF;
+          color: #299BCC;
         }
         .add-disabled {
           color: #bcbec2;

package/static/styles/dark/theme/element-dark.scss

@@ -11,19 +11,19 @@
  **/
 /* 改变主题色变量 */
 // $--color-black: #f7f8fa;
-$--color-primary: #409EFF;
-$--color-white: #202940;
-$--color-black: #30384D;
-$--background-color-base: #191F34;
+$--color-primary: #299BCC;
+$--color-white: #102C4E;
+$--color-black: #243D59;
+$--background-color-base: #0C2137;
 $--color-text-primary: #FFFFFF;
 $--color-text-regular: #FFFFFF;
 $--color-text-secondary: #B9BABF;
 $--color-text-placeholder: #8D9498;
 $--color-info: #8D9498;
-$--border-color-base: #30384D;
-$--border-color-light: #30384D;
-$--border-color-lighter: #30384D;
-$--border-color-extra-light:#30384D;
+$--border-color-base: #243D59;
+$--border-color-light: #61697B;
+$--border-color-lighter: #243D59;
+$--border-color-extra-light:#243D59;
 $--box-shadow-base: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
 $--button-primary-font-color: #FFFFFF;
 $--button-info-font-color: #FFFFFF;

package/static/styles/light/theme/element-light.scss

@@ -11,7 +11,7 @@
  **/
 /* 改变主题色变量 */
 $--color-black: #f7f8fa;
-// $--color-primary: #409EFF;
+$--color-primary: #299BCC;
 // $--color-white: #202940;
 // $--color-black: #30384D;
 // $--background-color-base: #191F34;

package/static/styles/schemeconfig.scss

@@ -139,7 +139,7 @@
     font-size: 14PX;
     font-family: Source Han Sans CN;
     font-weight: 400;
-    color: #409EFF;
+    color: #299BCC;
     line-height: 32PX;
     margin-right: 20PX;
     cursor: pointer;