openatc-components 0.2.37 → 0.2.39

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

@@ -10,43 +10,56 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="manual-control-modal lockingphase-control">
-    <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div>
+  <div class="lockingphase-control manual-control-modal">
+    <!-- <div class="title" style="margin-bottom: 18px;">{{$t('openatccomponents.overview.phaselocking')}}</div> -->
     <el-row>
-      <el-col :span="24">
+      <el-col :span="12">
          <el-form
           :inline="true"
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
            <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="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="mini"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempGreenflash" size="small"></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="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="mini"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempYellow" size="small"></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="mini"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempMingreen" size="small"></el-input-number>
             </el-form-item>
            </el-form>
       </el-col>
+      <el-col :span="12">
+        <el-form
+         :inline="true"
+          ref="manual"
+          label-position="left"
+          :model="manualInfo"
+          label-width="74px">
+
+           <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-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-form-item>
+          </el-form>
+     </el-col>
     </el-row>
     <el-row>
         <div class="model-label">{{$t('openatccomponents.overview.mode')}}:</div>
@@ -78,6 +91,7 @@
     </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>
@@ -85,6 +99,8 @@
 
 <script>
 import RingDataModel from '../../../../utils/RingDataModel.js'
+import { hasPermission } from '../../../../utils/auth'
+
 export default {
   name: 'LockPhaselControl',
   props: {
@@ -182,6 +198,13 @@ export default {
           this.closePhaseRings[i].phases = sortedlist
         }
       }
+    },
+    toAutoControl () {
+      this.$emit('toAutoControl')
+    },
+    isHasPermission (path) {
+      let res = hasPermission(path)
+      return res
     }
   }
 }

package/package/kisscomps/components/SchemeConfig/manualControlModalNew/index.vue

@@ -27,7 +27,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
@@ -82,7 +82,7 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="count">
@@ -106,7 +106,7 @@
              ref="manual"
              label-position="left"
              :model="manualInfo"
-             label-width="100px">
+             label-width="74px">
               <el-form-item
                   :label="$t('openatccomponents.overview.duration') + ':'"
                   prop="count">

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

@@ -1,18 +1,18 @@
 <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
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <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="mini"></el-input-number>
-               <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :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="small"></el-input-number>
+               <!-- <el-input v-model="manualInfo.tempDelay" size="small" :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="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
@@ -34,12 +34,12 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <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-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-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="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
@@ -67,8 +67,9 @@
            ref="manual"
            label-position="left"
            :model="manualInfo"
-           label-width="100px">
+           label-width="74px">
             <el-form-item
+                style="margin-bottom: 0;"
                 :label="$t('openatccomponents.overview.level') + ':'"
                 prop="count">
                 <el-select v-model="manualInfo.level" class="col-inner"  size="small" clearable :placeholder="$t('openatccomponents.common.select')">
@@ -79,17 +80,19 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-               <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+               <!-- <el-input v-model="manualInfo.tempDuration" size="small" :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>
@@ -97,7 +100,7 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
-import { getTheme } from '../../../../utils/auth'
+import { getTheme, hasPermission } from '../../../../utils/auth'
 import { getDirName } from './utils'
 export default {
   name: 'prioritycontrol',
@@ -187,6 +190,13 @@ export default {
         level: this.manualInfo.level
       }
       this.$emit('closePhaseControl', submitdata)
+    },
+    toAutoControl () {
+      this.$emit('toAutoControl')
+    },
+    isHasPermission (path) {
+      let res = hasPermission(path)
+      return res
     }
   }
 }

package/package/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: 40px;font-size: 14px;"
+      style="float: right; margin-right: 20px;margin-top: 16px;font-size: 14px;"
       size="mini"
       v-if="isHasPermission('configer:manual') && isHasPermission('configer:manual:renew')"
       @click="changeStatus"

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

@@ -1,15 +1,15 @@
 <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
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="100px"
+          label-width="74px"
         >
           <el-form-item
             :label="$t('openatccomponents.overview.patternid') + ':'"
@@ -30,7 +30,7 @@
               >
               </el-option>
             </el-select>
-            <!-- <el-input v-model="manualInfo.tempDuration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <el-input v-model="manualInfo.tempDuration" size="small" :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="mini"
+              size="small"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <el-input v-model="manualInfo.tempDelay" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
         </el-form>
       </el-col>
@@ -55,7 +55,7 @@
           ref="manual"
           label-position="left"
           :model="manualInfo"
-          label-width="100px"
+          label-width="74px"
         >
           <el-form-item
             :label="$t('openatccomponents.overview.patternoffset') + ':'"
@@ -69,9 +69,9 @@
               :step="1"
               :controls="false"
               v-model.number="manualInfo.offset"
-              size="mini"
+              size="small"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <el-input v-model="manualInfo.offset" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
           <el-form-item
             :label="$t('openatccomponents.overview.duration') + ':'"
@@ -85,9 +85,9 @@
               :step="1"
               :controls="false"
               v-model.number="manualInfo.duration"
