地图标记 新增/编辑 坐标保留6位, 设备管理分页接口调整

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

@@ -5,10 +5,11 @@
        <div>
          <div class="label">设备类型：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.equipmentType" style="width: 200px" clearable placeholder="请输入...">
              <t-option value="001">风机</t-option>
              <t-option value="002">升压站</t-option>
              <t-option value="003">船舶</t-option>
            <t-select v-model="queryCondition.equipmentType" style="width: 200px" clearable placeholder="请选择...">
              <t-option value="001">船舶</t-option>
              <t-option value="002">风机</t-option>
              <t-option value="003">升压站</t-option>
              <t-option value="004">测风塔</t-option>
            </t-select>
          </div>
        </div>
@@ -47,13 +48,16 @@
        <t-table-column prop="FACILITY_TYPE" label="设备类型">
          <template slot-scope="scope">
            <div v-if="scope.row.FACILITY_TYPE==1">
              <span >风机</span>
              <span >船舶</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==2">
              <span>升压站</span>
              <span>风机</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==3">
              <span>船舶</span>
              <span>升压站</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==4">
              <span>测风塔</span>
            </div>
          </template>
        </t-table-column>
@@ -147,15 +151,19 @@ export default {
      typeList: [
        {
          value: '001',
          label: '风机'
          label: '船舶'
        },
        {
          value: '002',
          label: '升压站'
          label: '风机'
        },
        {
          value: '003',
          label: '船舶'
          label: '升压站'
        },
        {
          value: '004',
          label: '测风塔'
        }
      ],
      table: {
@@ -346,24 +354,23 @@ export default {
    }
  },
  mounted() {
    this.getList(1, 10, '', '', '')
    this.getList()
  },
  methods: {
    getList(pageNum, pageSize, type, name, number) {
    getList() {
      var params = new FormData()
      params.append('data', JSON.stringify({
        pageNum: pageNum,
        pageSize: pageSize,
        FACILITY_CODE: number,
        FACILITY_TYPE: type,
        FACILITY_NAME: name
        pageNum: this.table.pager.currentPage,
        pageSize: this.table.pager.size,
        FACILITY_CODE: this.queryCondition.equipmentNumber,
        FACILITY_TYPE: this.queryCondition.equipmentType,
        FACILITY_NAME: this.queryCondition.equipmentName
      }))
      this.$test.post(services.equipment.GET_EQUIPMENT, params
      ).then(res => {
        // 请求成功处理...
        this.table.data = res.data.result.list
        this.table.pager.total = res.data.result.total
        this.table.pager.currentPage = res.data.result.pageNum
      }).catch(res => {
        // 请求失败处理...
      })
@@ -398,7 +405,7 @@ export default {
      this.onSearch()
    },
    onSearch() {
      this.getList(1, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
      this.getList()
    },
    toExport() {
@@ -429,10 +436,12 @@ export default {
      })
    },
    onPagerChange(page) {
      this.getList(page, this.table.pager.size, '', '', '')
      this.table.pager.currentPage = page
      this.getList()
    },
    onSizeChange(number) {
      this.getList(1, number, '', '', '')
      this.table.pager.size = number
      this.getList()
    },
    cancel() {
      this.$refs['formValidate'].resetFields()
@@ -444,7 +453,8 @@ export default {
      this.formValidate.number = ''
      this.formValidate.lng = ''
      this.formValidate.lat = ''
      this.getList(this.table.pager.currentPage, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
      this.table.pager.currentPage = 1
      this.getList()
    },
    submit() {
      this.$refs.formValidate.validate(valid => {
@@ -465,7 +475,6 @@ export default {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.cancel()
            // this.getList(this.table.pager.currentPage, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
          }).catch(res => {
            // 请求失败处理...
          })
@@ -524,7 +533,7 @@ export default {
          ).then(res => {
            // 请求成功处理...
            that.$Message.success('操作成功')
            that.getList(that.table.pager.currentPage, that.table.pager.size, that.queryCondition.equipmentType, that.queryCondition.equipmentName, that.queryCondition.equipmentNumber)
            that.getList()
          }).catch(res => {
            // 请求失败处理...
          })

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

@@ -75,7 +75,7 @@
        :total="table.pager.total"
        :current.sync="table.pager.currentPage"
        :page-size.sync="table.pager.size"
        :sizer-range="[20, 50, 100]"
        :sizer-range="[10, 20, 50]"
        class="px-24 pt-16 float-right"
        show-elevator
        show-sizer
@@ -158,11 +158,13 @@
                label="坐标名称"
              ></t-table-column>
              <t-table-column
                :formatter="lngOrLatFormatter"
                align="center"
                prop="lng"
                label="经度"
              ></t-table-column>
              <t-table-column
                :formatter="lngOrLatFormatter"
                align="center"
                prop="lat"
                label="纬度"
@@ -195,7 +197,7 @@ export default {
        data: [],
        pager: {
          currentPage: 1,
          size: 5,
          size: 10,
          total: 0
        }
      },
@@ -353,6 +355,13 @@ export default {
      this.modalData = []
      this.polygonDrawer.enable()
    },
    lngOrLatFormatter(row, column, cellValue, index) {
      if (cellValue.toString().split('.')[1].length > 6) {
        return cellValue.toFixed(6)
      } else {
        return cellValue
      }
    },
    timestampToTime(cjsj) {
      var date = new Date(cjsj.CREATE_DATE) // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
      var Y = date.getFullYear() + '-'