openatc-components 0.5.6 → 0.5.8

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

@@ -1,84 +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.
- **/
-import i18n from '../../../i18n/index.js'
-const monthsModel = [{
-  value: 0,
-  label: i18n.t('openatccomponents.common.allSelected')
-}, {
-  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: i18n.t('openatccomponents.common.allSelected')
-}, {
-  value: 1,
-  label: i18n.t('openatccomponents.common.week1')
-}, {
-  value: 2,
-  label: i18n.t('openatccomponents.common.week2')
-}, {
-  value: 3,
-  label: i18n.t('openatccomponents.common.week3')
-}, {
-  value: 4,
-  label: i18n.t('openatccomponents.common.week4')
-}, {
-  value: 5,
-  label: i18n.t('openatccomponents.common.week5')
-}, {
-  value: 6,
-  label: i18n.t('openatccomponents.common.week6')
-}, {
-  value: 0,
-  label: i18n.t('openatccomponents.common.week0')
-}]
-const datesModel = [i18n.t('openatccomponents.common.allSelected'), 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,
-  daysModelCh,
-  datesModel
-}
-export default dateObj
+/**
+ * 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/components/patternList/patternList.vue

@@ -2,7 +2,9 @@
   <div>
     <BoardCard
     :patternId="patternId"
+    :stage="stage"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :isBorder="isBorder"
@@ -505,6 +507,9 @@ export default {
       type: Boolean,
       default: true
     },
+    stage: {
+      type: Array
+    },
     isBorder: {
       type: Boolean,
       default: false
@@ -552,6 +557,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },

package/src/kisscomps/index.js

@@ -35,12 +35,11 @@ import IntersectionDirectionSelection from './components/IntersectionDirectionSe
 import PhaseLegend from './components/PhaseLegend/index.js'
 import OverviewComponent from './components/OverviewComponent/index.js'
 import IntersectionMapDirSelect from './components/IntersectionMapDirSelect/index.js'
-import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions, setLanguage, getLanguage } from '../utils/auth.js'
+import { setToken, setHost, setIsCheckPermission, setUserRoles, setPermissions } from '../utils/auth.js'
 import componentsGlobalParam from '../store/modules/globalParam'
 
 import en from '../i18n/language/en'
 import zh from '../i18n/language/zh'
-import ru from '../i18n/language/ru'
 // 第三方插件
 import VTooltip from 'v-tooltip'
 
@@ -85,13 +84,10 @@ const components = {
 
 const language = {
   en,
-  zh,
-  ru
+  zh
 }
 
 const func = {
-  getLanguage,
-  setLanguage,
   setHost,
   setToken,
   setUserRoles,

package/src/lib/publicjs/ArryListUtil.js

@@ -1,38 +1,38 @@
-/**
- * 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.
- **/
-/**
- * 数组去重
- * @param {*} array
- */
-export function kdistinct (array) {
-  return Array.from(new Set(array))
-}
-/**
- * 求数组并集
- * @param {*} array1
- * @param {*} array2
- */
-export function kconcat (array1, array2) {
-  return array1.concat(array2.filter(v => !array1.includes(v)))
-}
-
-/**
- * 求交集
- */
-export function kintersection (array1, array2) {
-  return array1.filter(v => array2.includes(v))
-}
-
-// 差集
-export function kdiff (array1, array2) {
-  return array1.concat(array2).filter(v => array1.includes(v) && !array2.includes(v))
-}
+/**
+ * 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.
+ **/
+/**
+ * 数组去重
+ * @param {*} array
+ */
+export function kdistinct (array) {
+  return Array.from(new Set(array))
+}
+/**
+ * 求数组并集
+ * @param {*} array1
+ * @param {*} array2
+ */
+export function kconcat (array1, array2) {
+  return array1.concat(array2.filter(v => !array1.includes(v)))
+}
+
+/**
+ * 求交集
+ */
+export function kintersection (array1, array2) {
+  return array1.filter(v => array2.includes(v))
+}
+
+// 差集
+export function kdiff (array1, array2) {
+  return array1.concat(array2).filter(v => array1.includes(v) && !array2.includes(v))
+}

package/src/lib/publicjs/HttpurlMgr.js

@@ -1,45 +1,45 @@
-/**
- * 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.
- **/
-export class UrlMgr {
-  init (data) {
-    if (data === undefined) {
-      return
-    }
-
-    if (this.urlMap === undefined) {
-      this.urlMap = new Map()
-    }
-
-    for (let sJson in data) {
-      let sObj = data[sJson]
-      this.urlMap.set(sObj.key, sObj)
-    }
-  }
-
-  /*
-  @brief 获取路径信息,key不存在返回undefine
-  @return {
-    key    ///<对应key
-    url    ///<接口地址
-    method ///<接口方法
-  }
-  */
-  GetUrlInfo (key) {
-    if (this.urlMap.has(key)) {
-      return this.urlMap.get(key)
-    }
-    console.log(`can not find key:${key}`)
-    return undefined
-  }
-}
-
-export const HttpUrlMgr = new UrlMgr()
+/**
+ * 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.
+ **/
+export class UrlMgr {
+  init (data) {
+    if (data === undefined) {
+      return
+    }
+
+    if (this.urlMap === undefined) {
+      this.urlMap = new Map()
+    }
+
+    for (let sJson in data) {
+      let sObj = data[sJson]
+      this.urlMap.set(sObj.key, sObj)
+    }
+  }
+
+  /*
+  @brief 获取路径信息,key不存在返回undefine
+  @return {
+    key    ///<对应key
+    url    ///<接口地址
+    method ///<接口方法
+  }
+  */
+  GetUrlInfo (key) {
+    if (this.urlMap.has(key)) {
+      return this.urlMap.get(key)
+    }
+    console.log(`can not find key:${key}`)
+    return undefined
+  }
+}
+
+export const HttpUrlMgr = new UrlMgr()