-              size="mini"
+              size="small"
             ></el-input-number>
-            <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
+            <!-- <el-input v-model="manualInfo.duration" size="small" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
           </el-form-item>
         </el-form>
       </el-col>
@@ -318,6 +318,7 @@
       <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>
@@ -326,6 +327,7 @@
       <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>
@@ -334,6 +336,8 @@
 </template>
 
 <script>
+import { hasPermission } from '../../../../utils/auth'
+
 export default {
   name: 'tentativeplancontrol',
   props: {
@@ -991,7 +995,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)) {
+                  if (item === ringItem.id && (ringItem.mode !== 7 && ringItem.mode !== 8 && ringItem.mode !== 9)) {
                     newStage.push(item)
                   }
                 }
@@ -1184,6 +1188,13 @@ export default {
       if (this.patternCycleEqual) {
         this.$emit('closePhaseControl', submitdata)
       }
+    },
+    toAutoControl () {
+      this.$emit('toAutoControl')
+    },
+    isHasPermission (path) {
+      let res = hasPermission(path)
+      return res
     }
   }
 }

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

@@ -269,6 +269,7 @@ export default {
     line-height: 40px;
     padding: 1px 1px;
     box-sizing: border-box;
+    font-size: 14PX;
   }
   .el-button--primary:hover, .el-button--primary:focus{
     background: #299BCC;

package/package/kisscomps/components/Stages/index.vue

@@ -15,7 +15,7 @@
       <div>
         <div style="width: 100%; height: auto;">
           <div class="control-model" v-for="(item, index) in stagesList" :key="index">
-            <div style="position:relative;" :style="singleStyle" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
+            <div style="position:relative;" :style="{...singleStyle, 'backgroundColor': item[0].bgcolor}" class="single-model" @click="selectStages(index + 1)" :class="currentStage == index + 1 ? 'single-model-select' : ''">
               <!-- <template v-for="(side, index) in item[0].sidewalkPhaseData" >
                 <PatternWalkSvg class="patternWalk"
                                 v-if="item[0].peddirection.includes(side.id)"
@@ -28,18 +28,18 @@
                           :showWalk="item[0].peddirection"
                           :Width="'40'"
                           :Height="'40'" /> -->
-              <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>
+              <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="width:20%;" :style="{color: themeColor}">{{index + 1}}</div>
                 <div style="width:70%;">
-                  <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>
+                  <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>
                   <div style="transform:scale(0.65);margin-left:10PX">
-                    <i class="iconfont icon-xuxiangwei-xin" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
+                    <i class="iconfont icon-xuxiangwei-xin" :style="{color: themeColor2}" style="font-size:5PX;color:#454545;" v-if="item[item.length-1].controltype === 99"></i>
                   </div>
-                  <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>
+                  <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>
                   <div v-if="presetStageIndex === index + 1" style="color:red;width:50px;position:absolute;right:0px;bottom:5px;font-size:11px;">{{presetText}}</div>
                 </div>
               </div>
@@ -54,6 +54,8 @@
 /* eslint-disable */
 import RingDataModel from '../../../utils/RingDataModel.js'
 // import patternwalksvg from '../PatternWalkSvg/PatternWalkSvg'
+import { getTheme } from '../../../utils/auth.js'
+
 export default {
   name: 'Stages',
   components: {
@@ -102,7 +104,7 @@ export default {
     },
     StageHeight: {
       type: String,
-      default: '65px'
+      default: '80px'
     }
   },
   data () {
@@ -119,6 +121,8 @@ export default {
       side: {key: 'pedphase1653818707546719', phaseid: 1, id: 1, name: '东人行横道'},
       // stagesList: [],
       currentStage: -1,
+      themeColor: getTheme() === 'light' ? '#606266' : '#fff',
+      themeColor2: getTheme() === 'light' ? '#454545' : '#fff'
     };
   },
   computed: {
@@ -138,6 +142,7 @@ export default {
         }
       }
       console.log(list,'list')
+      this.clickType(list, this.currentStage)
       console.log(this.phaseList,'this.phaseList')
       return list
     },
@@ -203,9 +208,45 @@ export default {
       }
       this.currentStage = value
       this.$emit('onSelectStages', value)
+      this.clickType(this.stagesList, value)
+    },
+    resetToDefaultThemeColor (List) {
+      for (let i = 0; i < List.length; i++) {
+        if (List[i].length) {
+          if (List[i][0].clicked) {
+            delete List[i][0].clicked
+          }
+          List[i][0].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
+        } 
+      }
+    },
+    highlightThemeColor (List, index) {
+      for (let i = 0; i < List.length; i++) {
+        if (i === index) {
+          List[i][0].clicked = true
+          List[i][0].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
+        }
+      }
+    },
+    clickType (stagelist, value) {
+      this.resetToDefaultThemeColor(stagelist)
+      this.highlightThemeColor(stagelist, value - 1)
+    },
+    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
     }
   },
   mounted () {
+    this.resetToDefaultThemeColor(this.stagesList)
   }
 };
 </script>