修改提交

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

@@ -75,14 +75,11 @@
            <t-option v-for="(item,index) in typeList" :value="item.resourceToolType" :key="index+'type'">{{ item.name }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="设备名称" prop="name">
          <t-input v-model="formValidate.name" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <t-form-item label="设备编号" prop="number">
          <t-input v-model="formValidate.number" placeholder="请输入字母、数字、中划线、下划线、#"></t-input>
        </t-form-item>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="formValidate.radius" placeholder="请输入设备名称"></t-input>
        <t-form-item label="设备名称" prop="name">
          <t-input v-model="formValidate.name" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <div v-if="formValidate.type!=='001'">
          <t-form-item label="经度" prop="lng">
@@ -94,6 +91,9 @@
            <t-format-input v-model="formValidate.lat" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="formValidate.radius" placeholder="请输入半径"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
@@ -111,9 +111,6 @@
        <t-form-item label="设备名称" prop="resourceToolName">
          <t-input v-model="updateRow.resourceToolName" placeholder="请输入设备名称"></t-input>
        </t-form-item>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="updateRow.radius" numeral placeholder="请输入设备半径"></t-input>
        </t-form-item>
        <div v-if="updateRow.resourceToolType!=='001'">
          <t-form-item label="经度" prop="longitude">
            <t-format-input v-model="updateRow.longitude" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
@@ -124,6 +121,9 @@
            <t-format-input v-model="updateRow.latitude" :numeral-decimal-scale="8" numeral placeholder="请输入数字"></t-format-input>
          </t-form-item>
        </div>
        <t-form-item label="半径" prop="radius">
          <t-input v-model="updateRow.radius" numeral placeholder="请输入半径"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
@@ -237,6 +237,11 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
@@ -322,6 +327,11 @@ export default {
        ],
        radius: [
          {
            required: true,
            message: '半径不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
@@ -379,11 +389,11 @@ export default {
  },
  methods: {
    async getType() {
      this.fullLoading = true
      // this.fullLoading = true
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        this.fullLoading = false
        // this.fullLoading = false
        this.typeList = res.data
      }).catch(res => {
        // 请求失败处理...
@@ -445,7 +455,7 @@ export default {
    },
    checkReptition(data) {
      return new Promise((resolve) => {
        this.fullLoading = true
        // this.fullLoading = true
        this.$test.post(services.equipment.GET_EQUIPMENT, {
          pageNumber: 1,
          pageSize: 10,
@@ -453,7 +463,7 @@ export default {
        }
        ).then(res => {
        // 请求成功处理...
          this.fullLoading = false
        //   this.fullLoading = false
          console.log(res)
          if (res.data.totalPage > 0 && res.data.data[0].resourceToolId === this.updateRow.resourceToolId) {
            resolve(false)
@@ -476,6 +486,8 @@ export default {
      this.getList()
    },
    cancel() {
      this.$refs['formValidate'].resetFields()
      this.$refs['updateRow'].resetFields()
      this.modal = false
      this.updateModal = false
      this.formValidate = {
@@ -552,15 +564,27 @@ export default {
    },
    handleClick(row) {
      this.updateModal = true
      console.log(row)
      var name
      this.typeList.forEach(element => {
        if (element.resourceToolType === row.resourceToolType) {
          name = element.name
      this.$test.post(services.equipment.GET_EQUIPMENT, {
        pageNumber: 1,
        pageSize: 1,
        data: {
          resourceToolType: '',
          resourceToolNameAsLike: '',
          resourceToolCode: row.resourceToolCode
        }
      }).then(res => {
        // 请求成功处理...
        this.updateRow = res.data.data[0]
        var name
        this.typeList.forEach(element => {
          if (element.resourceToolType === this.updateRow.resourceToolType) {
            name = element.name
          }
        })
        this.updateRow.name = name
      }).catch(res => {
        // 请求失败处理...
      })
      row.name = name
      this.updateRow = row
    },
    remove(row) {
      this.delete([row.resourceToolId])

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

@@ -150,22 +150,6 @@
        <div class="left">
          <div class="header">
            <div>坐标列表</div>
            <div class="import-down">
              <a href="javascript:void(0)" size="sm" @click="handleFile1()"
              >导入</a
              >
              <input
                id="file"
                type="file"
                accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                style="display: none"
                @change="handleFile($event)"
              />
              <span class="mod-line">|</span>
              <a href="javascript:void(0)" size="sm" @click="downloadTemplate()"
              >下载模板</a
              >
            </div>
          </div>
          <div>
            <t-table :data="modalData" size="sm" height="500">
@@ -194,10 +178,9 @@
            <div>
              2、可编辑坐标列表中的经纬度值调整对应点坐标，对应点在地图中处于选中态
            </div>
            <div>3、导入将清空已绘制信息</div>
          </div>
        </div>
        <div id="modalMap" class="right"></div>
        <div id="modalMap" class="right" style = "margin:0 auto;width: 100%;height:500px" ></div>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
@@ -266,12 +249,12 @@ export default {
  },
  methods: {
    getDepartmentsList() {
      this.fullLoading = true
      // this.fullLoading = true
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          // this.fullLoading = false
          this.departments = res.data
          // this.onReset()
        })
@@ -281,12 +264,12 @@ export default {
        })
    },
    getTagType() {
      this.fullLoading = true
      // this.fullLoading = true
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          // this.fullLoading = false
          console.log(res)
          this.markTypes = res.data
        })
@@ -315,7 +298,6 @@ export default {
      this.polygonDrawer = Ai.DrawPolygon(this.map, options) // 初始化多边形绘制工具
      this.polygonDrawer.enable() // 激活多边形绘制工具
      this.map.on(AiDrawEvent.CREATED, (e) => {
        // debugger
        console.log(e)
        this.layer = this.polygonDrawer.polygon(e) // 获取多边形信息
        var color
@@ -401,7 +383,6 @@ export default {
        .post(services.excel.EXPROT_MAP_TAG, params)
        .then((res) => {
          // 请求成功处理...
          // debugger
          console.log(res)
          this.downloadDoc(res.data)
        })
@@ -410,7 +391,6 @@ export default {
        })
    },
    downloadDoc(response) {
      // debugger
      var blob = new Blob([response], {
        type: 'application/vnd.ms-excel;charset=utf-8'
      })
@@ -467,7 +447,6 @@ export default {
        })
        return false
      }
      // debugger
      if (this.markName === '') {
        this.$Confirm.warning({
          title: '提示',
@@ -649,9 +628,7 @@ export default {
      var files = e.target.files
      var f = files[0]
      var reader = new FileReader()
      // debugger
      reader.onload = function (e) {
        // debugger
        var data = new Uint8Array(e.target.result)
        var workbook = XLSX.read(data, { type: 'array' })
        /* DO SOMETHING WITH workbook HERE */
@@ -674,7 +651,6 @@ export default {
          5
        ) // 地图定位
        // that.map.center =  []
        // debugger
        coverWktStr_blue = coverWktStr_blue.substring(
          0,
          coverWktStr_blue.length - 1

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

@@ -328,7 +328,6 @@ export default {
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '1', name: name} // 查询人员
      ).then(res => {
        // 请求成功处理...
        debugger
        this.currentLoading = false
        this.itemList[0].goList = res.data
      }).catch(res => {
@@ -469,6 +468,7 @@ export default {
            that.getList()
          }).catch(res => {
            // 请求失败处理...
            that.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')