openatc-components 0.0.91 → 0.0.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.0.91",
+  "version": "0.0.94",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,
@@ -36,9 +36,7 @@
     "vuex": "3.0.1",
     "scss-loader": "0.0.1",
     "vuedraggable": "^2.16.0",
-    "animate.css": "^3.7.2",
-    "echarts": "^4.9.0",
-    "@minogin/vue-drag-resize-rotate": "^1.0.5"
+    "animate.css": "^3.7.2"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

package/src/i18n/language/en.js

@@ -792,9 +792,7 @@ const en = {
       'Cancel': 'Cancel',
       'Back': 'Back',
       'ignore': 'Ignore',
-      'confirm': 'Confirm',
-      'save': 'Save',
-      'reset': 'Reset'
+      'confirm': 'Confirm'
     },
     'common': {
       'confirm': 'Confirm',
@@ -842,8 +840,7 @@ const en = {
       'setup': 'setup',
       'tipsmodaltitle': 'Tips',
       'deviceoffline': 'Device not online!',
-      'operationsuccess': 'Operation Success !',
-      'savesucess': 'Save Success!'
+      'operationsuccess': 'Operation Success !'
     },
     'login': {
       'title': 'Openatc-Configer',
@@ -1107,78 +1104,6 @@ const en = {
       'channel': 'channel',
       'detector': 'detector',
       'port': 'port'
-    },
-    'channelizationmap': {
-      'importpicture': 'Import Picture',
-      'importtip': 'The picture format is SVG, PNG and JPG, and the size is no more than 10MB',
-      'importsizeerror': 'Picture size exceeds 10MB, please re import!',
-      'importtypeerror': 'Picture format error, please import again!',
-      'importcrosspicture': 'Import intersection picture',
-      'againimport': 'Re import',
-      'motorway': 'Motorway',
-      'bicyclelane': 'Non motorized Lane',
-      'pedcrossing': 'Ped crossing',
-      'countdown': 'Countdown',
-      'detector': 'Detector',
-      'laneturn': 'Lane turn',
-      'straightahead': 'Straightahead',
-      'turnleft': 'Turnleft',
-      'turnright': 'Turnright',
-      'turnaround': 'Turnaround',
-      'position': 'Position',
-      'eastward': 'Eastward',
-      'westward': 'Westward',
-      'southward': 'Southward',
-      'northward': 'Northward',
-      'etped': 'East-Top',
-      'ebped': 'East-Bottom',
-      'wtped': 'West-Top',
-      'wbped': 'West-Bottom',
-      'slped': 'South-Left',
-      'srped': 'South-Right',
-      'nlped': 'North-Left',
-      'nrped': 'North-Right',
-      'xrped': 'X-/',
-      'xlped': 'X-\\',
-      'ewped': 'East-West',
-      'snped': 'South-North',
-      'choosedirerror': 'Select at least one lane to turn!',
-      'lanetype': 'Lane Type',
-      'vehiclemainroad': 'Vehicle Main Road',
-      'vehiclebranch': 'Vehicle Branch',
-      'nonmotorizedlane': 'Non Motorized',
-      'buslane': 'Bus Lane',
-      'BRTlane': 'BRT Lane',
-      'tramlane': 'Tram Lane',
-      'pedestriantype': 'Pedestrian Type',
-      'pedestrian': 'Pedestrian',
-      'secondcrossing': 'Second Crossing',
-      'xpedestrian': 'X Pedestrian',
-      'sectionpedestrian': 'Section Pedestrian',
-      'delete': 'Delete',
-      'drawtips': 'Click add on the intersection map after selection',
-      'canclesetting': 'Cancel the channelization setting of the current intersection?',
-      'phaseassociated': 'Phase Associated',
-      'phase': 'phase',
-      'associatedphaseerror': 'Association failed. Lanes in the same direction cannot be associated with different phases!',
-      'overlapassociated': 'Overlap Associated',
-      'flowsaturation': 'Flow saturation',
-      'occupancysaturation': 'Occupancy saturation',
-      'detectortype': 'Detector Type',
-      'vehicledetector': 'Detector',
-      'pedestriandetector': 'Pedestrian Detector',
-      'detectorassociated': 'Detector Associated',
-      'detectorthreshold': 'Detector Threshold',
-      'occupancythreshold': 'Occupancy threshold',
-      'saturationthreshold': 'Flow Saturation threshold',
-      'checkthreshold': 'The threshold value cannot be blank. Please fill in a positive integer within the range of 0-100！',
-      'pedestriancrossing': 'Pedestrian crossing',
-      'pedestriansecondarycrossing': 'Pedestrian secondary crossing',
-      'obliquepedestriancrossing': 'Oblique pedestrian crossing',
-      'sectionpedestriancrossing': 'Section pedestrian crossing',
-      'flipdisplay': 'Flip display',
-      'vehiclelane': 'Vehicle lane',
-      'sidewalk': 'Sidewalk'
     }
   }
 }

