openatc-components 0.1.139 → 0.1.142

package/src/kisscomps/components/patternConfig/planMenu.vue

@@ -0,0 +1,329 @@
+/**
+ * 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="openatc-planmanu">
+  <div class="title" style="display:flex;">{{$t('openatc.main.routeOptimize')}}</div>
+  <el-menu @select="selectPlan" v-loading="loading">
+    <el-menu-item :index="String(plan.id)" v-for="(plan, index) in planData" :key="index">
+        <span slot="title">{{plan.name}}</span>
+    </el-menu-item>
+  </el-menu>
+  <div class="btnGroup" v-show="false">
+    <div class="addbtn" :style="{zIndex: zIndexObj.addZIndex}">
+      <button slot="reference" class="btn" @click="onAdd" ref="addbtn">{{$t('openatc.common.add')}}</button>
+    </div>
+    <div class="operate">
+      <el-dropdown trigger="click" @command="switchOperate">
+        <span class="el-dropdown-link">
+          {{$t('openatccomponents.greenwaveoptimize.operation')}}<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item icon="el-icon-edit" command="Edit">{{$t('openatc.common.edit')}}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-delete" command="Delete">{{$t('openatc.common.delete')}}</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
+  <!-- <Messagebox :visible="deleteDiologVisible" :text="`${$t('openatccomponents.greenwaveoptimize.isdelete')}${chooseName} ?`" @cancle="closeDeleteDialog" @ok="handleDelete"/> -->
+  <!-- <AddOptimizeDialog  ref="addOptimizeDialog"
+                      @closeDialog="closeAddDialog"
+                      @updateRoute="updateRoute"/> -->
+</div>
+</template>
+
+<script>
+// import Messagebox from '../../components/MessageBox'
+// import AddOptimizeDialog from './components/addOptimizeDialog'
+import { AddRoute, DeleteRoute, UpdateRoute } from '../../../api/route'
+import { getMessageByCode } from '../../../utils/responseMessage'
+export default {
+  name: 'PlanMenu',
+  components: {
+    // Messagebox
+    // AddOptimizeDialog
+  },
+  props: {
+    planData: {
+      type: Array
+    },
+    zIndexObj: {
+      type: Object
+    },
+    loading: {
+      type: Boolean
+    }
+  },
+  watch: {
+    planData: {
+      handler: function (val) {
+        if (this.chooseId) {
+          this.chooseName = this.planData.filter(ele => ele.id === this.chooseId)[0].name
+        }
+        // if (val && !val.length) {
+        //   // 模拟一次手动点击，触发tip显示
+        //   this.$refs.addbtn.click()
+        // }
+      },
+      deep: true
+    }
+  },
+  data () {
+    return {
+      route: {},
+      chooseId: 0, // 选中的计划id
+      chooseName: '', // 选中的计划name
+      deleteDiologVisible: false,
+      addNum: 0,
+      isEdit: false
+    }
+  },
+  methods: {
+    selectPlan (id) {
+      // 选择某一方案
+      this.chooseId = Number(id)
+      let plan = this.planData.filter(ele => ele.id === this.chooseId)[0]
+      for (let dev of plan.devs) {
+        dev.isused = true
+      }
+      this.route = JSON.parse(JSON.stringify(plan))
+      this.chooseName = this.planData.filter(ele => ele.id === this.chooseId)[0].name
+      let ids = []
+      this.route.devs.forEach(item => {
+        ids.push(item.agentid)
+      })
+      this.$emit('chooseRoute', this.chooseId, this.route, ids)
+      this.$emit('resetContentComponent')
+    },
+    onAdd () {
+      this.isEdit = false
+      this.$refs.addOptimizeDialog.show()
+      this.$emit('editStart')
+    },
+    onEdit () {
+      if (!this.chooseId) {
+        this.$message({
+          message: this.$t('openatccomponents.greenwaveoptimize.nochooseplan'),
+          type: 'warning'
+        })
+        return
+      }
+      this.isEdit = true
+      this.$refs.addOptimizeDialog.show(this.route)
+      this.$emit('editStart')
+    },
+    onDelete () {
+      if (!this.chooseId) {
+        this.$message({
+          message: this.$t('openatccomponents.greenwaveoptimize.nochooseplan'),
+          type: 'warning'
+        })
+        return
+      }
+      this.deleteDiologVisible = true
+    },
+    handleDelete () {
+      DeleteRoute(this.chooseId).then(res => {
+        if (!res.data.success) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.deleteDiologVisible = false
+        this.resetChooseId()
+        this.$message({
+          message: this.$t('openatc.common.deletesuccess'),
+          type: 'success',
+          duration: 1 * 1000,
+          onClose: () => {
+            this.$emit('refresh')
+          }
+        })
+      })
+    },
+    resetChooseId () {
+      // 重置为未选择状态
+      this.chooseId = 0
+      this.$emit('chooseRoute', this.chooseId)
+    },
+    closeDeleteDialog () {
+      this.deleteDiologVisible = false
+    },
+    updateRouteName (data) {
+      UpdateRoute(data).then(res => {
+        if (!res.data.success) {
+          if (res.data.code === '5001') {
+            this.$message.error(this.$t('openatccomponents.greenwaveoptimize.namerepeat'))
+          } else {
+            this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          }
+          return
+        }
+        this.closeAddDialog()
+        this.$message({
+          message: this.$t('openatc.common.updatesuccess'),
+          type: 'success',
+          duration: 1 * 1000,
+          onClose: () => {
+            this.$emit('refresh')
+          }
+        })
+      })
+    },
+    addRoute (data) {
+      AddRoute(data).then(res => {
+        if (!res.data.success) {
+          if (res.data.code === '5001') {
+            this.$message.error(this.$t('openatccomponents.greenwaveoptimize.addfail'))
+          } else {
+            this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          }
+          return
+        }
+        this.closeAddDialog()
+        this.$message({
+          message: this.$t('openatc.common.addsuccess'),
+          type: 'success',
+          duration: 1 * 1000,
+          onClose: () => {
+            this.$emit('refresh')
+          }
+        })
+      })
+    },
+    updateRoute (data) {
+      if (this.isEdit) {
+        const obj = {
+          ...data,
+          id: this.chooseId
+        }
+        this.updateRouteName(obj)
+      } else {
+        this.addRoute(data)
+      }
+    },
+    closeAddDialog () {
+      this.isEdit = false
+      this.$refs.addOptimizeDialog.close()
+    },
+    clickMask () {
+      // 点击其他地方关闭蒙层
+      this.maskVisible = false
+    },
+    switchOperate (command) {
+      switch (command) {
+        case 'Edit':
+          this.onEdit()
+          break
+        case 'Delete':
+          this.onDelete()
+          break
+        default:
+          console.log(command)
+          break
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+//  @import "../../styles/theme/element-variables.scss";
+// .btnGroup .operate .el-dropdown-link {
+//   color: $--color-primary;
+//   cursor: pointer;
+// }
+</style>
+
+<style lang="scss" scoped>
+//  @import "../../styles/theme/element-variables.scss";
+.el-menu {
+  height: calc(100vh - 120px);
+  max-height: calc(100vh - 120px);
+  overflow-y: auto;
+  border-right: none;
+}
+// .el-menu-item.is-active {
+//   background: #eaeaea;
+// }
+/* 蒙层样式 */
+// .mask {
+//   position: fixed;
+//   left: 0;
+//   top: 0;
+//   width: 100%;
+//   height: 100%;
+//   background: #000;
+//   opacity: 0.5;
+//   z-index: 97;
+// }
+// /* 原生按钮样式修改 */
+// .btnGroup button {
+//     width: 70px;
+//     height: 40px;
+//     padding: 0;
+//     line-height: 40px;
+//     border: 1px solid #dcdfe6;
+//     white-space: nowrap;
+//     outline: 0;
+//     transition: .1s;
+//     font-size: 14px;
+//     border-radius: 4px;
+//     color: $--button-primary-font-color;
+//     background-color: $--color-primary;
+//     border-color: $--color-primary;
+//     cursor: pointer;
+// }
+// .btnGroup button:hover {
+//     color: $--button-primary-font-color;
+//     background-color: $--color-primary;
+//     border-color: $--color-primary;
+//     opacity: 0.8;
+// }
+// .deletebtn {
+//     position: fixed;
+//     bottom: 30px;
+//     left: 93px;
+// }
+// .btnGroup .addbtn {
+//     position: fixed;
+//     bottom: 30px;
+//     left: 17px;
+//     z-index: 98;
+// }
+// .btnGroup .addbtn button {
+//   font-weight: 500;
+// }
+// .btnGroup .operate{
+//   position: fixed;
+//   bottom: 30px;
+//   left: 108px;
+//   height: 40px;
+//   line-height: 40px;
+// }
+// /* 提示框相关 */
+// .tipContent > div{
+//     float: left;
+// }
+// .tipContent div i {
+//   color: $--color-primary;
+//   font-size: 30px;
+// }
+// .tipContent .text {
+//     font-size: 14px;
+//     font-weight: normal;
+//     font-stretch: normal;
+//     line-height: 14px;
+//     letter-spacing: 1px;
+//     color: $--color-primary;
+//     margin-left: 7px;
+//     line-height: 42px;
+// }
+</style>

