openatc-components 0.0.23 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.0.23",
+  "version": "0.0.26",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -18,7 +18,7 @@
     "package": "npm run package:prod && npm publish && npm run build",
     "npm2taobao": "npm config set registry https://registry.npm.taobao.org",
     "npm2npm": "npm config set registry https://registry.npmjs.org/",
-    "npm2yuanqu": "npm config set registryhttp://nexus.ctsp.kedacom.com/content/groups/npm-host-yuanqu/"
+    "npm2yuanqu": "npm config set registry http://nexus.ctsp.kedacom.com/content/groups/npm-host-yuanqu/"
   },
   "dependencies": {
     "flatpickr": "^4.5.1",

package/src/api/authapi.js

@@ -25,7 +25,7 @@ export default class authApi extends kissApi.KissApi {
     if (window.dev === 'development') {
       return '/'
     } else {
-      return '/' + getHost()
+      return getHost()
     }
   }
 }

package/src/i18n/language/en.js

@@ -112,6 +112,7 @@ const en = {
       'faultinfo': 'Fault Information',
       'platform': 'platform',
       'online': 'Online',
+      'patternid': 'Pattern Id',
       'offline': 'Offline',
       'connected': 'Connected',
       'onlineing': 'Offline...',
@@ -127,6 +128,7 @@ const en = {
       'phaseclosecontrol': 'Phase Close Control',
       'phaseclose': 'Close Phase',
       'phaselocking': 'Priority Control',
+      'tentativeplan': 'Tentative Plan',
       'implement': 'Execute',
       'comfirm': 'Comfirm',
       'ipaddress': 'IP',
@@ -199,10 +201,11 @@ const en = {
       'modelList18': 'Reserving18',
       'modelList19': 'Inductive Pedestrian Crossing Control',
       'modelList20': 'Program Intervention',
-      'modelList100': 'Program Intervention',
+      // 'modelList100': 'Program Intervention',
       'modelList21': 'Reserving21',
       'modelList22': 'Priority Control',
       'modelList23': 'Close Phase',
+      'modelList100': 'Tentative Plan',
       'modelList24': 'Emergency Control',
       'modelList99': 'Device Mantenance',
       'tips': 'Tips',

package/src/i18n/language/zh.js

@@ -112,6 +112,7 @@ const zh = {
       'faultinfo': '故障信息',
       'platform': '平台类型',
       'online': '在线',
+      'patternid': '方案编号',
       'offline': '离线',
       'connected': '已连接',
       'onlineing': '联机中...',
@@ -127,6 +128,7 @@ const zh = {
       'phaseclosecontrol': '相位关断控制',
       'phaseclose': '相位关断',
       'phaselocking': '相位锁定',
+      'tentativeplan': '临时方案',
       'implement': '执行',
       'comfirm': '确定',
       'ipaddress': 'IP地址',
@@ -199,10 +201,11 @@ const zh = {
       'modelList18': '预留18',
       'modelList19': '感应式行人过街',
       'modelList20': '方案干预',
-      'modelList100': '方案干预',
+      // 'modelList100': '方案干预',
       'modelList21': '预留21',
       'modelList22': '相位锁定',
       'modelList23': '相位关断',
+      'modelList100': '临时方案',
       'modelList24': '紧急控制',
       'modelList99': '设备维护',
       'tips': '提示',

package/src/icons/svg/tentativeplan.svg

@@ -0,0 +1,33 @@
+<svg 
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="54px" height="17px">
+<path fill-rule="evenodd"  fill="rgb(124, 204, 102)"
+ d="M-0.000,-0.000 L39.000,-0.000 L39.000,8.000 L-0.000,8.000 L-0.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(249, 220, 106)"
+ d="M39.000,-0.000 L47.000,-0.000 L47.000,8.000 L39.000,8.000 L39.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M37.000,-0.000 L38.000,-0.000 L38.000,8.000 L37.000,8.000 L37.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M35.000,-0.000 L36.000,-0.000 L36.000,8.000 L35.000,8.000 L35.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M33.000,-0.000 L34.000,-0.000 L34.000,8.000 L33.000,8.000 L33.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M31.000,-0.000 L32.000,-0.000 L32.000,8.000 L31.000,8.000 L31.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(242, 121, 121)"
+ d="M46.000,-0.000 L54.000,-0.000 L54.000,8.000 L46.000,8.000 L46.000,-0.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(124, 204, 102)"
+ d="M-0.000,9.000 L39.000,9.000 L39.000,17.000 L-0.000,17.000 L-0.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(249, 220, 106)"
+ d="M39.000,9.000 L47.000,9.000 L47.000,17.000 L39.000,17.000 L39.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M37.000,9.000 L38.000,9.000 L38.000,17.000 L37.000,17.000 L37.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M35.000,9.000 L36.000,9.000 L36.000,17.000 L35.000,17.000 L35.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M33.000,9.000 L34.000,9.000 L34.000,17.000 L33.000,17.000 L33.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(255, 255, 255)"
+ d="M31.000,9.000 L32.000,9.000 L32.000,17.000 L31.000,17.000 L31.000,9.000 Z"/>
+<path fill-rule="evenodd"  fill="rgb(242, 121, 121)"
+ d="M46.000,9.000 L54.000,9.000 L54.000,17.000 L46.000,17.000 L46.000,9.000 Z"/>
+</svg>

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

@@ -11,6 +11,7 @@
         :localPatternList="localPatternList"
         :contrloType="contrloType"
         :stagesChange="stagesChange"
+        :patternList="patternList"
         :agentId="agentId"
         :controlData="controlData"
         :phaseList="phaseList"
@@ -45,6 +46,9 @@ export default {
     localPatternList: {
       type: Array
     },
+    patternList: {
+      type: Array
+    },
     stagesChange: {
       type: Array
     },

package/src/kisscomps/components/ExpendConfig/ExpendConfig.vue

@@ -0,0 +1,93 @@
+<template>
+<div>
+  <div class="common-board-column">
+    <div class="common-board-column-header">
+      {{headerText}}
+    </div>
+    <div class="common-board-table-header">
+      <el-row :gutter="13">
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
+        </el-col>
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.delaystart')}}
+        </el-col>
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.advanceend')}}
+        </el-col>
+      </el-row>
+    </div>
+     <draggable
+      class="common-board-column-content"
+      :list="list"
+      :options="options">
+      <div class="common-board-item" v-for="element in list" :key="element.id">
+        <el-row :gutter="13" >
+          <el-col :span="8">
+            <el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
+              <el-option
+                v-for="item in coordphaseOption"
+                :key="item.value"
+                :label="$t('openatccomponents.pattern.coordphaseOption' + item.value)"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
+            <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
+          </el-col>
+          <el-col :span="8">
+            <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
+          </el-col>
+        </el-row>
+      </div>
+    </draggable>
+  </div>
+</div>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+export default {
+  name: 'expend-config',
+  components: {
+    draggable
+  },
+  data () {
+    return {
+      coordphaseOption: [{
+        value: 1
+      }, {
+        value: 2
+      }, {
+        value: 4
+      }]
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    index: {
+      type: Number
+    },
+    options: {
+      type: Object,
+      default () {
+        return {}
+      }
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.el-input-number--small {
+  width: 94px;
+}
+</style>

package/src/kisscomps/components/ExpendConfig/index.js

@@ -0,0 +1,2 @@
+import ExpendConfig from './ExpendConfig.vue'
+export default ExpendConfig

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -11,6 +11,16 @@
  **/
 <template>
   <div class="crossImg">
+    <div v-show="isShowMode">
+      <div class="controlText">
+        <div style="border:0px solid red;float:right;">
+          {{controlName }}
+        </div>
+      </div>
+      <div class="modeText">
+        {{modeName }}
+      </div>
+    </div>
     <!-- 右行道路 B-->
     <div class="right-dir-road" v-if="roadDir === 'right'">
       <div class="centerText" v-if="crossType !== 'Customroads' && isHasPhase">
@@ -193,6 +203,18 @@ export default {
     },
     roadDirection: {
       type: String
+    },
+    isShowMode: {
+      type: Boolean,
+      devault: false
+    },
+    modeName: {
+      type: String,
+      default: ''
+    },
+    controlName: {
+      type: String,
+      default: ''
     }
   },
   // computed: {

package/src/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -23,10 +23,13 @@
     'transMiddleCrossImg3': bodyDomWidth <= 300 && bodyDomWidth > 260,
     'transMiniCrossImg': bodyDomWidth <= 260,
     'changePaddingBottom': graphicMode }">
-    <CrossDiagram v-if="reset"
+    <CrossDiagram ref = "crossDiagram" v-if="reset"
       :crossStatusData="crossStatusData"
       :agentId="agentId"
       :isShowInterval="isShowInterval"
+      :isShowMode="isShowMode"
+      :modeName="modeName"
+      :controlName="controlName"
       :devStatus="devStatus"
       :roadDirection="roadDirection" />
   </div>
@@ -72,14 +75,21 @@ export default {
       type: Boolean,
       default: true
     },
-    Token: {
-      handler: function (val) {
-        this.setPropsToken(val)
-      }
-    },
     roadDirection: {
       type: String,
       default: 'right'
+    },
+    isShowMode: {
+      type: Boolean,
+      default: false
+    },
+    modeName: {
+      type: String,
+      default: ''
+    },
+    controlName: {
+      type: String,
+      default: ''
     }
   },
   watch: {
@@ -91,11 +101,6 @@ export default {
       },
       // 深度观察监听
       deep: true
-    },
-    Token: {
-      handler: function (val) {
-        this.setPropsToken(val)
-      }
     }
   },
   created () {
@@ -105,7 +110,6 @@ export default {
   },
   mounted () {
     this.getParentSize()
-    this.setPropsToken(this.Token)
   },
   updated () {
   },

package/src/kisscomps/components/IntersectionWithInterface/IntersectionWithInterface.vue

@@ -18,15 +18,21 @@
         :devStatus="devStatus"
         :agentId="agentId"
         :graphicMode="true"
-        :roadDirection="roadDirection" />
+        :roadDirection="roadDirection"
+        :modeName="modeName !== '' ? modeName : controlData.mode"
+        :controlName="controlName !== '' ? controlName : controlData.control"
+        :isShowMode="isShowMode"
+        :isShowInterval="isShowInterval"
+        @onSelectStages="onSelectStages"/>
   </div>
 </template>
 <script>
 import IntersectionMap from '../IntersectionMap'
 import { getMessageByCode } from '../../../utils/responseMessage'
-import { getTscControl, queryDevice } from '../../../api/control.js'
-import { registerMessage } from '../../../api/param'
-import { getIframdevid, setIframdevid, setToken } from '../../../utils/auth.js'
+import { getTscControl, queryDevice, putTscControl } from '../../../api/control.js'
+import { registerMessage, uploadSingleTscParam } from '../../../api/param'
+import { getIframdevid, setIframdevid, setToken, setHost } from '../../../utils/auth.js'
+import ControlFormat from '../../../utils/ControlFormat.js'
 export default {
   name: 'intersection-with-interface',
   components: {
@@ -34,6 +40,7 @@ export default {
   },
   data () {
     return {
+      controlData: {},
       boxVisible: false,
       dialogWidth: '100%',
       crossStatusData: {}, // 路口状态数据
@@ -45,6 +52,10 @@ export default {
     }
   },
   props: {
+    reqUrl: {
+      type: String,
+      default: 'http://192.168.13.105:11003/openatc'
+    },
     AgentId: {
       type: String,
       default: '0'
@@ -56,6 +67,22 @@ export default {
     roadDirection: {
       type: String,
       default: 'right'
+    },
+    isShowInterval: {
+      type: Boolean,
+      default: true
+    },
+    isShowMode: {
+      type: Boolean,
+      default: false
+    },
+    modeName: {
+      type: String,
+      default: ''
+    },
+    controlName: {
+      type: String,
+      default: ''
     }
   },
   watch: {
@@ -114,6 +141,7 @@ export default {
           }
           return
         }
+        this.$emit('registerMessage', data)
         this.devStatus = 3
         this.clearPatternInterval() // 清除其他定时器
         this.phaseControlTimer = setInterval(() => {
@@ -180,6 +208,10 @@ export default {
           return
         }
         this.crossStatusData = JSON.parse(JSON.stringify(data.data.data.data))
+        let param = JSON.parse(JSON.stringify(data.data.data.data))
+        // this.controlData = this.handleGetData(param)
+        this.controlData = this.controlFormat.handleGetData(param)
+        this.$emit('getTscControl', data)
       }).catch(error => {
         this.$message.error(error)
         console.log(error)
@@ -206,6 +238,7 @@ export default {
         _this.platform = res.data.data.platform
         _this.$refs.intersectionMap.resetCrossDiagram()
         _this.registerMessage() // 注册消息
+        _this.$emit('queryDevice', res)
       })
     },
     firstInit () {
@@ -227,11 +260,218 @@ export default {
       if (token && token !== '') {
         setToken(token)
       }
+    },
+    setHost (host) {
+      // 获取组件外传入的token，便于独立组件调用接口
+      if (host && host !== '') {
+        setHost(host)
+      }
+    },
+    async doPatternCommit (control) {
+      let that = this
+      let resData
+      await putTscControl(control, this.agentId).then(data => {
+        resData = data
+        let success = 0
+        if (!data.data.success) {
+          that.$message.error(getMessageByCode(data.data.code, that.$i18n.locale))
+          return
+        }
+        if (data.data.data && data.data.data.data) {
+          success = data.data.data.data.success
+          if (success !== 0) {
+            let errormsg = 'openatccomponents.overview.putTscControlError' + success
+            that.$message.error(this.$t(errormsg))
+            return
+          }
+        }
+        // this.closeManualModal()
+        if ((that.currModel === 5 || that.currModel === 6 || that.currModel === 10 || that.currModel === 12) && (that.preselectModel === 6 || that.preselectModel === 10 || that.preselectModel === 12)) {
+          that.$message.success(this.$t('openatccomponents.overview.nextcycleeffic'))
+          return
+        }
+        if (that.preselectModel === 4) {
+          that.$message.success(this.$t('openatccomponents.overview.transitioneffic'))
+          return
+        }
+        if (success === 0) {
+          that.$message.success(this.$t('openatccomponents.common.download'))
+        }
+      }).catch(error => {
+        that.$message.error(error)
+        console.log(error)
+      })
+      return resData
+    },
+    async getTscControlInfo () {
+      await getTscControl(this.agentId).then((data) => {
+        let res = data
+        this.controlInfo = {
+          tscData: null,
+          stageData: null,
+          controlData: null
+        }
+        if (!data.data.success) {
+          if (data.data.code === '4003') {
+            this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+            return
+          }
+          let parrenterror = getMessageByCode(data.data.code, this.$i18n.locale)
+          if (data.data.data) {
+            // 子类型错误
+            let childErrorCode = data.data.data.errorCode
+            if (childErrorCode) {
+              let childerror = getMessageByCode(data.data.data.errorCode, this.$i18n.locale)
+              this.$message.error(parrenterror + ',' + childerror)
+            }
+          } else {
+            this.$message.error(parrenterror)
+          }
+          return
+        }
+        let tscData = JSON.parse(JSON.stringify(res.data.data))
+        let stageData = []
+        // stageData = this.handleStageData(tscData) // 处理阶段（驻留）stage数据
+        let controlData = {}
+        let param = Object.assign({}, tscData)
+        controlData = this.controlFormat.handleGetData(param)
+        this.controlData = controlData
+        this.controlInfo = {
+          tscData: tscData,
+          stageData: stageData,
+          controlData: controlData
+        }
+      }).catch(error => {
+        this.$message.error(error)
+        console.log(error)
+      })
+    },
+    async getPhase () {
+      await uploadSingleTscParam('phase', this.agentId).then(data => {
+        let res = data.data
+        if (!res.success) {
+          if (res.code === '4003') {
+            this.$message.error(this.$t('openatccomponents.errorTip.devicenotonline'))
+            return
+          }
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          return
+        }
+        this.phaseList = res.data.data.phaseList
+      })
+    },
+    async getPhaseInfo () {
+      await this.getPhase()
+      let res = [...this.phaseList]
+      return res
+    },
+    async getControlInfo () {
+      await this.getTscControlInfo()
+      // let res = this.controlInfo.controlData
+      let res = this.controlInfo.tscData
+      return res
+    },
+    clearInterVals () {
+      this.clearPatternInterval() // 清除定时器
+      this.clearRegisterMessageTimer() // 清除定时器
+    },
+    onSelectStages (value) {
+      this.currentStage = value
+      this.$emit('onSelectStages', value)
+    },
+    async lockPhase (reqData) {
+      let res = await this.doPatternCommit(reqData)
+      return res
+    },
+    async unlockPhase (reqData) {
+      let res = await this.doPatternCommit(reqData)
+      return res
+    },
+    async changeControlPattern (reqData) {
+      let res = await this.doPatternCommit(reqData)
+      return res
+    },
+    getBusPos () {
+      // 公交相位信息
+      this.busPhaseData = []
+      this.phaseList.forEach((ele, i) => {
+        if (ele.controltype >= 3 && ele.controltype <= 5) {
+          ele.direction.forEach((dir, index) => {
+          // 车道相位
+            this.busPhaseData.push({
+              // key: this.CrossDiagramMgr.getUniqueKey('busphase'),
+              phaseid: ele.id, // 相位id，用于对应相位状态
+              id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
+              name: this.PhaseDataModel.getBusPhasePos(dir).name,
+              controltype: ele.controltype
+            })
+          })
+        }
+      })
+      let result = []
+      let obj = {}
+      for (var i = 0; i < this.busPhaseData.length; i++) {
+        if (!obj[this.busPhaseData[i].phaseid]) {
+          result.push(this.busPhaseData[i])
+          obj[this.busPhaseData[i].phaseid] = true
+        }
+      }
+      this.busPhaseData = result
+    },
+    handleStageData (data) {
+      this.getBusPos()
+      this.stagesList = []
+      let busPhaseData = this.busPhaseData
+      let stages = data.stages
+      if (!stages) return
+      let stagesTemp = []
+      for (let stage of stages) {
+        let tempList = []
+        let directionList = []
+        let stageControType = 0
+        let peddirections = []
+        for (let stg of stage) {
+          let currPhase = this.phaseList.filter((item) => {
+            return item.id === stg
+          })[0]
+          if (currPhase !== undefined) {
+            directionList = [...currPhase.direction, ...directionList]
+          }
+          for (let walk of this.sidewalkPhaseData) {
+            if (stg === walk.phaseid) {
+              peddirections.push(...currPhase.peddirection)
+              peddirections = Array.from(new Set(peddirections))
+            }
+          }
+          for (let busPhase of busPhaseData) {
+            if (stg === busPhase.phaseid) {
+              stageControType = busPhase.controltype
+            }
+          }
+        }
+        directionList = [...new Set(directionList)]
+        if (directionList.length === 0) return
+        tempList = directionList.map(dir => ({
+          id: dir,
+          color: '#606266',
+          controltype: stageControType,
+          peddirection: peddirections
+        }))
+        stagesTemp.push(tempList)
+      }
+      this.stagesList = JSON.parse(JSON.stringify(stagesTemp))
+      // 相位变化时触发回调
+      if (this.currentStage !== data.current_stage) {
+        this.$emit('onPhaseChange', this.stagesList, data.current_stage)
+      }
+      this.currentStage = data.current_stage
     }
   },
   created () {
     this.agentId = this.AgentId
     this.setDialogWidth()
+    this.setHost(this.reqUrl)
+    this.controlFormat = new ControlFormat()
   },
   mounted () {
     setIframdevid(this.AgentId)

package/src/kisscomps/components/KanBan/index.js

@@ -0,0 +1,2 @@
+import KanBan from './KanBan.vue'
+export default KanBan