package/src/i18n/language/zh.js

@@ -790,9 +790,7 @@ const zh = {
       'Cancel': '取消',
       'Back': '返回',
       'ignore': '忽略',
-      'confirm': '确认',
-      'save': '保存',
-      'reset': '重置'
+      'confirm': '确认'
     },
     'common': {
       'confirm': '确认',
@@ -840,8 +838,7 @@ const zh = {
       'setup': '设置',
       'tipsmodaltitle': '提示',
       'deviceoffline': '设备不在线！',
-      'operationsuccess': '操作成功',
-      'savesucess': '保存成功！'
+      'operationsuccess': '操作成功'
     },
     'login': {
       'title': '信号机设备配置',
@@ -1106,78 +1103,6 @@ const zh = {
       'channel': '通道',
       'detector': '检测器',
       'port': '端口'
-    },
-    'channelizationmap': {
-      'importpicture': '导入图片',
-      'importtip': '图片格式为svg、png、jpg，大小不超过10Mb',
-      'importsizeerror': '图片大小超过10Mb，请重新导入!',
-      'importtypeerror': '图片格式错误，请重新导入!',
-      'importcrosspicture': '导入路口图片',
-      'againimport': '重新导入',
-      'motorway': '机动车道',
-      'bicyclelane': '非机动车道',
-      'pedcrossing': '人行横道',
-      'countdown': '倒计时',
-      'detector': '检测器',
-      'laneturn': '车道转向',
-      'straightahead': '直行',
-      'turnleft': '左转',
-      'turnright': '右转',
-      'turnaround': '掉头',
-      'position': '方位',
-      'eastward': '东向',
-      'westward': '西向',
-      'southward': '南向',
-      'northward': '北向',
-      'etped': '东向-上',
-      'ebped': '东向-下',
-      'wtped': '西向-上',
-      'wbped': '西向-下',
-      'slped': '南向-左',
-      'srped': '南向-右',
-      'nlped': '北向-左',
-      'nrped': '北向-右',
-      'xrped': 'X-/',
-      'xlped': 'X-\\',
-      'ewped': '东西向',
-      'snped': '南北向',
-      'choosedirerror': '至少选中一个车道转向!',
-      'lanetype': '车道类型',
-      'vehiclemainroad': '机动车主路',
-      'vehiclebranch': '机动车支路',
-      'nonmotorizedlane': '非机动车道',
-      'buslane': '公交车道',
-      'BRTlane': 'BRT车道',
-      'tramlane': '有轨电车',
-      'pedestriantype': '行人类型',
-      'pedestrian': '行人过街',
-      'secondcrossing': '二次过街',
-      'xpedestrian': '斜向行人',
-      'sectionpedestrian': '路段行人',
-      'delete': '删除',
-      'drawtips': '选择后在路口图上点击添加',
-      'canclesetting': '是否取消当前路口渠化设置?',
-      'phaseassociated': '相位关联',
-      'phase': '相位',
-      'associatedphaseerror': '关联失败，同方位车道不能关联不同相位!',
-      'overlapassociated': '跟随相位关联',
-      'flowsaturation': '流量饱和度',
-      'occupancysaturation': '占有率饱和度',
-      'detectortype': '检测器类型',
-      'vehicledetector': '检测器',
-      'pedestriandetector': '行人检测器',
-      'detectorassociated': '检测器关联',
-      'detectorthreshold': '检测器阈值',
-      'occupancythreshold': '占有率阈值',
-      'saturationthreshold': '流量饱和度阈值',
-      'checkthreshold': '阈值不可为空，请填0-100范围内的正整数！',
-      'pedestriancrossing': '行人过街',
-      'pedestriansecondarycrossing': '行人二次过街',
-      'obliquepedestriancrossing': '斜向行人过街',
-      'sectionpedestriancrossing': '路段行人过街',
-      'flipdisplay': '翻转显示',
-      'vehiclelane': '车道',
-      'sidewalk': '人行道'
     }
   }
 }

package/src/kisscomps/components/KanBan/kanban.vue