package/src/kisscomps/components/patternConfig/utils.js

@@ -0,0 +1,152 @@
+/**
+ * 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.
+ **/
+const monthsModel = [{
+  value: 0,
+  label: '全选'
+}, {
+  value: 1,
+  label: '1'
+}, {
+  value: 2,
+  label: '2'
+}, {
+  value: 3,
+  label: '3'
+}, {
+  value: 4,
+  label: '4'
+}, {
+  value: 5,
+  label: '5'
+}, {
+  value: 6,
+  label: '6'
+}, {
+  value: 7,
+  label: '7'
+}, {
+  value: 8,
+  label: '8'
+}, {
+  value: 9,
+  label: '9'
+}, {
+  value: 10,
+  label: '10'
+}, {
+  value: 11,
+  label: '11'
+}, {
+  value: 12,
+  label: '12'
+}]
+const monthsModelEn = [{
+  value: 0,
+  label: 'All'
+}, {
+  value: 1,
+  label: '1'
+}, {
+  value: 2,
+  label: '2'
+}, {
+  value: 3,
+  label: '3'
+}, {
+  value: 4,
+  label: '4'
+}, {
+  value: 5,
+  label: '5'
+}, {
+  value: 6,
+  label: '6'
+}, {
+  value: 7,
+  label: '7'
+}, {
+  value: 8,
+  label: '8'
+}, {
+  value: 9,
+  label: '9'
+}, {
+  value: 10,
+  label: '10'
+}, {
+  value: 11,
+  label: '11'
+}, {
+  value: 12,
+  label: '12'
+}]
+const daysModelCh = [{
+  value: 8,
+  label: '全选'
+}, {
+  value: 0,
+  label: '星期日'
+}, {
+  value: 1,
+  label: '星期一'
+}, {
+  value: 2,
+  label: '星期二'
+}, {
+  value: 3,
+  label: '星期三'
+}, {
+  value: 4,
+  label: '星期四'
+}, {
+  value: 5,
+  label: '星期五'
+}, {
+  value: 6,
+  label: '星期六'
+}]
+const daysModelEn = [{
+  value: 8,
+  label: 'All'
+}, {
+  value: 0,
+  label: 'Sun.'
+}, {
+  value: 1,
+  label: 'Mon.'
+}, {
+  value: 2,
+  label: 'Tues.'
+}, {
+  value: 3,
+  label: 'Wed.'
+}, {
+  value: 4,
+  label: 'Thur.'
+}, {
+  value: 5,
+  label: 'Fir.'
+}, {
+  value: 6,
+  label: 'Sat.'
+}]
+const datesModel = ['全选', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
+const datesModelEn = ['All', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
+const dateObj = {
+  monthsModel,
+  monthsModelEn,
+  daysModelCh,
+  daysModelEn,
+  datesModel,
+  datesModelEn
+}
+export default dateObj

package/src/kisscomps/index.js

@@ -26,6 +26,8 @@ import tentativeplancontrolmodal from './components/SchemeConfig/tentativeplanco
 import priorityControl from './components/SchemeConfig/priorityControl/index'
 import PhaseDirectionText from './components/PhaseDirectionText/index'
 import PhaseDirectionSelect from './components/PhaseDirectionSelect/index'
+import patternConfig from './components/patternConfig/index.vue'
+import XiaoKanBan from './components/XiaoKanBan/index.vue'
 import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
@@ -61,6 +63,8 @@ const components = {
   priorityControl,
   tentativeplancontrolmodal,
   PhaseDirectionText,
+  patternConfig,
+  XiaoKanBan,
   PhaseDirectionSelect
 }
 

package/src/lib/publicjs/KissApi.js

@@ -14,7 +14,7 @@ import {
 } from './HttpurlMgr'
 import axios from 'axios'
 import * as localStorge from './localStorage'
-import { removeToken } from '../../utils/auth'
+import { removeToken, getToken } from '../../utils/auth'
 
 axios.defaults.withCredentials = true
 export const getAxios = () => {
@@ -39,7 +39,7 @@ export class KissApi {
   获取token 需要在storage中设置  key=token的value
   */
   GetToken () {
-    return localStorge.getStorage('token')
+    return getToken()
   }
 
   /*

package/src/router/index.js

@@ -17,6 +17,13 @@ export default new Router({
         require(['@/views/intersection'], resolve)
       }
     },
+    {
+      path: '/pattern',
+      name: 'pattern',
+      component: (resolve) => {
+        require(['@/views/patternConfig'], resolve)
+      }
+    },
     {
       path: '/config',
       name: 'config',

package/src/utils/auth.js

@@ -13,6 +13,8 @@ var localStorage = require('../lib/publicjs/localStorage')
 
 const nameSpace = 'openatc_conponents_'
 const LoginKey = 'token'
+// eslint-disable-next-line camelcase
+let Prefix = 'Prefix'
 const LoginHost = nameSpace + 'kisshost'
 const typeKey = 'type'
 const type = 'edge'
@@ -25,11 +27,30 @@ const userRoles = 'kiss_userRoles'
 const isCheckPermission = 'kiss_isCheckPermission'
 
 export function getToken () {
-  return localStorage.getStorage(LoginKey)
+  let key = LoginKey
+  if (getPrefix()) {
+    key = getPrefix() + LoginKey
+    console.log('get tkey:', key)
+  }
+  return localStorage.getStorage(key)
+}
+
+export function setToken (token, prefix) {
+  let key = LoginKey
+  if (prefix) {
+    setPrefix(prefix)
+    key = getPrefix() + LoginKey
+    console.log('set tkey:', key)
+  }
+  return localStorage.setStorage(key, token)
+}
+
+export function getPrefix () {
+  return localStorage.getStorage(Prefix)
 }
 
-export function setToken (token) {
-  return localStorage.setStorage(LoginKey, token)
+export function setPrefix (prifix) {
+  return localStorage.setStorage(Prefix, prifix)
 }
 
 export function SetSimuUserKey (key) {

package/src/views/intersection.vue

@@ -94,7 +94,7 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12007_390',
+      agentId: '12006_423',
       // agentId: '0351-01',
       reqUrl: 'http://192.168.13.103:10003/openatc',
       Token: 'eyJraWQiOiIxNjcwNTUzNTE1MDc3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njk1MzUxNSwiaWF0IjoxNjcwNTUzNTE1fQ.oR9e2Fn5mVmJ4CjZV6zUOdq_23Y84RkuyhK_WppsD_o',