openatc-components 0.2.37 → 0.2.39

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

@@ -11,23 +11,23 @@
  **/
 <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
            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 :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="mini"></el-input-number>
+              <el-input-number :min="0" :max="65535" :precision="0" :step="1" :controls="false" v-model.number="manualInfo.tempDelay" size="small"></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.tempDuration" size="small"></el-input-number>
             </el-form-item>
            </el-form>
       </el-col>
@@ -62,16 +62,20 @@
     </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: {
@@ -171,6 +175,13 @@ 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,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/src/kisscomps/components/SchemeConfig/manualControlModalNew/controlModelGroup.vue

@@ -0,0 +1,128 @@
+/**
+ * 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="control-model-group">
+    <div :class="className" class="group-control">
+      <div class="control-model" v-for="(item, index) in controllist" :key="index">
+
+        <template v-if="othersControl && specialControl.indexOf(item.id) !== -1">
+          <div class="single-model-new"
+            :style="{'backgroundColor': item.bgcolor}"
+            @click="selectModel(item)"
+            v-if="isHasPermission(item.permission)">
+            <div class="closephase-icon">
+              <OthersIconSvg :type="item.type" />
+            </div>
+            <div class="single-model-name-theme">{{item.iconName}}</div>
+          </div>
+        </template>
+
+        <template v-else>
+          <div class="single-model-new"
+          :style="{'backgroundColor': item.bgcolor}"
+          @click="selectModel(item)"
+          :class="preselecttype == item.type? 'single-model-select' : ''"
+          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1))">
+          <!-- <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon> -->
+          <div class="model-icon">
+            <IconSvg :type="item.type" />
+          </div>
+          <div class="single-model-name-theme">{{item.iconName}}</div>
+        </div>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { hasPermission, getTheme } from '../../../../utils/auth'
+
+import IconSvg from './icon.vue'
+import OthersIconSvg from './othersIcon.vue'
+
+export default {
+  name: 'ControlModelGroup',
+  components: {
+    IconSvg,
+    OthersIconSvg
+  },
+  props: {
+    className: {
+      type: String
+    },
+    controlList: {
+      type: Array
+    },
+    funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
+    othersControl: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      preselecttype: '',
+      controllist: [],
+      specialControl: [23, 22, 100, 24, 25]
+    }
+  },
+  computed: {
+  },
+  watch: {
+    controlList: {
+      handler (newVal, oldVal) {
+        this.controllist = JSON.parse(JSON.stringify(newVal))
+      },
+      deep: true
+    }
+  },
+  methods: {
+    isHasPermission (path) {
+      let res = hasPermission(path)
+      return res
+    },
+    selectModel (item) {
+      this.preselecttype = item.type
+      this.clickType(item)
+      if (this.specialControl.indexOf(item.id) !== -1) {
+        this.$emit('selectSpecialModel')
+      }
+      this.$emit('selectModel', item)
+    },
+    init () {
+      this.selectModel(this.controllist[0])
+    },
+    clickType (item) {
+      this.curTypeItem = item
+      for (let i = 0; i < this.controllist.length; i++) {
+        if (this.controllist[i].clicked) {
+          delete this.controllist[i].clicked
+          this.controllist[i].bgcolor = getTheme() === 'light' ? '#edf6ff' : '#243d59'
+        }
+      }
+      for (let i = 0; i < this.controllist.length; i++) {
+        if (this.controllist[i].type === item.type) {
+          this.controllist[i].clicked = true
+          this.controllist[i].bgcolor = getTheme() === 'light' ? '#c1e0ff' : '#0082ac'
+        }
+      }
+    }
+  },
+  mounted () {
+    this.controllist = JSON.parse(JSON.stringify(this.controlList))
+  }
+}
+</script>