openatc-components 0.4.87 → 0.4.89

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

@@ -1,118 +1,118 @@
-<template>
-<div>
-  <div class="common-board-column">
-    <div class="common-board-column-header">
-      {{headerText}}
-    </div>
-    <div class="common-board-table-header">
-      <el-row :gutter="10">
-        <el-col :span="4">{{this.$t('openatccomponents.pattern.phase')}}
-        </el-col>
-        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
-        </el-col>
-        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
-        </el-col>
-        <el-col :span="6">{{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="10" >
-          <el-col :span="4">
-            <el-tooltip class="item" effect="dark" placement="left">
-              <div slot="content">{{element.name}}</div>
-              <div class="common-phase-description">
-                <xdrdirselector  Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
-              </div>
-            </el-tooltip>
-        </el-col>
-          <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="6">
-            <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="6">
-            <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'
-import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
-export default {
-  name: 'expend-config',
-  components: {
-    draggable,
-    xdrdirselector
-  },
-  data () {
-    return {
-      styles: {
-        left: '1px',
-        top: '0'
-      },
-      coordphaseOption: [{
-        value: 1
-      }, {
-        value: 2
-      }, {
-        value: 4
-      }]
-    }
-  },
-  props: {
-    headerText: {
-      type: String,
-      default: 'Header'
-    },
-    list: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    ISActiveMask: {
-      type: Boolean,
-      default: true
-    },
-    // 当phase的描述为空时，显示的图形颜色。
-    MaskColor: {
-      type: String,
-      default: '#000000'
-    },
-    index: {
-      type: Number
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    }
-  }
-
-}
-</script>
-
-<style lang="scss" scoped>
-.el-input-number--small {
-  width: unset !important;
-}
-</style>
+<template>
+<div>
+  <div class="common-board-column">
+    <div class="common-board-column-header">
+      {{headerText}}
+    </div>
+    <div class="common-board-table-header">
+      <el-row :gutter="10">
+        <el-col :span="4">{{this.$t('openatccomponents.pattern.phase')}}
+        </el-col>
+        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
+        </el-col>
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
+        </el-col>
+        <el-col :span="6">{{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="10" >
+          <el-col :span="4">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{element.name}}</div>
+              <div class="common-phase-description">
+                <xdrdirselector  Width="70px" Height="70px" Widths="50px" Heights="50px" :Data="styles" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+              </div>
+            </el-tooltip>
+        </el-col>
+          <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="6">
+            <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="6">
+            <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'
+import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+export default {
+  name: 'expend-config',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  data () {
+    return {
+      styles: {
+        left: '1px',
+        top: '0'
+      },
+      coordphaseOption: [{
+        value: 1
+      }, {
+        value: 2
+      }, {
+        value: 4
+      }]
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    },
+    index: {
+      type: Number
+    },
+    options: {
+      type: Object,
+      default () {
+        return {}
+      }
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.el-input-number--small {
+  width: unset !important;
+}
+</style>

package/src/kisscomps/components/FaultDetailModal/FaultDetailModal.vue

@@ -1,178 +1,178 @@
-/**
- * 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="dev-fault-detail">
-    <el-dialog
-      :title="$t(`openatccomponents.faultrecord.faultDetail`)"
-      :visible.sync="dialogFormVisible"
-      :width="isFromAtc ? '45%' : '30%'"
-      :append-to-body="true"
-      :close-on-click-modal="false">
-    <div class="content">
-      <el-table
-        :data="faultList"
-        style="width: 100%"
-        :height="600"
-        :default-sort = "{prop: 'm_unFaultOccurTime', order: 'descending'}"
-       >
-        <el-table-column
-          v-if="isFromAtc"
-          prop="m_unFaultOccurTime"
-          :label="$t('openatccomponents.faultrecord.faultOccurtime')"
-          sortable
-          width="200">
-        </el-table-column>
-        <el-table-column
-          v-if="isFromAtc"
-          prop="m_byFaultBoardType"
-          :formatter="formatterBoardType"
-          :label="$t('openatccomponents.faultrecord.boardCardType')"
-          sortable>
-        </el-table-column>
-        <el-table-column
-          prop="m_wFaultType"
-          :formatter="m_wFaultTypes"
-          :label="$t('openatccomponents.faultrecord.faultMaintype')"
-          sortable>
-        </el-table-column>
-        <el-table-column
-          prop="m_wSubFaultType"
-          :formatter="m_wSubFaultType"
-          :label="$t('openatccomponents.faultrecord.faultSubtype')"
-          sortable>
-        </el-table-column>
-        <el-table-column
-          prop="m_byFaultDescValue"
-          :formatter="m_byFaultDescValue"
-          :label="$t('openatccomponents.faultrecord.faultValue')"
-          sortable>
-        </el-table-column>
-        <el-table-column
-          v-if="isFromAtc"
-          prop="m_byFaultLevel"
-          :formatter="m_byFaultLevel"
-          :label="$t('openatccomponents.faultrecord.faultGrade')"
-          sortable
-          width="120">
-        </el-table-column>
-        <el-table-column
-          v-if="isFromAtc"
-          prop="enumerate"
-          :label="$t('openatccomponents.faultrecord.enumerate')"
-          align="center">
-          <template slot-scope="scope">
-            <el-tag v-show="scope.row.enumerate" :type="scope.row.enumerate === '1'?'info':scope.row.enumerate === '2'?'success':scope.row.enumerate === '0'?'':''">{{formatterEnumerate(scope.row)}}</el-tag>
-          </template>
-          </el-table-column>
-        <el-table-column v-if="isFromAtc" :label="$t('openatccomponents.faultrecord.operation')" align="center">
-        <template slot-scope="scope">
-          <el-button type="text" @click="handleEnumerateCheck(scope.row, '2')">{{$t('openatccomponents.button.confirm')}}</el-button>
-          <el-button type="text" @click="handleEnumerateCheck(scope.row, '1')">{{$t('openatccomponents.button.ignore')}}</el-button>
-        </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {enumerateCheck, GetAllFaultRange} from '../../../api/fault.js'
-import { getMessageByCode } from '../../../utils/responseMessage.js'
-import { formatFaultDescValue, formatBoardType, formatEnumerate, formatSubFaultType, formatFaultLevel, formatFaultTypes } from '../../../utils/fault.js'
-export default {
-  name: 'fault-detail-modal',
-  props: {
-    childTitle: {
-      type: String
-    },
-    agentId: {
-      type: String
-    },
-    isFromAtc: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data () {
-    return {
-      dialogFormVisible: false,
-      deviceInfo: {},
-      faultList: []
-    }
-  },
-  methods: {
-    getFaultById () {
-      let param = {
-        agentId: this.agentId,
-        isCurrentFault: true
-      }
-      GetAllFaultRange(param).then(res => {
-        if (res.data.success !== true) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
-          return
-        }
-        this.faultList = res.data.data.content
-      })
-    },
-    onViewFaultClick () {
-      this.dialogFormVisible = !this.dialogFormVisible
-      this.getFaultById()
-    },
-    formatterBoardType (row) {
-      return formatBoardType(row, this.$i18n)
-    },
-    m_byFaultDescValue (row) {
-      return formatFaultDescValue(row, this.$i18n)
-    },
-    m_wSubFaultType (row) {
-      return formatSubFaultType(row, this.$i18n)
-    },
-    m_byFaultLevel (row) {
-      return formatFaultLevel(row, this.$i18n)
-    },
-    m_wFaultTypes (row) {
-      return formatFaultTypes(row, this.$i18n)
-    },
-    handleEnumerateCheck (row, enumerate) {
-      enumerateCheck(row.agentid, row.m_wFaultID, enumerate).then(res => {
-        if (!res.data.success) {
-          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
-          return
-        }
-        this.dialogFormVisible = false
-        this.$message({
-          message: this.$t('openatccomponents.common.operationsuccess'),
-          type: 'success',
-          duration: 1 * 1000,
-          onClose: () => {
-            this.getFaultById()
-            this.$emit('refreshFault')
-          }
-        })
-      })
-    },
-    formatterEnumerate (row) {
-      return formatEnumerate(row, this.$i18n)
-    }
-  }
-}
-</script>
-
-<style lang="scss" rel="stylesheet/scss">
-.dev-update .el-dialog__body {
-  padding: 30px 72px 30px 0;
-}
-.el-dialog__footer {
-  padding: 10px 72px 38px 0;
-}
-</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="dev-fault-detail">
+    <el-dialog
+      :title="$t(`openatccomponents.faultrecord.faultDetail`)"
+      :visible.sync="dialogFormVisible"
+      :width="isFromAtc ? '45%' : '30%'"
+      :append-to-body="true"
+      :close-on-click-modal="false">
+    <div class="content">
+      <el-table
+        :data="faultList"
+        style="width: 100%"
+        :height="600"
+        :default-sort = "{prop: 'm_unFaultOccurTime', order: 'descending'}"
+       >
+        <el-table-column
+          v-if="isFromAtc"
+          prop="m_unFaultOccurTime"
+          :label="$t('openatccomponents.faultrecord.faultOccurtime')"
+          sortable
+          width="200">
+        </el-table-column>
+        <el-table-column
+          v-if="isFromAtc"
+          prop="m_byFaultBoardType"
+          :formatter="formatterBoardType"
+          :label="$t('openatccomponents.faultrecord.boardCardType')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_wFaultType"
+          :formatter="m_wFaultTypes"
+          :label="$t('openatccomponents.faultrecord.faultMaintype')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_wSubFaultType"
+          :formatter="m_wSubFaultType"
+          :label="$t('openatccomponents.faultrecord.faultSubtype')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_byFaultDescValue"
+          :formatter="m_byFaultDescValue"
+          :label="$t('openatccomponents.faultrecord.faultValue')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          v-if="isFromAtc"
+          prop="m_byFaultLevel"
+          :formatter="m_byFaultLevel"
+          :label="$t('openatccomponents.faultrecord.faultGrade')"
+          sortable
+          width="120">
+        </el-table-column>
+        <el-table-column
+          v-if="isFromAtc"
+          prop="enumerate"
+          :label="$t('openatccomponents.faultrecord.enumerate')"
+          align="center">
+          <template slot-scope="scope">
+            <el-tag v-show="scope.row.enumerate" :type="scope.row.enumerate === '1'?'info':scope.row.enumerate === '2'?'success':scope.row.enumerate === '0'?'':''">{{formatterEnumerate(scope.row)}}</el-tag>
+          </template>
+          </el-table-column>
+        <el-table-column v-if="isFromAtc" :label="$t('openatccomponents.faultrecord.operation')" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEnumerateCheck(scope.row, '2')">{{$t('openatccomponents.button.confirm')}}</el-button>
+          <el-button type="text" @click="handleEnumerateCheck(scope.row, '1')">{{$t('openatccomponents.button.ignore')}}</el-button>
+        </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {enumerateCheck, GetAllFaultRange} from '../../../api/fault.js'
+import { getMessageByCode } from '../../../utils/responseMessage.js'
+import { formatFaultDescValue, formatBoardType, formatEnumerate, formatSubFaultType, formatFaultLevel, formatFaultTypes } from '../../../utils/fault.js'
+export default {
+  name: 'fault-detail-modal',
+  props: {
+    childTitle: {
+      type: String
+    },
+    agentId: {
+      type: String
+    },
+    isFromAtc: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      dialogFormVisible: false,
+      deviceInfo: {},
+      faultList: []
+    }
+  },
+  methods: {
+    getFaultById () {
+      let param = {
+        agentId: this.agentId,
+        isCurrentFault: true
+      }
+      GetAllFaultRange(param).then(res => {
+        if (res.data.success !== true) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.faultList = res.data.data.content
+      })
+    },
+    onViewFaultClick () {
+      this.dialogFormVisible = !this.dialogFormVisible
+      this.getFaultById()
+    },
+    formatterBoardType (row) {
+      return formatBoardType(row, this.$i18n)
+    },
+    m_byFaultDescValue (row) {
+      return formatFaultDescValue(row, this.$i18n)
+    },
+    m_wSubFaultType (row) {
+      return formatSubFaultType(row, this.$i18n)
+    },
+    m_byFaultLevel (row) {
+      return formatFaultLevel(row, this.$i18n)
+    },
+    m_wFaultTypes (row) {
+      return formatFaultTypes(row, this.$i18n)
+    },
+    handleEnumerateCheck (row, enumerate) {
+      enumerateCheck(row.agentid, row.m_wFaultID, enumerate).then(res => {
+        if (!res.data.success) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.dialogFormVisible = false
+        this.$message({
+          message: this.$t('openatccomponents.common.operationsuccess'),
+          type: 'success',
+          duration: 1 * 1000,
+          onClose: () => {
+            this.getFaultById()
+            this.$emit('refreshFault')
+          }
+        })
+      })
+    },
+    formatterEnumerate (row) {
+      return formatEnumerate(row, this.$i18n)
+    }
+  }
+}
+</script>
+
+<style lang="scss" rel="stylesheet/scss">
+.dev-update .el-dialog__body {
+  padding: 30px 72px 30px 0;
+}
+.el-dialog__footer {
+  padding: 10px 72px 38px 0;
+}
+</style>

package/src/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -8,6 +8,7 @@
             isVipRoute
             :clickMode="clickMode"
             :isThirdSignal="isThirdSignal"
+            :isRcp="isRcp"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
@@ -36,7 +37,8 @@ export default {
     return {
       crossStatusData: {},
       isSpecialIntersection: undefined,
-      isThirdSignal: false,
+      isThirdSignal: false, // 是否是第三方平台（可以直接传，也可以内部接口判断）,特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
+      isRcp: false, // 特勤模式下兼容20999 rcp协议，能显示路口图及相位
       reset: true
     }
   },
@@ -104,6 +106,7 @@ export default {
         }
         this.tempType = res.data.data.type
         this.mainType = this.tempType.split('-')[0]
+        this.isSpecialIntersection = false
         if (this.mainType === '999') {
           this.isSpecialIntersection = true
           if (this.clickMode) {
@@ -111,8 +114,6 @@ export default {
               this.$refs.listConfiguration.init(res)
             })
           }
-        } else {
-          this.isSpecialIntersection = false
         }
       })
     },
@@ -124,15 +125,17 @@ export default {
           return
         }
         this.platform = res.data.data.platform
-        console.log(this.platform)
+        this.isThirdSignal = false
+        this.isRcp = false
         if (this.platform !== '' && this.platform !== 'OpenATC') {
           this.isThirdSignal = true
-        } else {
-          this.isThirdSignal = false
         }
         if (this.thirdSignal) {
           this.isThirdSignal = this.thirdSignal
         }
+        if (res.data.data.protocol === 'rcp') {
+          this.isRcp = true
+        }
       })
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {