openatc-components 0.3.112 → 0.3.113

package/package.json

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

package/src/api/permission.js

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ **/
+import Authapi from './authapi'
+
+export const GetPermissionById = (id) => {
+  let api = new Authapi('getPermission')
+
+  let paramList = [id, 'permissions']
+
+  return api.Send({}, {}, paramList)
+}
+
+export const GetRoleByName = (roleName) => {
+  let api = new Authapi('getRoleByName')
+
+  let argList = [roleName, 'permissions']
+
+  return api.Send({}, {}, argList)
+}
+
+export default {
+  GetPermissionById,
+  GetRoleByName
+}

package/src/i18n/language/en.js

@@ -1065,6 +1065,15 @@ const en = {
       'opensourceagreement': 'Opensource Agreement'
     },
     'message': {
+      // 全局异常错误
+      '0001': 'Null pointer',
+      '0002': 'Wrong request method',
+      '0003': 'Incorrect input parameter type',
+      '0004': 'Incomplete input parameters',
+      '0005': 'Input parameters do not meet constraints',
+      '0006': 'system error',
+      '0007': 'Empty Name',
+      '0008': 'Service Expired !',
       'errorcode': 'Error code',
       '10000': 'Parameter is empty',
       '10001': 'Parameter length error',
@@ -1078,13 +1087,6 @@ const en = {
       '20008': 'File read failed!',
       '20009': 'File does not exist!',
       '20010': 'I/O close mistake!',
-      // 全局异常错误
-      '0001': 'Null pointer',
-      '0002': 'Wrong request method',
-      '0003': 'Incorrect input parameter type',
-      '0004': 'Incomplete input parameters',
-      '0005': 'Input parameters do not meet constraints',
-      '0006': 'system error',
       // 用户管理错误
       '3001': 'Username does not exist',
       '3002': 'Authentication failed',
@@ -1111,6 +1113,7 @@ const en = {
       '3024': 'The current user has not been created！',
       '3025': 'Token is not enabled！',
       '3026': 'The role has associated users!',
+      '3027': 'The character does not exist!',
       // 消息通讯错误
       '4001': 'Error Request',
       '4002': 'Error Response',

package/src/i18n/language/zh.js

@@ -211,7 +211,7 @@ const zh = {
       'phasewalk': '行人过街',
       'websteroptimization': 'Webster单点优化',
       'inductivePedestrianCrossControl': '感应式行人过街控制',
-      'selfadaption': '自适应控制',
+      'selfadaption': '方案生成',
       'custom': '自定义',
       'controlmodevalue': '控制方式数值',
       'patternstate': '方案状态',
@@ -250,10 +250,10 @@ const zh = {
       'modelList4': '步进',
       'modelList4-': '阶段锁定',
       'modelList5': '定周期',
-      'modelList6': '单点感应',
+      'modelList6': '自适应',
       'modelList7': '协调感应控制',
       'modelList8': '方案选择控制',
-      'modelList9': '自适应控制',
+      'modelList9': '方案生成',
       'modelList10': '无电缆协调',
       'modelList11': '平台协调',
       'modelList12': '行人过街',
@@ -498,8 +498,8 @@ const zh = {
       'ControlOption3': '关灯',
       'ControlOption4': '步进',
       'ControlOption5': '定周期控制',
-      'ControlOption6': '单点感应控制',
-      'ControlOption9': '自适应控制',
+      'ControlOption6': '自适应',
+      'ControlOption9': '方案生成',
       'ControlOption10': '无电缆控制',
       'ControlOption12': '行人过街控制',
       'ControlOption19': '感应式行人过街控制',
@@ -1065,6 +1065,15 @@ const zh = {
       'opensourceagreement': '开源协议'
     },
     'message': {
+      // 全局异常错误
+      '0001': '空指针',
+      '0002': '错误请求方式',
+      '0003': '输入参数类型不正确',
+      '0004': '输入参数不全',
+      '0005': '输入参数不满足约束',
+      '0006': '系统错误',
+      '0007': '名称为空',
+      '0008': '服务过期 !',
       'errorcode': '错误码',
       '10000': '参数为空',
       '10001': '参数长度错误',
@@ -1078,13 +1087,6 @@ const zh = {
       '20008': '文件读取失败!',
       '20009': '文件不存在!',
       '20010': 'I/O关闭错误!',
-      // 全局异常错误
-      '0001': '空指针',
-      '0002': '错误请求方式',
-      '0003': '输入参数类型不正确',
-      '0004': '输入参数不全',
-      '0005': '输入参数不满足约束',
-      '0006': '系统错误',
       // 用户管理错误
       '3001': '用户名不存在',
       '3002': '认证失败',
@@ -1111,6 +1113,7 @@ const zh = {
       '3024': '当前用户没有被创建！',
       '3025': 'token未启用！',
       '3026': '角色存在关联的用户!',
+      '3027': '角色不存在!',
       // 消息通讯错误
       '4001': '错误请求',
       '4002': '错误应答',

package/src/kisscomps/components/BoardCard/BoardCard.vue

@@ -13,7 +13,6 @@
         :isShowTip="isShowTip"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
-        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -93,9 +92,6 @@ export default {
     patternId: {
       type: Number
     },
-    patternType: {
-      type: String
-    },
     agentId: {
       type: String
     },

package/src/kisscomps/components/OverviewComponent/index.vue

@@ -103,7 +103,6 @@
             :agentId="agentId"
             :ip="ip"
             :platform="platform"
-            :funcSort="FuncSort"
             :roadDirection="roadDirection"
             :isFromAtc="isfromatc" />
         </div>
@@ -168,7 +167,7 @@ export default {
       detectorStatusTimer: null, // 检测器定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿'], [4, '绿闪']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green'], [4, 'Greenclear']]), // phaseType表示红，黄，绿
@@ -193,8 +192,7 @@ export default {
       commonHeight: undefined, // 左右侧面板的高度值
       graphicMode: false,
       resetcomponent: true,
-      curHomePage: 'Graphical',
-      FuncSort: 'allFunc'
+      curHomePage: 'Graphical'
     }
   },
   computed: {
@@ -781,14 +779,6 @@ export default {
           this.agentName = res.data.data.name
         }
         this.platform = res.data.data.platform
-        let func = 'allFunc'
-        if (this.platform === 'OpenATC') {
-          func = 'allFunc'
-        }
-        if (this.platform === 'SCATS' || this.platform === 'HUATONG') {
-          func = 'basicFunc'
-        }
-        this.FuncSort = func
       })
     }
   },

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

@@ -11,33 +11,8 @@
  **/
 <template>
     <div class="main-patternstatus">
-      <!-- rcp模式 -->
-      <div v-if="patternType === 'rcp'">
-        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
-          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
-              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
-              v-for="(item, index2) in list" :key="index2">
-            <div class="first-1" :style="{ width:
-                  (Number(item.greenWidth.replace('%', '')) /
-                    Number((((item.split + (item.sum ? item.sum : 0)) /
-                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
-            </div>
-            <el-tooltip placement="top-start" effect="light">
-                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
-                <div v-if="item.id" style="cursor: pointer">
-                  <div
-                    class="box"
-                    style="position: absolute; width:40px; left: 0; top: 5px"
-                  >
-                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
-                  </div>
-                </div>
-              </el-tooltip>
-          </div>
-      </div>
-      </div>
       <!-- 环模式true -->
-      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
+      <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) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
             <div class="first-1" :class="item.mode === 8 ? 'mask' : item.mode === 9 ? 'yellowClass' : ''" :style="{'width':Number(item.greenWidth.replace('%', ''))/Number((((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%').replace('%', ''))*100+'%','height':'34px','background':'#7ccc66'}">
@@ -142,7 +117,6 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
-      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -171,9 +145,6 @@ export default {
     controlPhase: {
       type: Object
     },
-    patternType: {
-      type: String
-    },
     contrloType: {
       type: String
     },
@@ -346,9 +317,6 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
       },
       // 深度观察监听
       deep: true
@@ -373,9 +341,6 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           setTimeout(() => {
@@ -408,9 +373,6 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
-    if (this.patternType === 'rcp') {
-      this.handleRcp(this.patternStatusList)
-    }
   },
   methods: {
     getPed (data) {
@@ -439,48 +401,6 @@ export default {
       }
       return ped
     },
-    handleRcp (val) {
-      this.patternRcp = []
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.splitchain
-        })
-      })
-      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
-        return item.length > 0 ? item.reduce((a, b) => {
-          return a + b
-        }) : 0
-      }) : 0
-      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
-      for (let rings of val) {
-        if (rings.length === 0) continue
-        let list = []
-        for (let ring of rings) {
-          if (ring.splitchain === 0) continue
-          let obj = {}
-          let split = ring.splitchain
-          obj.split = split
-          obj.cycle = cycle
-          obj.id = ring.phases
-          // if (ring.sum) {
-          //   obj.sum = ring.sum
-          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // } else {
-          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // }
-          // obj.mode = ring.mode
-          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
-          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // 忽略相位不显示
-          // let mode = ring.mode
-          // if (mode !== 7) { // 忽略相位不显示
-          list.push(obj)
-          // }
-        }
-        this.patternRcp.push(list)
-      }
-    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)
@@ -1117,7 +1037,7 @@ export default {
             }
           }
           obj.split = split
-          obj.cycle = cycle
+          obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
           if (ring.sum) {
             obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'

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

@@ -40,6 +40,8 @@
               :patternSelect="patternSelect"
               :allPatternList="allPatternList"
               :funcSort="funcSort"
+              :thirdPartyControlMenu="thirdPartyControlMenu"
+              :thirdPartyControl="thirdPartyControl"
               :isShowBack="isShowBack"
               :isShowRecovery="isShowRecovery"
               :isShowImplement="isShowImplement"
@@ -104,6 +106,8 @@
             :patternSelect="patternSelect"
             :allPatternList="allPatternList"
             :funcSort="funcSort"
+            :thirdPartyControlMenu="thirdPartyControlMenu"
+            :thirdPartyControl="thirdPartyControl"
             :isShowBack="isShowBack"
             :isShowRecovery="isShowRecovery"
             :isShowImplement="isShowImplement"
@@ -138,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',
@@ -200,10 +206,6 @@ export default {
       type: String,
       default: ''
     },
-    funcSort: {
-      type: String,
-      default: 'allFunc'
-    },
     roadDirection: {
       type: String,
       default: 'right'
@@ -261,7 +263,7 @@ export default {
       faultTimer: null, // 当前故障定时器
       ParamsMode: new Map([[0, '自主控制'], [1, '本地手动'], [2, '平台控制'], [3, '配置软件控制'], [4, '遥控器控制'], [5, '黄闪器控制'], [6, '降级控制'], [7, '脚本控制'], [8, '算法控制']]),
       ParamsModeEn: new Map([[0, 'Autonomous Control'], [1, 'Local Manual'], [2, 'Platform Control'], [3, 'Configuration Software Control'], [4, 'Remote Control'], [5, 'Yellow Flasher Control'], [6, 'Degradation Control'], [7, 'Script Control'], [8, 'Algorithm Control']]),
-      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '单点感应控制'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '自适应控制'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
+      ParamsControl: new Map([[0, '多时段'], [1, '黄闪'], [2, '全红'], [3, '关灯'], [4, '步进'], [5, '定周期控制'], [6, '自适应'], [7, '协调感应控制'], [8, '方案选择控制'], [9, '方案生成'], [10, '无电缆控制'], [11, '有电缆控制'], [12, '行人过街控制'], [13, '方案恢复过渡'], [14, '相位驻留'], [15, '通道检测'], [16, '方向锁定'], [17, '韦伯斯特单点控制'], [18, '预留18'], [19, '感应式行人过街'], [20, '方案干预'], [100, '方案干预'], [21, '预留21'], [22, '相位锁定'], [23, '相位放行控制'], [24, '紧急控制'], [99, '设备维护']]),
       ParamsControlEn: new Map([[0, 'Multi Period'], [1, 'Yellow Flash Control'], [2, 'Red Control'], [3, 'Dark Control'], [4, 'Step'], [5, 'Fixed_Cycle Control'], [6, 'Free Control'], [7, 'Coordinated Induction Control'], [8, 'Pattern Selection Control'], [9, 'Adaptive Control'], [10, 'Wireless Control'], [11, 'Cable Control'], [12, 'Pedestrian Crossing Control'], [13, 'Pattern recovery'], [14, 'Phase dwell'], [15, 'Channel Detection'], [16, 'Direction lock'], [17, 'Webster Single Point Coordination'], [18, 'Reserving18'], [19, 'Inductive Pedestrian Crossing Control'], [20, 'Program Intervention'], [100, 'Program Intervention'], [21, 'Reserving21'], [22, 'Priority Control'], [23, 'Close Phase'], [24, 'Emergency Control'], [99, 'Device Mantenance']]),
       phaseType: new Map([[1, '红'], [2, '黄'], [3, '绿']]), // phaseType表示红，黄，绿
       phaseTypeEn: new Map([[1, 'Red'], [2, 'Yellow'], [3, 'Green']]), // phaseType表示红，黄，绿
@@ -301,7 +303,7 @@ export default {
         id: 9,
         iconClass: 'zishiying',
         permission: 'configer:manual:base',
-        iconName: '自适应控制'
+        iconName: '方案生成'
       }, {
         id: 10,
         iconClass: 'wuxianlan',
@@ -385,14 +387,14 @@ export default {
           iconName: this.$t('openatccomponents.overview.modelList5'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '单点感应',
+          type: '自适应',
           id: 6,
           iconClass: 'ganyingkongzhi',
           permission: 'configer:manual:base',
           iconName: this.$t('openatccomponents.overview.modelList6'),
           bgcolor: getTheme() === 'light' ? '#edf6ff' : '#243d59'
         }, {
-          type: '自适应控制',
+          type: '方案生成',
           id: 9,
           iconClass: 'zishiying',
           permission: 'configer:manual:base',
@@ -465,7 +467,10 @@ export default {
       patternSelect: [], // 所有方案id
       specialPage: '', // 哪一个特殊控制页面
       nextcycleefficcontrol: [5, 6, 9, 10, 12, 19], // 下周期生效的控制方式
-      resetcomponent: false
+      resetcomponent: false,
+      funcSort: 'allFunc',
+      thirdPartyControlMenu: [],
+      thirdPartyControl: []
     }
   },
   watch: {
@@ -613,8 +618,25 @@ 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
+        }
+        this.funcSort = 'thirdPartyFunc'
+        this.thirdPartyControl = getPermissionControl(res.data.data)
+        this.thirdPartyControlMenu = getPermissionMenu(this.thirdPartyControl)
+        this.$refs.ManualControlModalNew.activeName = this.thirdPartyControlMenu[0]
+      })
+    },
     handleGetData (data) {
       let that = this
       if (data.name === '') {

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

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

package/src/kisscomps/components/SchemeConfig/manualControlModalNew/icon.vue

@@ -227,7 +227,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
       </g>
     </svg>
     <svg
-      v-if="type === '单点感应'"
+      v-if="type === '自适应'"
       version="1.1"
       id="图层_1"
       xmlns="http://www.w3.org/2000/svg"
@@ -266,7 +266,7 @@ PURPOSE. * See the Mulan PSL v2 for more details. **/
     </svg>
 
     <svg
-      v-if="type === '自适应控制'"
+      v-if="type === '方案生成'"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24.53 21.2"
       :width="iconWidth"

package/src/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('residentcontrol') !== -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('specialcontrol') !== -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('schemeselection') !== -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('others') !== -1))">
         <ControlModelGroup
-          v-if="activeName === 'others' && funcSort === 'allFunc'"
+          v-if="activeName === 'others'"
           ref="ControlModelGroup"
           className="otherscontrol"
           othersControl
           :controlList="othersControlList"
           :funcSort="funcSort"
+          :thirdPartyControl="thirdPartyControl"
           @selectModel="selectModel"
           @selectSpecialModel="selectSpecialModel"
         />
@@ -348,15 +356,15 @@ export default {
     isShowImplement: {
       type: Boolean,
       default: true
+    },
+    thirdPartyControlMenu: {
+      type: Array
+    },
+    thirdPartyControl: {
+      type: Array
     }
   },
   watch: {
-    activeName: {
-      handler: function (val) {
-      },
-      // 深度观察监听
-      deep: true
-    },
     patternSelect: {
       handler: function (val) {
         this.manualInfo.tempPatternid = this.crossStatusData.patternid
@@ -375,7 +383,6 @@ export default {
   },
   data () {
     return {
-      basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期
       visible: this.Visible,
       manuals: false,
       realtimeStage: {},