修改提交

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

@@ -389,11 +389,9 @@ export default {
  },
  methods: {
    async getType() {
      // this.fullLoading = true
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        // this.fullLoading = false
        this.typeList = res.data
      }).catch(res => {
        // 请求失败处理...

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

@@ -16,12 +16,12 @@
          <div class="label-content">
            <div class="label">标记类型:</div>
            <div class="input-rule">
              <t-select v-model="queryCondition.mapAreaType" placeholder="请输入...">
              <t-select v-model="queryCondition.mapAreaType" placeholder="请选择...">
                <t-option
                  v-for="item in markTypes"
                  :key="item.mapAreaTypeId"
                  :value="item.mapAreaTypeId"
                >{{ item.mapAreaTypeName }}</t-option
                  :key="item.mapAreaBusinessType"
                  :value="item.mapAreaBusinessType"
                >{{ item.name }}</t-option
                >
              </t-select>
            </div>
@@ -45,8 +45,8 @@
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button v-for="(item,index) in markTypes" :key="index+'type'" color="success" icon="plus-outline" @click="markModal(item.mapAreaTypeId)"
          >{{ item.mapAreaTypeName }}</t-button
          <t-button v-for="(item,index) in markTypes" :key="index+'type'" color="success" icon="plus-outline" @click="markModal(item.mapAreaBusinessType)"
          >{{ item.name }}</t-button
          >
        </div>
      </div>
@@ -117,9 +117,9 @@
            <t-select v-model="markType" style="width:100px" placeholder="请输入...">
              <t-option
                v-for="item in markTypes"
                :key="item.mapAreaTypeId"
                :value="item.mapAreaTypeId"
              >{{ item.mapAreaTypeName }}</t-option
                :key="item.mapAreaBusinessType"
                :value="item.mapAreaBusinessType"
              >{{ item.name }}</t-option
              >
            </t-select>
          </div>
@@ -301,13 +301,11 @@ export default {
        console.log(e)
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
        var color
        if (this.markType == '3') {
          color = 'red'
        } else if (this.markType == '2') {
          color = 'green'
        } else {
          color = 'blue'
        }
        this.markTypes.forEach(element => {
          if (element.mapAreaBusinessType == this.markType) {
            color = element.color
          }
        })
        this.layer.options.opacity = 1.0
        this.layer.options.color = color
        this.layer.options.fillColor = color
@@ -342,10 +340,10 @@ export default {
    },
    type_formatter(row, column) {
      var arr = this.markTypes.filter((item) => {
        return item.mapAreaTypeId === row.businessType
        return item.mapAreaBusinessType === row.businessType
      })
      if (arr[0]) {
        return arr[0].mapAreaTypeName
        return arr[0].name
      }
    },
    onChange(value) {
@@ -354,7 +352,7 @@ export default {
    onReset() {
      console.log(this.departments)
      this.queryCondition = {
        entityId: this.departments[0].id,
        entityId: '',
        mapAreaName: null,
        mapAreaType: null
      }
@@ -565,13 +563,11 @@ export default {
          this.fullLoading = false
          this.modalData = []
          var color
          if (row.businessType == '3') {
            color = 'red'
          } else if (row.businessType == '2') {
            color = 'green'
          } else {
            color = 'blue'
          }
          this.markTypes.forEach(element => {
            if (element.mapAreaBusinessType == row.businessType) {
              color = element.color
            }
          })
          var coverLayer = new Ai.Polygon(res.data[0].mapAreaContent, {color: color, opacity: 1.0})
          // this.map.addLayer(coverLayer_blue)
          // 面设为编辑状态