openatc-components 0.3.99 → 0.3.101

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -39,6 +39,9 @@
               :overlap="overlap"
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
+              :funcSort="funcSort"
+              :thirdPartyControlMenu="thirdPartyControlMenu"
+              :thirdPartyControl="thirdPartyControl"
               :isShowBack="isShowBack"
               :isShowRecovery="isShowRecovery"
               :isShowImplement="isShowImplement"
@@ -102,6 +105,9 @@
             :overlap="overlap"
             :patternSelect="patternSelect"
             :allPatternList="allPatternList"
+            :funcSort="funcSort"
+            :thirdPartyControlMenu="thirdPartyControlMenu"
+            :thirdPartyControl="thirdPartyControl"
             :isShowBack="isShowBack"
             :isShowRecovery="isShowRecovery"
             :isShowImplement="isShowImplement"
@@ -136,6 +142,8 @@ import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr.js'
 import { setToken, setHost, getTheme } from '../../../utils/auth.js'
 import RingDataModel from '../../../utils/RingDataModel.js'
 import { getIntersectionInfo } from '../../../api/template'
+import { GetRoleByName } from '../../../api/permission.js'
+import { getPermissionMenu, getPermissionControl } from './utils/thirdPartypermission.js'
 
 export default {
   name: 'scheme-config',
@@ -198,10 +206,6 @@ export default {
       type: String,
       default: ''
     },
-    funcSort: {
-      type: String,
-      default: 'allFunc'
-    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -463,7 +467,10 @@ export default {
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
       nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
-      resetcomponent: false
+      resetcomponent: false,
+      funcSort: 'allFunc',
+      thirdPartyControlMenu: [],
+      thirdPartyControl: []
     }
   },
   watch: {
@@ -513,14 +520,6 @@ export default {
   async mounted () {
     this.resetcomponent = true
     this.init()
-    if (this.realtimeStatusModalvisible === false) {
-      this.changeStatus()
-    }
-    this.setPropsToken(this.Token)
-    this.hiddenPartControl()
-    // await this.getPhase()
-    this.getFault()
-    this.initData()
   },
   methods: {
     resetComponent () {
@@ -536,6 +535,7 @@ export default {
         this.changeStatus()
       }
       this.setPropsToken(this.Token)
+      this.hiddenPartControl()
       // await this.getPhase()
       this.getFault()
       this.initData()
@@ -618,8 +618,26 @@ export default {
     changeStatus () {
       this.toPage = 1
       this.isOperation = true
+      if (this.platform !== undefined && this.platform !== 'OpenATC') {
+        this.queryThirdParty()
+      }
       this.$refs.ManualControlModalNew.init()
     },
+    queryThirdParty () {
+      this.funcSort = 'allFunc'
+      GetRoleByName(`thirdparty--${this.platform}`).then(res => {
+        if (!res.data.success) {
+          let msg = getMessageByCode(res.data.code, this.$i18n.locale)
+          this.$message.error(msg)
+          return
+        }
+        if (res.data.data.length > 0) {
+          this.funcSort = 'thirdPartyFunc'
+          this.thirdPartyControlMenu = getPermissionMenu(res.data.data)
+          this.thirdPartyControl = getPermissionControl(res.data.data)
+        }
+      })
+    },
     handleGetData (data) {
       let that = this
       if (data.name === '') {

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

@@ -20,10 +20,10 @@
            :model="manualInfo"
            label-width="90px">
            <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>
+                :label="$t('openatccomponents.overview.greenclear')"
+                prop="intersection">
+              <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')"
@@ -44,11 +44,13 @@
           label-position="left"
           :model="manualInfo"
           label-width="90px">
-          <el-form-item
-              :label="$t('openatccomponents.overview.greenclear')"
-              prop="intersection">
-            <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.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">

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

@@ -31,7 +31,7 @@
           :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))">
+          v-if="isHasPermission(item.permission) && (funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControl.indexOf(item.id) !== -1))">
           <!-- <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon> -->
           <div class="model-icon">
             <IconSvg :type="item.type" />
@@ -70,13 +70,17 @@ export default {
     othersControl: {
       type: Boolean,
       default: false
+    },
+    thirdPartyControl: {
+      type: Array
     }
   },
   data () {
     return {
       preselecttype: '',
       controllist: [],
-      specialControl: [23, 22, 100, 24, 25]
+      specialControl: [23, 22, 100, 24, 25],
+      basicFuncControlId: [0, 1, 4, 5] // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
     }
   },
   computed: {

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

@@ -12,13 +12,15 @@
 <template>
   <div class="manual-control-modal-new">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol">
+      <el-tab-pane :label="$t('openatccomponents.overview.residentcontrol')" name="residentcontrol"
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('驻留控制') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'residentcontrol'"
           ref="ControlModelGroup"
           className="residentcontrol"
           :controlList="residentControlList"
           :funcSort="funcSort"
+          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -80,13 +82,15 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol">
+      <el-tab-pane :label="$t('openatccomponents.overview.specialcontrol')" name="specialcontrol"
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('特殊控制') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'specialcontrol'"
           ref="ControlModelGroup"
           className="specialcontrol"
           :controlList="specialControlList"
           :funcSort="funcSort"
+          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
         />
 
@@ -112,13 +116,15 @@
       </div>
 
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection">
+      <el-tab-pane :label="$t('openatccomponents.overview.schemeselection')" name="schemeselection"
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('方案选择') !== -1))">
         <ControlModelGroup
           v-if="activeName === 'schemeselection'"
           ref="ControlModelGroup"
           className="otherscontrol"
           :controlList="patternChooseControlList"
           :funcSort="funcSort"
+          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel" />
 
@@ -177,14 +183,16 @@
             <el-button v-if="!isShowImplement" type="primary" @click="handleManualControl()">{{$t('openatccomponents.overview.comfirm')}}</el-button>
         </div>
       </el-tab-pane>
-      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others">
+      <el-tab-pane :label="$t('openatccomponents.overview.others')" name="others"
+        v-if="(funcSort === 'allFunc' || (funcSort === 'thirdPartyFunc'&& thirdPartyControlMenu.indexOf('其他') !== -1))">>
         <ControlModelGroup
-          v-if="activeName === 'others'"
+          v-if="activeName === 'others' && funcSort === 'allFunc'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl
           :controlList="othersControlList"
           :funcSort="funcSort"
+          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel"
         />
@@ -348,6 +356,12 @@ export default {
     isShowImplement: {
       type: Boolean,
       default: true
+    },
+    thirdPartyControlMenu: {
+      type: Array
+    },
+    thirdPartyControl: {
+      type: Array
     }
   },
   watch: {
@@ -375,7 +389,6 @@ export default {
   },
   data () {
     return {
-      basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
       manuals: false,
       realtimeStage: {},

package/package/kisscomps/components/SchemeConfig/utils/thirdPartypermission.js

@@ -0,0 +1,68 @@
+const permissionMenuMap = new Map([[
+  'configer:manual:dwell', ['驻留控制']
+], [
+  'configer:manual:senior', ['特殊控制']
+], [
+  'configer:manual:base', ['方案选择']
+], [
+  'configer:manual:optimize', ['其他']
+]])
+const permissionControlMap = new Map([[
+  'configer:manual:step', [4]
+], [
+  'configer:manual:stage', [4]
+], [
+  'configer:manual:phaselock', [22]
+], [
+  'configer:manual:directionlock', [25]
+], [
+  'configer:manual:yellowfalsh', [1]
+], [
+  'configer:manual:allred', [2]
+], [
+  'configer:manual:close', [3]
+], [
+  'configer:manual:fix', [5]
+], [
+  'configer:manual:free', [6]
+], [
+  'configer:manual:adapter', [9]
+], [
+  'configer:manual:coordinate', [10]
+], [
+  'configer:manual:ped', [12]
+], [
+  'configer:manual:pedfree', [19]
+], [
+  'configer:manual:procedure', [23]
+], [
+  'configer:manual:temp', [100]
+], [
+  'configer:manual:preempt', [24]
+]])
+
+export function getPermissionMenu (permissionList) {
+  // 按第三方平台角色的权限处理可显示的手动控制菜单
+  let thirdPartyControlMenu = []
+  for (let i = 0; i < permissionList.length; i++) {
+    let per = permissionList[i].permission_code
+    if (permissionMenuMap.get(per)) {
+      thirdPartyControlMenu = thirdPartyControlMenu.concat(permissionMenuMap.get(per))
+    }
+  }
+  console.log(thirdPartyControlMenu)
+  return thirdPartyControlMenu
+}
+
+export function getPermissionControl (permissionList) {
+  // 按第三方平台角色的权限处理可显示的手动控制按钮
+  let thirdPartyControl = []
+  for (let i = 0; i < permissionList.length; i++) {
+    let per = permissionList[i].permission_code
+    if (permissionControlMap.get(per)) {
+      thirdPartyControl = thirdPartyControl.concat(permissionControlMap.get(per))
+    }
+  }
+  console.log(thirdPartyControl)
+  return thirdPartyControl
+}

package/package/kisscomps/components/overView/index.vue

@@ -74,7 +74,6 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
-            :funcSort="FuncSort"
             :roadDirection="roadDirection" />
         </div>
       </div>
@@ -140,7 +139,6 @@ export default {
       stateName: this.$t('openatccomponents.overview.offline'),
       curBodyWidth: 1920,
       graphicMode: false,
-      FuncSort: 'allFunc',
       controlData: {},
       checked: false,
       overlap: [],
@@ -184,7 +182,6 @@ export default {
     ...mapState({
       // curBodyWidth: state => state.globalParam.curBodyWidth,
       curBodyHeight: state => state.globalParam.curBodyHeight,
-      // FuncSort: state => state.globalParam.FuncSort,
       hideMenu: state => state.globalParam.hideMenu
       // graphicMode: state => state.globalParam.graphicMode
       // isShowGui: state => state.globalParam.isShowGui,
@@ -613,12 +610,6 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
-        if (this.platform === 'OpenATC') {
-          this.FuncSort = 'allFunc'
-        }
-        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-          this.FuncSort = 'basicFunc'
-        }
         this.$refs.intersectionMap.resetCrossDiagram()
         this.registerMessage() // 注册消息
         this.initData()
@@ -663,20 +654,6 @@ export default {
         } else {
           this.stateName = this.$t('openatccomponents.overview.offline')
         }
-        // let func = 'allFunc'
-        // if (this.platform === 'OpenATC') {
-        //   func = 'allFunc'
-        // }
-        // if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-        //   func = 'basicFunc'
-        // }
-        // this.$store.dispatch('SaveFunctionLevel', func)
-        if (this.platform === 'OpenATC') {
-          this.FuncSort = 'allFunc'
-        }
-        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-          this.FuncSort = 'basicFunc'
-        }
       })
     },
     isJsonString (str) {

package/package/kisscomps/components/patternConfig/index.vue

@@ -11,7 +11,7 @@
  **/
 <template>
   <div class="patternConfig">
-    <el-container v-if="!isShowSingle" >
+    <el-container v-if="!isShowSingle" style="height: 100%;" >
         <div class="main-container" style="height: 100%;width: 100%;">
           <el-tabs v-model="editableTabsValue" type="card"  @edit="handleTabsEdit" :before-leave="beforeLeave" style="height: 100%;">
             <el-tab-pane

package/package/kisscomps/components/patternConfig/pattern/patternTable.vue

@@ -12,7 +12,7 @@
 <template>
   <div class="app-container" ref="pattern-container">
     <el-table :data="newPatternList" :max-height="tableHeight" id="footerBtn" :show-header="isShowTableHeader">
-      <el-table-column type="expand" v-if="isAllowedExpand">
+      <el-table-column :type="isAllowedExpand ? 'expand' : ''" v-if="isAllowedExpand">
         <template slot-scope="scope">
           <div v-if="isAllowedExpand && isSingleCrossMode" class="optimizetype">
               <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
@@ -51,14 +51,14 @@
           <span>{{scope.row.agentid}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
+      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
         <template slot-scope="scope">
-          <span>{{getPeriod(scope.row)}}</span>
+          <span>{{getDevName(scope.row)}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('openatccomponents.overview.crossname')" width="120" minWidth="40" v-if="isShowColumn('name')">
+      <el-table-column align="center" :label="$t('openatccomponents.greenwaveoptimize.period')" width="100" minWidth="40" v-if="isShowColumn('period')">
         <template slot-scope="scope">
-          <span>{{getDevName(scope.row)}}</span>
+          <span>{{getPeriod(scope.row)}}</span>
         </template>
       </el-table-column>
       <el-table-column property="isValid" :label="$t('openatccomponents.token.isValid')" align="center" width="80" prop="isused" v-if="isShowColumn('isused')">
@@ -200,7 +200,9 @@ export default {
   },
   watch: {
     maxTableHeight: function () {
-      this.tableHeight = this.maxTableHeight
+      this.$nextTick(() => {
+        this.tableHeight = this.maxTableHeight // 动态更新高度
+      })
     },
     optList: {
       handler: function (val) {
@@ -221,11 +223,6 @@ export default {
     }
   },
   mounted: function () {
-    // var _this = this
-    // _this.$nextTick(function () {
-    //   _this.tableHeight = _this.maxTableHeight
-    // })
-    // _this.tableHeight = _this.maxTableHeight
   },
   methods: {
     onOptimizeClick (row, index) {
@@ -316,7 +313,7 @@ export default {
       return res
     },
     getPeriod (row) {
-      let period = row.period || row.timeperiodrange
+      let period = row.timeperiodrange || row.period
       let res = ''
       if (period && period.length > 0) {
         res = period[0].substring(0, 5) + '-' + period[1].substring(0, 5)
@@ -345,9 +342,30 @@ export default {
       // this.phaseList = phaseList
       this.handlePatternList(routeData, patternList, phaseList)
     },
+    // 依据anengid获取设备信息,同时兼容单路口数据按序index取值
+    getDevFromDevsOrIndex (devs, agentid, index) {
+      let res
+      // check special
+      let isSingleCrossMode = false
+      if (devs && devs.length > 1 && devs[0].agentid === devs[1].agentid) {
+        isSingleCrossMode = true
+        // check errData
+        if (index === undefined || index === null) {
+          console.log('getDevFromDevsOrIndex Err: index is null')
+        }
+      }
+      if (!isSingleCrossMode) {
+        res = devs.filter(ist => ist.agentid === agentid)[0]
+      } else {
+        res = devs[index]
+        console.log('getDevByIndex:', res)
+      }
+      return res
+    },
     handlePatternList (routeData, patternList, phaseList) {
       this.newPatternList = []
       let devs = routeData.devs
+      let index = 0
       for (let pattern of patternList) {
         let obj = {}
         let id = pattern.agentid
@@ -355,7 +373,9 @@ export default {
         let count = [] // 计算相位有几个环
         if (pattern.feature !== undefined && pattern.feature.patternList.length !== 0) {
           let currPatternList = pattern.feature.patternList
-          let dev = devs.filter(ist => ist.agentid === id)[0]
+          // let dev = devs.filter(ist => ist.agentid === id)[0]
+          let dev = this.getDevFromDevsOrIndex(devs, id, index)
+          index = index + 1
           let patternId = dev.patternid
           let currPattern
           if (Array.isArray(currPatternList)) {

package/package/kisscomps/components/patternConfig/planContent.vue

@@ -115,7 +115,7 @@ export default {
       // this.getRouteInfo()
       this.routeData = editableTab
       let patternList = this.getPatternListFromTab(editableTab, this.patternList)
-      let phaseList = this.getPatternListFromTab(editableTab, this.patternList)
+      let phaseList = this.getPhaseListFromTab(editableTab, this.phaseList)
       if (patternList && patternList.length > 0 && phaseList && phaseList.length > 0) {
         this.patternList = patternList
         this.phaseList = phaseList
@@ -153,14 +153,14 @@ export default {
           return res
         }
       }
-      let devPatternList = devs.map(item => {
+      let devPhaseList = devs.map(item => {
         let pattern = {
           agentid: item.agentid,
           feature: item.feature
         }
         return pattern
       })
-      res = devPatternList
+      res = devPhaseList
       return res
     },
     closeInterval () {

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

@@ -5,7 +5,6 @@
     :contrloType="contrloType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
-    :isMove="isMove"
     :patternStatusList="patternStatusList"
     :cycles="cycles"
     :cycle="cycle"
@@ -20,7 +19,6 @@
     :agentId="agentId"
     :controlData="controlData"
     :syncTime="syncTime"
-    @handleSplitMove="handleSplitMove"
     :isPhase="isPhase"
     >
     </BoardCard>
@@ -504,10 +502,6 @@ export default {
       type: Boolean,
       default: true
     },
-    isMove: {
-      type: Boolean,
-      default: true
-    },
     contrloType: {
       type: String
     },
@@ -587,11 +581,6 @@ export default {
     // if (this.$route.query !== undefined && Object.keys(this.$route.query).length) {
     //   this.resetCrossDiagram()
     // }
-  },
-  methods: {
-    handleSplitMove (data) {
-      this.$emit('handleSplitMove', data)
-    }
   }
 }
 </script>