Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master

ebc-middle-platform/src/http.js

@@ -153,8 +153,12 @@ function requestError(error) {
 * @returns {Object|Promise} 返回`Axios`响应对象或Promise对象
 */
function responseInterceptor(response) {
  GLoading.$create().finish()
  return response
  if (response.data.success) {
    return response.data
  } else {
    TMessage.danger(response.data.fail.message)
    return Promise.reject()
  }
}
/**
@@ -178,9 +182,23 @@ function responseError(error) {
  return Promise.reject(error)
}
// axios.interceptors.response.use(
//   response => {
//     console.log(response)
//     if (response.data.success) {
//       return response
//     } else {
//       // this.$Message.warning(response.data.fail.message)
//     }
//   },
//   error => {
//     return Promise.reject(error)
//   }
// )
// 默认服务调用拦截器设置
http.$http.interceptors.request.use(requestInterceptor, requestError)
http.$http.interceptors.response.use(responseInterceptor, responseError)
http.$test.interceptors.response.use(responseInterceptor, responseError)
// 注册插件
Vue.use(HttpPlugin)

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

@@ -44,6 +44,7 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

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

@@ -379,14 +379,15 @@ export default {
  },
  methods: {
    async getType() {
      this.fullLoading = true
      await this.$test.post(services.equipment.EQUIPMENT_TYPE, {}
      ).then(res => {
        // 请求成功处理...
        if (res.data.success) {
          this.typeList = res.data.data
        }
        this.fullLoading = false
        this.typeList = res.data
      }).catch(res => {
        // 请求失败处理...
        this.fullLoading = false
      })
    },
    getList() {
@@ -404,12 +405,11 @@ export default {
        // 请求成功处理...
        console.log(res)
        this.tableLoading = false
        if (res.data.success) {
          this.table.data = res.data.data.data
          this.table.pager.total = res.data.data.total
        }
        this.table.data = res.data.data
        this.table.pager.total = res.data.total
      }).catch(res => {
        // 请求失败处理...
        this.tableLoading = false
      })
    },
    type_formatter(row, column) {
@@ -445,6 +445,7 @@ export default {
    },
    checkReptition(data) {
      return new Promise((resolve) => {
        this.fullLoading = true
        this.$test.post(services.equipment.GET_EQUIPMENT, {
          pageNumber: 1,
          pageSize: 10,
@@ -452,18 +453,16 @@ export default {
        }
        ).then(res => {
        // 请求成功处理...
          this.fullLoading = false
          console.log(res)
          if (res.data.success) {
            if (res.data.data.totalPage > 0 && res.data.data.data[0].resourceToolId === this.updateRow.resourceToolId) {
              resolve(false)
            } else {
              resolve(res.data.data.totalPage > 0)
            }
          } else {
          if (res.data.totalPage > 0 && res.data.data[0].resourceToolId === this.updateRow.resourceToolId) {
            resolve(false)
          } else {
            resolve(res.data.totalPage > 0)
          }
        }).catch(res => {
        // 请求失败处理...
          this.fullLoading = false
          resolve(false)
        })
      })
@@ -504,21 +503,20 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('提交成功!')
              this.getList()
              this.modal = false
              this.formValidate = {
                type: '',
                name: '',
                radius: null,
                number: '',
                lng: '',
                lat: ''
              }
            this.$Message.success('提交成功!')
            this.getList()
            this.modal = false
            this.formValidate = {
              type: '',
              name: '',
              radius: null,
              number: '',
              lng: '',
              lat: ''
            }
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
@@ -537,13 +535,12 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('提交成功!')
              this.getList()
              this.updateModal = false
            }
            this.$Message.success('提交成功!')
            this.getList()
            this.updateModal = false
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
@@ -580,13 +577,12 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.success) {
              this.$Message.success('操作成功')
              this.table.pager.currentPage = 1
              this.getList()
            }
            this.$Message.success('操作成功')
            this.table.pager.currentPage = 1
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        }
      })

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

@@ -47,6 +47,7 @@
  }
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}

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

@@ -266,27 +266,33 @@ export default {
  },
  methods: {
    getDepartmentsList() {
      this.fullLoading = true
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          this.departments = res.data
          // this.onReset()
        })
        .catch((res) => {
          // 请求失败处理...
          this.fullLoading = false
        })
    },
    getTagType() {
      this.fullLoading = true
      this.$test
        .post(services.mapTag.MAP_TAG_TYPE, {})
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          console.log(res)
          this.markTypes = res.data.dataList
          this.markTypes = res.data
        })
        .catch((res) => {
          // 请求失败处理...
          this.fullLoading = false
        })
    },
    loadMap() {
@@ -349,6 +355,7 @@ export default {
        })
        .catch((res) => {
          // 请求失败处理...
          this.tableLoading = false
        })
    },
    type_formatter(row, column) {
@@ -569,12 +576,14 @@ export default {
      this.getList()
    },
    handleClick(row) {
      this.fullLoading = true
      this.$test
        .post(services.mapTag.GET_ONE_MAP_TAG, {
          mapTagId: row.mapAreaId
        })
        .then((res) => {
          // 请求成功处理...
          this.fullLoading = false
          this.modalData = []
          var color
          if (row.businessType == '3') {
@@ -584,7 +593,7 @@ export default {
          } else {
            color = 'blue'
          }
          var coverLayer = new Ai.Polygon(res.data.resultData.mapAreaContent, {color: color, opacity: 1.0})
          var coverLayer = new Ai.Polygon(res.data[0].mapAreaContent, {color: color, opacity: 1.0})
          // this.map.addLayer(coverLayer_blue)
          // 面设为编辑状态
          coverLayer.snapediting = new Ai.PolylineSnap(
@@ -601,6 +610,7 @@ export default {
        })
        .catch((res) => {
          // 请求失败处理...
          this.fullLoading = false
        })
      this.markName = row.mapAreaName
      this.markType = row.businessType
@@ -704,7 +714,13 @@ export default {
      this.selection = arr
    },
    batchDelete() {
      this.delete(this.selection)
      this.$Confirm.confirm({
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: () => {
          this.delete(this.selection)
        }
      })
    },
    delete(ids) {
      this.fullLoading = true

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

@@ -92,6 +92,7 @@
  color: #ffffff;
}
.loading--fix{
  position: absolute;
  color: #000;
  background-color: rgba(255, 255, 255, 0.8);
}