chenxr3 4 vuotta sitten
vanhempi
commit
563af28335

+ 0 - 2
ebc-middle-platform/src/modules/system-management/equipment-management.vue

389
  },
389
  },
390
  methods: {
390
  methods: {
391
    async getType() {
391
    async getType() {
392
      // this.fullLoading = true
393
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
392
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
394
      ).then(res => {
393
      ).then(res => {
395
        // 请求成功处理...
394
        // 请求成功处理...
396
        // this.fullLoading = false
397
        this.typeList = res.data
395
        this.typeList = res.data
398
      }).catch(res => {
396
      }).catch(res => {
399
        // 请求失败处理...
397
        // 请求失败处理...

+ 22 - 26
ebc-middle-platform/src/modules/system-management/map-mark.vue

16
          <div class="label-content">
16
          <div class="label-content">
17
            <div class="label">标记类型:</div>
17
            <div class="label">标记类型:</div>
18
            <div class="input-rule">
18
            <div class="input-rule">
19
              <t-select v-model="queryCondition.mapAreaType" placeholder="请输入...">
19
              <t-select v-model="queryCondition.mapAreaType" placeholder="请选择...">
20
                <t-option
20
                <t-option
21
                  v-for="item in markTypes"
21
                  v-for="item in markTypes"
22
                  :key="item.mapAreaTypeId"
23
                  :value="item.mapAreaTypeId"
24
                >{{ item.mapAreaTypeName }}</t-option
22
                  :key="item.mapAreaBusinessType"
23
                  :value="item.mapAreaBusinessType"
24
                >{{ item.name }}</t-option
25
                >
25
                >
26
              </t-select>
26
              </t-select>
27
            </div>
27
            </div>
45
      </div>
45
      </div>
46
      <div class="search-ctn" style="justify-content: flex-end;">
46
      <div class="search-ctn" style="justify-content: flex-end;">
47
        <div class="btns">
47
        <div class="btns">
48
          <t-button v-for="(item,index) in markTypes" :key="index+'type'" color="success" icon="plus-outline" @click="markModal(item.mapAreaTypeId)"
49
          >{{ item.mapAreaTypeName }}</t-button
48
          <t-button v-for="(item,index) in markTypes" :key="index+'type'" color="success" icon="plus-outline" @click="markModal(item.mapAreaBusinessType)"
49
          >{{ item.name }}</t-button
50
          >
50
          >
51
        </div>
51
        </div>
52
      </div>
52
      </div>
117
            <t-select v-model="markType" style="width:100px" placeholder="请输入...">
117
            <t-select v-model="markType" style="width:100px" placeholder="请输入...">
118
              <t-option
118
              <t-option
119
                v-for="item in markTypes"
119
                v-for="item in markTypes"
120
                :key="item.mapAreaTypeId"
121
                :value="item.mapAreaTypeId"
122
              >{{ item.mapAreaTypeName }}</t-option
120
                :key="item.mapAreaBusinessType"
121
                :value="item.mapAreaBusinessType"
122
              >{{ item.name }}</t-option
123
              >
123
              >
124
            </t-select>
124
            </t-select>
125
          </div>
125
          </div>
301
        console.log(e)
301
        console.log(e)
302
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
302
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
303
        var color
303
        var color
304
        if (this.markType == '3') {
305
          color = 'red'
306
        } else if (this.markType == '2') {
307
          color = 'green'
308
        } else {
309
          color = 'blue'
310
        }
304
        this.markTypes.forEach(element => {
305
          if (element.mapAreaBusinessType == this.markType) {
306
            color = element.color
307
          }
308
        })
311
        this.layer.options.opacity = 1.0
309
        this.layer.options.opacity = 1.0
312
        this.layer.options.color = color
310
        this.layer.options.color = color
313
        this.layer.options.fillColor = color
311
        this.layer.options.fillColor = color
342
    },
340
    },
343
    type_formatter(row, column) {
341
    type_formatter(row, column) {
344
      var arr = this.markTypes.filter((item) => {
342
      var arr = this.markTypes.filter((item) => {
345
        return item.mapAreaTypeId === row.businessType
343
        return item.mapAreaBusinessType === row.businessType
346
      })
344
      })
347
      if (arr[0]) {
345
      if (arr[0]) {
348
        return arr[0].mapAreaTypeName
346
        return arr[0].name
349
      }
347
      }
350
    },
348
    },
351
    onChange(value) {
349
    onChange(value) {
354
    onReset() {
352
    onReset() {
355
      console.log(this.departments)
353
      console.log(this.departments)
356
      this.queryCondition = {
354
      this.queryCondition = {
357
        entityId: this.departments[0].id,
355
        entityId: '',
358
        mapAreaName: null,
356
        mapAreaName: null,
359
        mapAreaType: null
357
        mapAreaType: null
360
      }
358
      }
565
          this.fullLoading = false
563
          this.fullLoading = false
566
          this.modalData = []
564
          this.modalData = []
567
          var color
565
          var color
568
          if (row.businessType == '3') {
569
            color = 'red'
570
          } else if (row.businessType == '2') {
571
            color = 'green'
572
          } else {
573
            color = 'blue'
574
          }
566
          this.markTypes.forEach(element => {
567
            if (element.mapAreaBusinessType == row.businessType) {
568
              color = element.color
569
            }
570
          })
575
          var coverLayer = new Ai.Polygon(res.data[0].mapAreaContent, {color: color, opacity: 1.0})
571
          var coverLayer = new Ai.Polygon(res.data[0].mapAreaContent, {color: color, opacity: 1.0})
576
          // this.map.addLayer(coverLayer_blue)
572
          // this.map.addLayer(coverLayer_blue)
577
          // 面设为编辑状态
573
          // 面设为编辑状态

BIN
ebc-middle-platform/static/images/booster.png


BIN
ebc-middle-platform/static/images/fan.png


BIN
ebc-middle-platform/static/images/ship.png


BIN
ebc-middle-platform/static/images/windtower.png