@@ -180,7 +180,7 @@ export default {
         ls.minSplit = temp1 > temp2 ? temp1 : temp2
         if (ls.mode !== 7 && ls.value < ls.minSplit) {
           ls.value = ls.minSplit
-          this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
+          this.$message.error(this.$t('edge.pattern.splitCheckMsg'))
         }
       }
     },

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

@@ -23,7 +23,8 @@
             <el-form-item
                 :label="$t('openatccomponents.overview.delay') + ':'"
                 prop="intersection">
-               <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.tempDelay" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.tempDelay" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>
@@ -36,12 +37,14 @@
            <el-form-item
                 :label="$t('openatccomponents.overview.patternoffset') + ':'"
                 prop="count">
-               <el-input v-model="manualInfo.offset" 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.offset" size="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.offset" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.overview.duration') + ':'"
                 prop="intersection">
-               <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="mini"></el-input-number>
+               <!-- <el-input v-model="manualInfo.duration" size="mini" :placeholder="$t('openatccomponents.common.input')"></el-input> -->
             </el-form-item>
            </el-form>
       </el-col>

package/src/kisscomps/index.js

@@ -4,8 +4,6 @@ import IntersectionWithInterface from './components/IntersectionWithInterface/in
 import IntersectionMap from './components/IntersectionMap/index'
 import SchemeConfig from './components/SchemeConfig/index'
 import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselControlModal/index'
-import Channelization from './components/Channelization/index'
-import DrawChannelization from './components/DrawChannelization/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
 import patternList from './components/patternList/index'
@@ -22,7 +20,6 @@ import ExpendConfig from './components/ExpendConfig/index'
 import PatternWalkSvg from './components/PatternWalkSvg/index'
 import tentativeplancontrolmodal from './components/SchemeConfig/tentativeplancontrolmodal/index'
 import { setToken, setHost } from '../utils/auth.js'
-import componentsGlobalParam from '../store/modules/globalParam'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
@@ -35,8 +32,6 @@ const components = {
   IntersectionMap,
   SchemeConfig,
   lockingPhaselControlModal,
-  Channelization,
-  DrawChannelization,
   FaultDetailModal,
   PatternStatus,
   BoardCard,
@@ -64,10 +59,6 @@ const func = {
   setToken
 }
 
-const Store = {
-  componentsGlobalParam
-}
-
 const requireAll = requireContext => requireContext.keys().map(requireContext)
 const install = function (Vue) {
   if (install.installed) return
@@ -95,8 +86,7 @@ const API = {
   install,
   ...components,
   language,
-  func,
-  Store
+  func
 }
 
 export default API

package/src/main.js

@@ -12,7 +12,6 @@ import i18n from './i18n'
 import 'element-ui/lib/theme-chalk/index.css'
 import './icons' // icon
 import './icons/iconfont.css'
-import drr from '@minogin/vue-drag-resize-rotate'
 
 window.dev = process.env.NODE_ENV
 
@@ -28,8 +27,6 @@ Vue.use(ElementUI, {
   locale
 })
 
-Vue.component('drr', drr)
-
 /* 使用动画库 */
 Vue.use(animate)
 

package/src/router/index.js

@@ -31,13 +31,6 @@ export default new Router({
       component: (resolve) => {
         require(['@/views/overView'], resolve)
       }
-    },
-    {
-      path: '/quhua',
-      name: 'config',
-      component: (resolve) => {
-        require(['@/views/customchannelization'], resolve)
-      }
     }
   ]
 })

package/src/store/index.js

@@ -12,13 +12,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import getters from './getters'
-import globalParam from './modules/globalParam'
+// import globalParam from './modules/globalParam'
 
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   modules: {
-    globalParam
+    // globalParam
   },
   getters
 })

package/src/store/modules/globalParam.js

