openatc-components 0.5.15 → 0.5.17

package/package/kisscomps/components/XiaoKanban/index.vue

@@ -1,122 +1,122 @@
-/**
- * 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="xiaokanban">
-    <div class="board-column-header">
-      {{headerText}}
-    </div>
-    <div class="board-table-header" v-if="isSingleCrossMode">
-      <el-row :gutter="13">
-        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
-        </el-col>
-      </el-row>
-    </div>
-    <draggable
-      class="board-column-content"
-      :list="list"
-      :options="options">
-      <div class="board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="25">
-          <el-col :span="4">
-            <el-tooltip class="item" effect="dark" placement="left">
-              <div slot="content">{{$t('openatccomponents.pattern.phase') + ' ' + element.id}}</div>
-              <div class="phase-description">
-                <DirSelector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></DirSelector>
-              </div>
-            </el-tooltip>
-          </el-col>
-        <el-col :span="19" v-show="!isSingleCrossMode">
-          <el-input-number controls-position="right" :min="0" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
-        </el-col>
-        <el-col :span="10" v-if="isSingleCrossMode">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        <el-col :span="10" v-if="isSingleCrossMode">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        </el-row>
-      </div>
-    </draggable>
-  </div>
-</template>
-<script>
-import draggable from 'vuedraggable'
-import DirSelector from './DirSelector'
-
-export default {
-  name: 'xiao-kan-ban',
-  components: {
-    draggable,
-    DirSelector
-  },
-  props: {
-    isSingleCrossMode: {
-      type: Boolean,
-      default: false
-    },
-    headerText: {
-      type: String,
-      default: 'Header'
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    list: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    index: {
-      type: Number
-    },
-    ISActiveMask: {
-      type: Boolean,
-      default: true
-    },
-    // 当phase的描述为空时，显示的图形颜色。
-    MaskColor: {
-      type: String,
-      default: '#000000'
-    }
-  },
-  watch: {
-    list: {
-      handler: function (val) {
-        let list = val
-        let cycle = 0
-        let n = this.index
-        for (let i = 0; i < list.length; i++) {
-          cycle = cycle + Number(list[i].value)
-        }
-        let obj = {}
-        obj.index = n
-        obj.cycle = cycle
-        this.$emit('fatherMethod', obj)
-      },
-      deep: true
-    }
-  },
-  created () {
-    console.log('list', this.list)
-  }
-}
-</script>
-<style lang="scss">
-</style>
+/**
+ * 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="xiaokanban">
+    <div class="board-column-header">
+      {{headerText}}
+    </div>
+    <div class="board-table-header" v-if="isSingleCrossMode">
+      <el-row :gutter="13">
+        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
+        </el-col>
+        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
+        </el-col>
+        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
+        </el-col>
+      </el-row>
+    </div>
+    <draggable
+      class="board-column-content"
+      :list="list"
+      :options="options">
+      <div class="board-item" v-for="element in list" :key="element.id">
+        <el-row :gutter="25">
+          <el-col :span="4">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{$t('openatccomponents.pattern.phase') + ' ' + element.id}}</div>
+              <div class="phase-description">
+                <DirSelector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></DirSelector>
+              </div>
+            </el-tooltip>
+          </el-col>
+        <el-col :span="19" v-show="!isSingleCrossMode">
+          <el-input-number controls-position="right" :min="0" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
+        </el-col>
+        <el-col :span="10" v-if="isSingleCrossMode">
+            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
+        </el-col>
+        <el-col :span="10" v-if="isSingleCrossMode">
+            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
+        </el-col>
+        </el-row>
+      </div>
+    </draggable>
+  </div>
+</template>
+<script>
+import draggable from 'vuedraggable'
+import DirSelector from './DirSelector'
+
+export default {
+  name: 'xiao-kan-ban',
+  components: {
+    draggable,
+    DirSelector
+  },
+  props: {
+    isSingleCrossMode: {
+      type: Boolean,
+      default: false
+    },
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    options: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    index: {
+      type: Number
+    },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    }
+  },
+  watch: {
+    list: {
+      handler: function (val) {
+        let list = val
+        let cycle = 0
+        let n = this.index
+        for (let i = 0; i < list.length; i++) {
+          cycle = cycle + Number(list[i].value)
+        }
+        let obj = {}
+        obj.index = n
+        obj.cycle = cycle
+        this.$emit('fatherMethod', obj)
+      },
+      deep: true
+    }
+  },
+  created () {
+    console.log('list', this.list)
+  }
+}
+</script>
+<style lang="scss">
+</style>

package/package/kisscomps/components/overView/index.vue

@@ -89,7 +89,6 @@ import { setIframdevid, getStageTypes, setToken, setHost } from '../../../utils/
 // import BoardCard from '@/components/BoardCard'
 // import OverLap from '@/components/OverLap'
 import { getIntersectionInfo } from '../../../api/template'
-// import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import PhaseDataModel from '../IntersectionMap/crossDirection/utils.js'
 import CrossDiagramMgr from '../../../EdgeMgr/controller/crossDiagramMgr'
@@ -547,46 +546,24 @@ export default {
     handleGetData (data) {
       let that = this
       if (data.name === '') {
-        if (that.$i18n.locale === 'en') {
-          data.name = 'Pattern' + data.patternid
-        } else if (that.$i18n.locale === 'zh') {
-          data.name = '方案' + data.patternid
-        }
+        data.name = this.$t('openatccomponents.pattern.plan') + data.patternid
       }
       Object.keys(data).forEach(function (key) {
-        if (that.$i18n.locale === 'en') {
-          if (key === 'mode') {
-            if (that.ParamsModeEn.get(data[key]) !== undefined) {
-              data[key] = that.ParamsModeEn.get(data[key])
+        if (key === 'mode') {
+          if (data[key] > 0 && data[key] < 9) {
+              data[key] = that.$t('openatccomponents.overview.ParamsMode' + data[key])
             } else {
-              data[key] = that.ParamsModeEn.get(0)
+              data[key] = that.$t('openatccomponents.overview.ParamsMode0')
             }
           }
           if (key === 'control') {
-            data[key] = that.ParamsControlEn.get(data[key])
+            data[key] = that.$t('openatccomponents.overview.modelList' + data[key])
           }
           if (key === 'phase') {
             for (let val of data[key]) {
-              val.type = that.phaseTypeEn.get(val.type)
-            }
-          }
-        } else if (that.$i18n.locale === 'zh') {
-          if (key === 'mode') {
-            if (that.ParamsMode.get(data[key]) !== undefined) {
-              data[key] = that.ParamsMode.get(data[key])
-            } else {
-              data[key] = that.ParamsMode.get(0)
+              val.type = that.$t('openatccomponents.overview.phaseType' + val.type)
             }
           }
-          if (key === 'control') {
-            data[key] = that.ParamsControl.get(data[key])
-          }
-          if (key === 'phase') {
-            for (let val of data[key]) {
-              val.type = that.phaseType.get(val.type)
-            }
-          }
-        }
       })
       return data
     },

package/package/kisscomps/components/patternConfig/index.vue

@@ -87,7 +87,7 @@ import PatternTable from './pattern/patternTable'
 import dateObj from './utils.js'
 import { GetDeviceByIds } from '../../../api/device.js'
 import { getAllPatternOfDevs } from '../../../api/route'
-const { monthsModel, daysModelCh, daysModelEn, datesModel, monthsModelEn, datesModelEn } = dateObj
+const { monthsModel, daysModelCh, datesModel } = dateObj
 export default {
   name: 'PatternConfig',
   components: {
@@ -215,17 +215,9 @@ export default {
   },
   created () {
     this.resetTab()
-    let lan = this.$i18n.locale
-    if (lan === 'en') {
-      this.days = daysModelEn
-      this.dates = datesModelEn
-      this.months = monthsModelEn
-    }
-    if (lan === 'zh') {
-      this.days = daysModelCh
-      this.dates = datesModel
-      this.months = monthsModel
-    }
+    this.days = daysModelCh
+    this.dates = datesModel
+    this.months = monthsModel
   },
   mounted () {
     // let _this = this