openatc-components 0.0.6 → 0.0.13

package/config/index.js

@@ -15,8 +15,8 @@ module.exports = {
         // target:  'http://192.168.13.103:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'http://192.168.14.2:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'https://dolphin-test.kedacom.com/openatc',
-        target:  'http://192.168.13.105:11003',
-        // target:  'http://192.168.13.103:10003',
+        target:  'http://192.168.13.105:11003/openatc',
+        // target:  'http://192.168.13.103:10003/openatc',
         // target:  'http://192.168.13.103:9999',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         // target:  'http://192.168.13.103:9999/kissapi',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
         changeOrigin: true,     //跨域

package/package/kisscomps/components/CommonKanban/CommonKanban.vue

@@ -27,7 +27,12 @@
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor" :roadDirection="roadDirection"></xdrdirselector>
+                <xdrdirselector Width="40px"
+                  Height="40px"
+                  :showlist="element.desc"
+                  :ISActiveMask="ISActiveMask"
+                  :MaskColor="MaskColor"
+                  :roadDirection="roadDirection"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>
@@ -46,7 +51,12 @@
                 <div v-for="(side, index) in sidewalkPhaseData" :key="side.key + '-' + index">
                   <PatternWalkSvg v-if="element.peddirection.includes(side.id)" :Data="side" Width="38" Height="40" />
                 </div>
-                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor" :roadDirection="roadDirection"></xdrdirselector>
+                <xdrdirselector Width="40px"
+                  Height="40px"
+                  :showlist="element.desc"
+                  :ISActiveMask="ISActiveMask"
+                  :MaskColor="MaskColor"
+                  :roadDirection="roadDirection"></xdrdirselector>
               </div>
             </el-tooltip>
         </div>

package/package/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -188,8 +188,7 @@ export default {
       devault: true
     },
     roadDirection: {
-      type: String,
-      default: 'right'
+      type: String
     }
   },
   // computed: {

package/package/kisscomps/components/IntersectionMap/crossDirection/utils.js

@@ -10,15 +10,16 @@
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
  * See the Mulan PSL v2 for more details.
  **/
