openatc-components 0.1.115 → 0.1.117

package/package.json

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

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

@@ -15,7 +15,7 @@
       <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).toFixed(3) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
-            <div class="first-1" :class="item.mode===8?'mask': ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
+            <div class="first-1" :class="item.mode===8?'masks': ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
                   <div style="cursor:pointer;">
@@ -38,9 +38,9 @@
                   <i class="iconfont icon-youguidianche" style="position: absolute;top: 8px;left:60px;font-size:12px;color:#454545;" v-if="bus.controltype === 5 && bus.phaseid===item.id"></i>
                 </div>
               </div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :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': ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
-              <div class="first-1" :class="item.mode===8?'mask': ''" :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 class="first-1" :class="item.mode===8?'masks': ''" :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?'masks': ''" :style="{'width':Number(item.yellowWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100).toFixed(3) + '%').replace('%', ''))*100+'%','height':'34px','background':'#f9dc6a'}"></div>
+              <div class="first-1" :class="item.mode===8?'masks': ''" :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>
         <div v-if="showBarrier">
@@ -1355,7 +1355,7 @@ export default {
 .direction {
   filter: brightness(70%);
 }
-.mask {
+.masks {
   background: rgb(242, 121, 121) !important;
 }
 .first-1 {

package/src/kisscomps/components/PhaseDirectionSelect/PhaseDirectionSelect.vue

@@ -10,15 +10,15 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div class="cross-phase-dir">
-  <el-select v-model="phaseid" style="width: 100%" clearable :placeholder="$t('openatccomponents.common.select')" :no-data-text="$t('openatccomponents.common.nodata')"
+<div class="cross-phase-dir cross-phase-dir-select">
+  <el-select v-model="phaseId" style="width: 100%" clearable :placeholder="$t('openatccomponents.common.select')" :no-data-text="$t('openatccomponents.common.nodata')"
     @change="handleSelect"
   >
     <el-option
       v-for="(option, index) in phaseOption"
       :key="index"
       :label="option.phasedesc"
-      :value="option.phaseid"
+      :value="option.phaseId"
     >
       <span>{{ option.phasedesc }}</span>
     </el-option>
@@ -36,12 +36,15 @@ export default {
   props: {
     agentid: {
       type: String
+    },
+    phaseid: {
+      type: String
     }
   },
   data () {
     return {
       phaseOption: [],
-      phaseid: ''
+      phaseId: ''
     }
   },
   mounted () {
@@ -71,11 +74,14 @@ export default {
             this.$t('openatccomponents.overview.phase') +
               ele.id + '-' +
               this.getPhaseName(ele.direction).name,
-            phaseid: ele.id
+            phaseId: ele.id
           }
         })
         console.log(options)
         this.phaseOption = options
+        if (this.phaseid !== undefined) {
+          this.phaseId = this.phaseid
+        }
       })
     },
     getName (status) {
@@ -108,7 +114,7 @@ export default {
       return this.getName(status)
     },
     handleSelect (val) {
-      let phaseinfo = this.phaseOption.filter(ele => ele.phaseid === val)[0]
+      let phaseinfo = this.phaseOption.filter(ele => ele.phaseId === val)[0]
       this.$emit('getSelectPhaseId', val)
       this.$emit('getSelectPhaseInfo', phaseinfo)
     }

package/src/kisscomps/components/PhaseDirectionText/PhaseDirectionText.vue

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div class="cross-phase-dir">
+<div class="cross-phase-dir cross-phase-dir-text">
   <div v-for="phase in phaselist" :key="phase.id">
     {{$t('openatccomponents.overview.phase')}}{{phase.id}} - {{phase.dirname}}
   </div>

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

@@ -12,9 +12,9 @@
 /* 改变主题色变量 */
 // $--color-black: #f7f8fa;
 $--color-primary: #299BCC;
-$--color-white: #102C4E;
+$--color-white: #091F40;
 $--color-black: #243D59;
-$--background-color-base: #0C2137;
+$--background-color-base: #021026;
 $--color-text-primary: #FFFFFF;
 $--color-text-regular: #FFFFFF;
 $--color-text-secondary: #B9BABF;

package/static/styles/uiComponents.scss

@@ -1,5 +1,6 @@
 // UI组件样式
 .cross-phase-dir {
+  width: 100%;
   color: $--color-text-regular;
   font-size: 14PX;
 }