openatc-components 0.0.103 → 0.0.104

package/package/kisscomps/components/DrawChannelization/drawsvg/index.vue

@@ -13,7 +13,7 @@
 <template>
   <div class="custom-cross-part draw-channelization">
     <FirstImportCrossmap v-if="pageindex === 1"
-    @loadSvgString="loadSvgString" />
+    @loadSvgString="loadSvgString" @loadMapSize="loadMapSize" />
     <CustomDraw v-show="pageindex === 2" ref="CustomDraw"
       :AgentId="AgentId"
       :loadedChannelizatonData="loadedChannelizatonData"
@@ -23,10 +23,7 @@
 <script>
 import FirstImportCrossmap from './firstImportCrossmap'
 import CustomDraw from './index.draw'
-// import { mapState } from 'vuex'
-// import { getIframdevid } from '../../../../utils/auth.js'
 import { getChannelizatonChart } from '../../../../api/cross'
-// import { getMessageByCode } from '../../../utils/responseMessage.js'
 
 export default {
   name: 'custom-channelization',
@@ -72,8 +69,12 @@ export default {
         this.$refs.CustomDraw.loadSvgString(type, imgstr)
       })
     },
+    loadMapSize (type, mapsize) {
+      this.$nextTick(() => {
+        this.$refs.CustomDraw.loadMapSize(type, mapsize)
+      })
+    },
     getChannelizatonChart () {
-      // let agentid = getIframdevid()
       let _this = this
       _this.pageindex = 1
       getChannelizatonChart(this.AgentId).then(data => {

package/package/kisscomps/components/DrawChannelization/drawsvg/laneEditPanel.vue

@@ -64,13 +64,6 @@
 
       <div class="phase-associated">
         <div class="tittle">{{$t('openatccomponents.channelizationmap.phaseassociated')}}</div>
-        <!-- 相位可以编辑，增加，删除，校验 -->
-        <!-- <PhaseAssociatedComponentCheck
-          ref="phaseAssociated"
-          :editData="Data"
-          :Motorways="Motorways"
-          @selectPhase="selectPhase"
-          @handleDisassociatePhase="handleDisassociatePhase" /> -->
         <!-- 相位仅可以关联选择，不可修改 -->
         <PhaseAssociatedComponent
           :editData="Data"
@@ -115,12 +108,6 @@
       </div>
       <div class="phase-associated">
         <div class="tittle">{{$t('openatccomponents.channelizationmap.phaseassociated')}}</div>
-        <!-- 相位可以编辑，增加，删除，校验 -->
-        <!-- <PhaseAssociatedComponentCheck
-          ref="phaseAssociated"
-          :editData="Data"
-          @selectPhase="selectPhase"
-          @handleDisassociatePhase="handleDisassociatePhase" /> -->
         <!-- 相位仅可以关联选择，不可修改 -->
         <PhaseAssociatedComponent
           :editData="Data"
@@ -135,6 +122,12 @@
 
     <!-- 检测器编辑面板 -->
     <div class="detector" v-if="Data.icontype === 'detector' && Data.detailtype === 'detector'">
+      <div class="edit-id">
+        <span style="margin-right: 3px;">
+          {{$t('openatccomponents.channelizationmap.detector') + ':'}}
+        </span>
+        <span>{{Data.id}}</span>
+      </div>
       <div class="detector-type">
         <div class="tittle">{{$t('openatccomponents.channelizationmap.detectortype')}}</div>
         <div class="each-icon" v-for="(item, index) in detectortypeList" :key="index">
@@ -160,40 +153,71 @@
            <el-form-item
                 :label="$t('openatccomponents.channelizationmap.occupancythreshold') + ':'"
                 prop="intersection">
-              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="occupancythreshold" size="mini"
                 @change="handleChangeOccuthreshold" />
-              <span class="detector-threshold-formtext">%</span>
+              <span class="detector-threshold-formtext">%</span> -->
+              <el-select :value="occupancythreshold" @change="handleChangeOccuthreshold">
+                <el-option
+                  v-for="item in occupResholdOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.channelizationmap.saturationthreshold') + ':'"
                 prop="count">
-              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="flowsaturationthreshold" size="mini"
                 @change="handleChangeFlowthreshold" />
-              <span class="detector-threshold-formtext">%</span>
+              <span class="detector-threshold-formtext">%</span> -->
+              <el-select :value="minflowsaturationthreshold" @change="handleChangeMinFlowthreshold">
+                <el-option
+                  v-for="item in minflowResholdOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled">
+                </el-option>
+              </el-select>
+              <span class="flow-separator">-</span>
+              <el-select :value="maxflowsaturationthreshold" @change="handleChangeMaxFlowthreshold">
+                <el-option
+                  v-for="item in maxflowResholdOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled">
+                </el-option>
+              </el-select>
             </el-form-item>
         </el-form>
       </div>
     </div>
-
+    <div class="basic-coord" v-if="JSON.stringify(Data) !== '{}' && Data.icontype !== 'countdown' && Data.icontype !== 'crossmap'">
+      <div class="tittle">{{$t('openatccomponents.channelizationmap.basicinfo')}}</div>
+      <BasicCoordInfo :drawingObjInfo="Data" @handleChangeBasicCoord="handleChangeBasicCoord" />
+    </div>
     <div class="delete-drawed-item" v-if="JSON.stringify(Data) !== '{}' && Data.detailtype !== 'detectorChart'">
-      <el-button type="primary" @click="handledelete">{{$t('openatccomponents.channelizationmap.delete')}}</el-button>
+      <el-button type="primary" @click="handledelete" v-if="Data.icontype !== 'crossmap'">{{$t('openatccomponents.channelizationmap.delete')}}</el-button>
+      <el-button type="primary" @click="handleClone" v-if="Data.icontype !== 'countdown' && Data.icontype !== 'crossmap'">{{$t('openatccomponents.channelizationmap.clone')}}</el-button>
     </div>
   </div>
 </template>
 <script>
-import PhaseAssociatedComponentCheck from './phaseAssociatedComponent.check'
 import PhaseAssociatedComponent from './phaseAssociatedComponent.vue'
 import OverlapAssociatedComponent from './overlapAssociatedComponent'
 import DetectorAssociatedComponent from './detectorAssociatedComponent.vue'
+import BasicCoordInfo from './basicCoordInfo'
 export default {
   name: 'lane-edit-panel',
   components: {
     PhaseAssociatedComponent,
-    PhaseAssociatedComponentCheck,
     OverlapAssociatedComponent,
-    DetectorAssociatedComponent
+    DetectorAssociatedComponent,
+    BasicCoordInfo
   },
   data () {
     return {
@@ -373,8 +397,12 @@ export default {
         iconclass: 'custom-peddetector',
         name: this.$t('openatccomponents.channelizationmap.pedestriandetector')
       }],
+      occupResholdOptions: [],
+      minflowResholdOptions: [],
+      maxflowResholdOptions: [],
       occupancythreshold: 80,
-      flowsaturationthreshold: 20
+      minflowsaturationthreshold: 30,
+      maxflowsaturationthreshold: 70
     }
   },
   watch: {
@@ -394,8 +422,11 @@ export default {
         if (data.occupancythreshold !== undefined) {
           this.occupancythreshold = data.occupancythreshold
         }
-        if (data.flowsaturationthreshold !== undefined) {
-          this.flowsaturationthreshold = data.flowsaturationthreshold
+        if (data.minflowsaturationthreshold !== undefined) {
+          this.minflowsaturationthreshold = data.minflowsaturationthreshold
+        }
+        if (data.maxflowsaturationthreshold !== undefined) {
+          this.maxflowsaturationthreshold = data.maxflowsaturationthreshold
         }
         if (data.flip !== undefined) {
           this.flip = data.flip
@@ -425,7 +456,6 @@ export default {
         this.iconObj.icondireid.splice(index, 1)
       }
       this.$emit('handleChooseDire', this.iconObj)
-      // this.handleAssociatedPhase()
     },
     selectLanetype (id) {
       this.iconObj.controltype = id
@@ -447,8 +477,9 @@ export default {
       if (value === 2) {
         // 行人检测器没有阈值设置
         this.iconObj.occupancythreshold = undefined
-        this.iconObj.flowsaturationthreshold = undefined
-        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'flowsaturationthreshold'])
+        this.iconObj.minflowsaturationthreshold = undefined
+        this.iconObj.maxflowsaturationthreshold = undefined
+        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'minflowsaturationthreshold', 'maxflowsaturationthreshold'])
       }
     },
     selectPedPos (value) {
@@ -461,7 +492,6 @@ export default {
     selectLanePos (value) {
       this.iconObj.lanePosition = value
       this.$emit('changeIconDataByType', this.iconObj, ['lanePosition'])
-      // this.handleAssociatedPhase()
     },
     selectPhase (phaseid, direction) {
       // 关联相位的同时，会修改相位方向
@@ -485,12 +515,6 @@ export default {
     handleDisassociatePhase (deletePhaseid) {
       this.$emit('handleDisassociatePhase', deletePhaseid)
     },
-    // handleAssociatedPhase () {
-    //   // 如果已关联相位，再改变车道转向或者方位时，需要同步更新选中的关联相位
-    //   if (this.iconObj.phaseid !== undefined) {
-    //     this.$refs.phaseAssociated.changeDirection(this.iconObj)
-    //   }
-    // },
     selectAssociatedDetector (detectorid) {
       // 仅关联检测器，不修改
       this.iconObj.detectorid = detectorid
@@ -506,15 +530,53 @@ export default {
       this.iconObj.occupancythreshold = occupancythreshold
       this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold'])
     },
-    handleChangeFlowthreshold (flowsaturationthreshold) {
-      if (flowsaturationthreshold === undefined) {
+    handleChangeMinFlowthreshold (minflowsaturationthreshold) {
+      if (minflowsaturationthreshold === undefined) {
         this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
-        this.flowsaturationthreshold = 20
+        this.minflowsaturationthreshold = 30
         return
       }
-      this.flowsaturationthreshold = flowsaturationthreshold
-      this.iconObj.flowsaturationthreshold = flowsaturationthreshold
-      this.$emit('changeIconDataByType', this.iconObj, ['flowsaturationthreshold'])
+      this.minflowsaturationthreshold = minflowsaturationthreshold
+      this.iconObj.minflowsaturationthreshold = minflowsaturationthreshold
+      this.$emit('changeIconDataByType', this.iconObj, ['minflowsaturationthreshold'])
+      this.handleDisabledMaxflowOption()
+    },
+    handleDisabledMinflowOption () {
+      // 此处需要排他，恢复上次置灰到默认值
+      this.minflowResholdOptions = this.minflowResholdOptions.map(option => ({
+        label: option.label,
+        value: option.value
+      }))
+      // 控制流量饱和度最小阈值的禁用范围
+      for (let i = 0; i < this.minflowResholdOptions.length; i++) {
+        if (this.minflowResholdOptions[i].value >= this.maxflowsaturationthreshold) {
+          this.minflowResholdOptions[i].disabled = true
+        }
+      }
+    },
+    handleChangeMaxFlowthreshold (maxflowsaturationthreshold) {
+      if (maxflowsaturationthreshold === undefined) {
+        this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
+        this.maxflowsaturationthreshold = 70
+        return
+      }
+      this.maxflowsaturationthreshold = maxflowsaturationthreshold
+      this.iconObj.maxflowsaturationthreshold = maxflowsaturationthreshold
+      this.$emit('changeIconDataByType', this.iconObj, ['maxflowsaturationthreshold'])
+      this.handleDisabledMinflowOption()
+    },
+    handleDisabledMaxflowOption () {
+      // 此处需要排他，恢复上次置灰到默认值
+      this.maxflowResholdOptions = this.maxflowResholdOptions.map(option => ({
+        label: option.label,
+        value: option.value
+      }))
+      // 控制流量饱和度最大阈值的禁用范围
+      for (let i = 0; i < this.maxflowResholdOptions.length; i++) {
+        if (this.maxflowResholdOptions[i].value <= this.minflowsaturationthreshold) {
+          this.maxflowResholdOptions[i].disabled = true
+        }
+      }
     },
     getCurPedPosList (iconpedtypeid) {
       // 方位根据行人类型显示
@@ -532,8 +594,44 @@ export default {
     handleChangeFilp (value) {
       this.iconObj.flip = value
       this.$emit('changeIconDataByType', this.iconObj, ['flip'])
+    },
+    createResholdSelectOptions () {
+      for (let i = 5; i < 100; i = i + 5) {
+        let option = {
+          label: i + '%',
+          value: i
+        }
+        this.occupResholdOptions.push(option)
+        if (i <= this.minflowsaturationthreshold) {
+          option.disabled = true
+        }
+        this.maxflowResholdOptions.push(option)
+      }
+      for (let i = 5; i < 100; i = i + 5) {
+        let option = {
+          label: i + '%',
+          value: i
+        }
+        if (i >= this.maxflowsaturationthreshold) {
+          option.disabled = true
+        }
+        this.minflowResholdOptions.push(option)
+      }
+    },
+    handleChangeBasicCoord (basicCoord) {
+      // 基础信息面板修改
+      this.iconObj.x = basicCoord.x
+      this.iconObj.y = basicCoord.y
+      this.iconObj.angle = basicCoord.angle
+      this.$emit('changeIconDataByType', this.iconObj, ['x', 'y', 'angle'])
+    },
+    handleClone () {
+      this.$emit('cloneItem', this.iconObj)
     }
   },
+  created () {
+    this.createResholdSelectOptions()
+  },
   mounted () {
     if (JSON.stringify(this.Data) === '{}') return
     this.iconObj = JSON.parse(JSON.stringify(this.Data))
@@ -549,8 +647,11 @@ export default {
     if (this.Data.occupancythreshold !== undefined) {
       this.occupancythreshold = this.Data.occupancythreshold
     }
-    if (this.Data.flowsaturationthreshold !== undefined) {
-      this.flowsaturationthreshold = this.Data.flowsaturationthreshold
+    if (this.Data.minflowsaturationthreshold !== undefined) {
+      this.minflowsaturationthreshold = this.Data.minflowsaturationthreshold
+    }
+    if (this.Data.maxflowsaturationthreshold !== undefined) {
+      this.maxflowsaturationthreshold = this.Data.maxflowsaturationthreshold
     }
     if (this.Data.flip !== undefined) {
       this.flip = this.Data.flip

package/package/kisscomps/components/DrawChannelization/drawsvg/utils/loadutils.js

@@ -10,10 +10,11 @@
  * See the Mulan PSL v2 for more details.
  **/
 export default class Svgmethods {
-  clickOpen (call) {
+  clickOpen (call, call2) {
     const file = document.getElementById('importimg').files[0]
     const filetype = file.type
     const reader = new FileReader()
+    const reader2 = new FileReader()
     const filesize = file.size
     if (filetype !== 'image/svg+xml' && filetype !== 'image/png' && filetype !== 'image/jpeg') {
       call('error', 'type')
@@ -24,20 +25,63 @@ export default class Svgmethods {
       return
     }
     if (filetype === 'image/svg+xml') {
-      reader.readAsText(file, 'UTF-8')
-      reader.addEventListener('load', async (readerEvent) => {
-        const content = readerEvent.target.result
-        call('vectorgraph', content)
+      reader2.readAsDataURL(file)
+      reader2.addEventListener('load', async (readerEvent) => {
+        const imageSrc = readerEvent.target.result
+        // 调用计算图片大小的方法
+        calculateImageSize(imageSrc).then(function ({width, height}) {
+          // 通过ES6的结构赋值来得到图片的宽和高
+          let svgsize = {
+            width,
+            height
+          }
+          call2('vectorgraph', svgsize)
+          reader.readAsText(file, 'UTF-8')
+          reader.addEventListener('load', async (readerEvent) => {
+            const content = readerEvent.target.result
+            call('vectorgraph', content)
+          })
+        })
       })
     }
     if (filetype === 'image/png' || filetype === 'image/jpeg') {
       reader.readAsDataURL(file)
       reader.addEventListener('load', async (readerEvent) => {
         // 图片的 base64 格式, 可以直接当成 img 的 src 属性值
-        const _base64 = reader.result
-        const content = _base64
-        call('picture', content)
+        const imageSrc = readerEvent.target.result
+        // 调用计算图片大小的方法
+        calculateImageSize(imageSrc).then(function ({width, height}) {
+          // 通过ES6的结构赋值来得到图片的宽和高
+          let pngsize = {
+            width,
+            height
+          }
+          call2('picture', pngsize)
+          const _base64 = reader.result
+          const content = _base64
+          call('picture', content)
+        })
       })
     }
   }
 }
+
+// 根据图片地址获取图片的宽和高
+const calculateImageSize = function (url) {
+  return new Promise(function (resolve, reject) {
+    const image = document.createElement('img')
+    image.addEventListener('load', function (e) {
+      resolve({
+        width: e.target.width,
+        height: e.target.height
+      })
+    })
+
+    image.addEventListener('error', function () {
+      console.log('error')
+    })
+
+    // 将图片的url地址添加到图片地址中
+    image.src = url
+  })
+}

package/package/kisscomps/index.js

@@ -5,6 +5,7 @@ import IntersectionMap from './components/IntersectionMap/index'
 import SchemeConfig from './components/SchemeConfig/index'
 import lockingPhaselControlModal from './components/SchemeConfig/lockingPhaselControlModal/index'
 import Channelization from './components/Channelization/index'
+import ChannelizationFlowStatistic from './components/ChannelizationFlowStatistic/index'
 import DrawChannelization from './components/DrawChannelization/index'
 import FaultDetailModal from './components/FaultDetailModal/index'
 import CommonKanban from './components/CommonKanban/index'
@@ -37,6 +38,7 @@ const components = {
   SchemeConfig,
   lockingPhaselControlModal,
   Channelization,
+  ChannelizationFlowStatistic,
   DrawChannelization,
   FaultDetailModal,
   PatternStatus,