@@ -9,70 +9,19 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
-const tscParam = {
-  phaseList: [],
-  patternList: [],
-  planList: [],
-  dateList: [],
-  overlaplList: [],
-  channelList: [],
-  detectorList: [],
-  pedestrainDetectorList: [],
-  channellock: [],
-  // customInfo: {
-  //   areaid: Number,
-  //   intersectionid: Number,
-  //   siteid: '',
-  //   selflearning: 0,
-  //   fixintersectioninfo: '',
-  //   commuport: 0,
-  //   commutype: '',
-  //   steptype: ''
-  // },
-  manualpanel: {
-    mingreen: 15
-  },
-  singleoptim: [
-  ]
-}
-const Global = {
-  state: {
-    tscParam: JSON.parse(JSON.stringify(tscParam)),
-    channelizationPageIndex: 1, // 总览编辑页面显示： 1 代表首次导入 2 代表已有保存的渠化图
-    associatedPhaseList: [], // 关联相位列表
-    PhaseDataMgr: {} // 关联相位数据处理模型
-  },
-  mutations: {
-    SET_TSCPARAM: (state, tscParam) => {
-      state.tscParam = JSON.parse(JSON.stringify(tscParam))
-    },
-    SET_ASSOCIATED_PHASE_LIST: (state, Associatedphaselist) => {
-      state.associatedPhaseList = JSON.parse(JSON.stringify(Associatedphaselist))
-    },
-    INIT_PHASE_DATA_MGR: (state, PhaseDataMgrClass) => {
-      state.PhaseDataMgr = PhaseDataMgrClass
-    },
-    SET_CHANNELZATION_PAGE_INDEX: (state, isHasChannelSetting) => {
-      if (isHasChannelSetting) {
-        state.channelizationPageIndex = 2
-      } else {
-        state.channelizationPageIndex = 1
-      }
-    }
-  },
-  actions: {
-    SetTscParam ({ commit }, tscParam) {
-      commit('SET_TSCPARAM', tscParam)
-    },
-    SetAssociatedPhaseList ({ commit }, Associatedphaselist) {
-      commit('SET_ASSOCIATED_PHASE_LIST', Associatedphaselist)
-    },
-    InitPhaseDataMgr ({ commit }, PhaseDataMgrClass) {
-      commit('INIT_PHASE_DATA_MGR', PhaseDataMgrClass)
-    },
-    SetChannelizationPageIndex ({ commit }, isHasChannelSetting) {
-      commit('SET_CHANNELZATION_PAGE_INDEX', isHasChannelSetting)
-    }
-  }
-}
-export default Global
+// const Global = {
+//   state: {
+//     roadDirection: 'right' // 当前路口行车方向：默认右行
+//   },
+//   mutations: {
+//     SET_ROAD_RIRECTION: (state, DIR) => {
+//       state.roadDirection = DIR
+//     }
+//   },
+//   actions: {
+//     SetRoadDirection ({ commit }, DIR) {
+//       commit('SET_ROAD_RIRECTION', DIR)
+//     }
+//   }
+// }
+// export default Global

package/src/views/intersection.vue

@@ -66,23 +66,18 @@
         :AgentId="agentId"
         :Token="Token"/> -->
 
-      <channelization-with-interface
-        :AgentId="agentId" />
-      <!-- <ChannelizationWithInterface
-        :AgentId="agentId" /> -->
     </div>
   </div>
 </template>
 <script>
 import IntersectionWithInterface from '../kisscomps/components/IntersectionWithInterface'
-import ChannelizationWithInterface from '../kisscomps/components/ChannelizationWithInterface/ChannelizationWithInterface'
 export default {
   name: 'demo',
   data () {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '10003-391',
+      agentId: '10002-994',
       reqUrl: 'http://192.168.13.105:11003/openatc',
       Token: 'eyJraWQiOiIxNjUzMjgyODkwMDYxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTY4Mjg5MCwiaWF0IjoxNjUzMjgyODkwfQ.emqFxXlot1Zk6TGkLMDx0zIp2B8toSz17xdZI_DrXZI',
       // agentId: '30003-352',
@@ -101,8 +96,7 @@ export default {
     }
   },
   components: {
-    IntersectionWithInterface,
-    ChannelizationWithInterface
+    IntersectionWithInterface
   },
   methods: {
     oncancle () {

package/static/apiconfig.json

@@ -332,20 +332,5 @@
   "key": "enumerateCheck",
   "url": "/fault/check",
   "method": "post"
-},
-{
-  "key": "getChannelizatonChart",
-  "url": "/devs/channelizatonchart",
-  "method": "get"
-},
-{
-  "key": "saveChannelizatonChart",
-  "url": "/devs/channelizatonchart",
-  "method": "post"
-},
-{
-  "key": "getDetectorStatus",
-  "url": "/devs/detectorstatus",
-  "method": "get"
 }
 ]

package/static/styles/common.scss

@@ -3,7 +3,6 @@
 @import './commonkanban.scss';
 @import './stages.scss';
 @import './overview.scss';
-@import './channelizatioon.scss';
 
  // 全局滚动条样式
  ::-webkit-scrollbar {