+// import store from '../../../../store'
 export default class PhaseDataModel {
   constructor (roadDirection = 'right') {
-    this.roadDirection = roadDirection
     this.PhasePosMap = new Map()
     this.SidePosMap = new Map()
     this.RampMainPosMap = new Map() // 匝道主路坐标
     this.RampSidePosMap = new Map() // 匝道支路坐标
     this.BusMapMap = new Map() // 公交相位底图坐标
     this.BusPhaseMap = new Map() // 公交相位坐标
+    this.roadDirection = roadDirection
     this.Init()
   }
   Init () {

package/package/kisscomps/components/IntersectionMap/intersectionmap.vue

@@ -11,7 +11,7 @@
  **/
 <template>
 <div class="intersection-map">
-  <div class="crossDirection-display" :class="{
+  <div class="crossDirection-display openatc-intersection-base-map" :class="{
     'superlargeCrossImg': bodyDomWidth <= 1680 && bodyDomWidth > 1440,
     'largeCrossImg': bodyDomWidth <= 1440 && bodyDomWidth > 1280,
     'middleCrossImg': bodyDomWidth <= 1280 && bodyDomWidth > 960,
@@ -37,7 +37,7 @@
 import CrossDiagram from './crossDirection/crossDiagram'
 import { setToken } from '../../../utils/auth.js'
 export default {
-  name: 'intersection-map',
+  name: 'intersection-base-map',
   components: {
     CrossDiagram
   },

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-  <div class="scheme-config" style="height: 100%;">
+  <div class="scheme-config openatc-scheme-config" style="height: 100%;">
     <fault-detail-modal ref="faultDetail" :agentId="agentId" @refreshFault="getFaultById"></fault-detail-modal>
         <div style="height: 100%;">
           <transition name="fade-right" mode="out-in"
@@ -27,6 +27,7 @@
                :currentStage="currentStage"
                :preselectStages="preselectStages"
                :realtimeStatusModalvisible="realtimeStatusModalvisible"
+               :funcSort="funcSort"
                :roadDirection="roadDirection"
                @closeManualModal="closeManualModal"
                @selectModel="selectModel"
@@ -92,7 +93,7 @@
 
 <script>
 import { putTscControl } from '../../../api/control.js'
-import { uploadSingleTscParam } from '../../../api/param'
+import { uploadSingleTscParam } from '../../../api/param.js'
 import RealtimeStatusModal from './realtimeStatusModal'
 import ManualControlModal from './manualControlModal'
 import ClosePhaseControlModal from './closePhaselControlModal'
@@ -146,6 +147,10 @@ export default {
       type: String,
       default: ''
     },
+    funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
     roadDirection: {
       type: String,
       default: 'right'

package/package/kisscomps/components/SchemeConfig/closePhaselControlModal/index.vue

@@ -116,8 +116,6 @@ export default {
       type: String
     }
   },
-  computed: {
-  },
   data () {
     return {
       visible: this.Visible,

package/package/kisscomps/components/SchemeConfig/manualControlModal/index.vue

@@ -44,7 +44,7 @@
             <div class="single-model"
             @click="selectModel(item.id)"
             :class="(preselectModel == item.id && preselectStages == -1)? 'single-model-select' : ''"
-            v-if="FuncSort === 'allFunc' || (FuncSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1)">
+            v-if="funcSort === 'allFunc' || (funcSort === 'basicFunc'&& basicFuncControlId.indexOf(item.id) !== -1)">
               <svg-icon :icon-class="item.iconClass" className="model-icon"></svg-icon>
               <div class="single-model-name">{{$t('openatccomponents.overview.modelList' + item.id)}}</div>
             </div>
@@ -67,8 +67,8 @@
             </div>
           </div>
         </div>
-        <div class="stage-label" v-if="FuncSort === 'allFunc'">{{$t('openatccomponents.overview.specialcontrol')}}:</div>
-        <div style="width: 100%; height: auto;overflow: hidden;" v-if="FuncSort === 'allFunc'">
+        <div class="stage-label" v-if="funcSort === 'allFunc'">{{$t('openatccomponents.overview.specialcontrol')}}:</div>
+        <div style="width: 100%; height: auto;overflow: hidden;" v-if="funcSort === 'allFunc'">
           <div class="control-model" v-for="(item, index) in specialcontrolList" :key="index">
             <div class="single-model" @click="selectSpecialStages(item.id)">
               <svg-icon :icon-class="item.iconClass" className="closephase-icon"></svg-icon>
@@ -89,7 +89,6 @@
 
 <script>
 import xdrdirselector from '../../XRDDirSelector/XRDDirSelector'
-import { mapState } from 'vuex'
 export default {
   name: 'manualControl',
   components: {
@@ -127,15 +126,14 @@ export default {
       type: Boolean,
       default: true
     },
+    funcSort: {
+      type: String,
+      default: 'allFunc'
+    },
     roadDirection: {
       type: String
     }
   },
-  computed: {
-    ...mapState({
-      FuncSort: state => state.globalParam.FuncSort
-    })
-  },
   data () {
     return {
       basicFuncControlId: [0, 1, 4, 5], // 基础功能包含的控制方式： 自主控制（手动下）、黄闪、步进、定周期

package/package/kisscomps/components/SchemeConfig/realtimeStatusModal/index.vue

@@ -278,6 +278,7 @@ export default {
     roadDirection: {
       type: String
     }
+
   },
   data () {
     return {

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -349,6 +349,7 @@ export default {
       type: String,
       default: 'right'
     }
+
   },
   // computed: {
   //   ...mapState({

package/package/kisscomps/index.js

@@ -25,6 +25,7 @@ const language = {
   zh
 }
 
+const requireAll = requireContext => requireContext.keys().map(requireContext)
 const install = function (Vue) {
   if (install.installed) return
   Vue.use(VTooltip)
@@ -32,6 +33,15 @@ const install = function (Vue) {
   Object.keys(components).forEach(key => {
     Vue.component(components[key].name, components[key])
   })
+
+  const req = require.context('../icons/svg', false, /\.svg$/)
+  requireAll(req)
+
+  const urlMgr = require('../lib/publicjs/HttpurlMgr')
+  if (urlMgr.HttpUrlMgr.urlMap === undefined) {
+    let data = require('../../static/apiconfig.json')
+    urlMgr.HttpUrlMgr.init(data)
+  }
 }
 
 if (typeof window !== 'undefined' && window.Vue) {