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

ebc-middle-platform/src/conf/services.js

@@ -146,6 +146,12 @@ export default {
    DEL_MAP_TAG: '/mapTag/deleteMapTagXyInfo', // 删除地图标记信息
    UPD_MAP_TAG: '/mapTag/queryMapTagforModifyInfo' // 查询地图标记信息用作修改
  },
  equipment: {
    GET_EQUIPMENT: '/equipment/queryEquipmentInfo', // 查询设备管理信息
    ADD_EQUIPMENT: '/equipment/modifyEquipmentInfo', // 新增/修改设备管理信息
    DEL_EQUIPMENT: '/equipment/deleteEquipmentInfo', // 删除设备管理信息
    REPETITION_EQUIPMENT: '/equipment/verifyEquipmentInfoRepetition' // 删除设备管理信息
  },
  history: {
    GET_HISTORICAL_ALARM: '/history/queryHistoricalAlarm' // 查询历史报警信息
  },

ebc-middle-platform/src/ipu-stomp.js

@@ -0,0 +1,108 @@
import SockJS from 'sockjs-client'
import Stomp from 'stompjs'
// import UUID from './uuid'
// define(["sockjs", "stomp", "uuid"],function(SockJS, Stomp, UUID) {
// var IpuStomp = {};
export default function (params, callbacks) {
  var onConnected, onFailure
  if (callbacks) {
    /* 供stomp.js中做判断：args[1] instanceof Function */
    onConnected = callbacks.onConnected ? callbacks.onConnected : new Function()
    onFailure = callbacks.onFailure ? callbacks.onFailure : new Function()
  } else {
    onConnected = new Function()
    onFailure = new Function()
  }
  var client
  if (params.url.startsWith('http') || params.url.startsWith('https')) { // SockJS支持http和https前缀
    var socket = new SockJS(params.url)
    client = Stomp.over(socket)
  } else { // SockJS支持ws前缀
    client = Stomp.client(params.url)
  }
  var headers = {'name': params.name, 'passcode': params.passcode, 'host': params.host, 'uuid': params.UUID}
  client.connect(headers, onConnected, onFailure)
  return new StompClient(client)
}
// IpuStomp.connect = function(url, login, passcode, callbacks, host){
// 	if(url.startsWith("http")||url.startsWith("https")){
// 		return connectWithSockJS(url, login, passcode, callbacks, host); //SockJS支持http和https前缀
// 	}else {
// 		return connectWithStomp(url, login, passcode, callbacks, host); //SockJS支持ws前缀
// 	}
// }
//
// function connectWithStomp(url, login, passcode, callbacks, host){
// 	var onConnected, onFailure;
//     if(callbacks){
//     	/*供stomp.js中做判断：args[1] instanceof Function*/
//     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
//         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
//     }else{
//     	onConnected = new Function();
//     	onFailure = new Function();
//     }
//     var client = Stomp.client(url);
//     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
//     client.connect(headers, onConnected, onFailure);
//     return new StompClient(client);
// }
//
// function connectWithSockJS(url, login, passcode, callbacks, host){
// 	var onConnected, onFailure;
//     if(callbacks){
//     	/*供stomp.js中做判断：args[1] instanceof Function*/
//     	onConnected = callbacks.onConnected?callbacks.onConnected:new Function();
//         onFailure = callbacks.onFailure?callbacks.onFailure:new Function();
//     }else{
//     	onConnected = new Function();
//     	onFailure = new Function();
//     }
//
// 	var socket = new SockJS(url);
//     var client = Stomp.over(socket);
//     var headers = {"login":login,"passcode":passcode,"host":host,"uuid":UUID};
//     client.connect(headers, onConnected, onFailure);
//     return new StompClient(client);
// }
function StompClient(client) {
  this.client = client
}
StompClient.prototype.setTopicPath = function(topicPath) {
//   topicPath = topicPath.startsWith('/') ? topicPath : '/' + topicPath
//   topicPath = topicPath.endsWith('/') ? topicPath : topicPath + '/'
//   console.log(topicPath)
  this.topicPath = topicPath
}
StompClient.prototype.disconnect = function() {
  this.client.disconnect()
}
StompClient.prototype.connected = function() {
  return this.client.connected
}
StompClient.prototype.subscribe = function(topic, callback) {
//   return this.client.subscribe(this.topicPath + topic, callback)
  return this.client.subscribe(this.topicPath, callback)
}
StompClient.prototype.publish = function(topic, text) {
//   this.client.send(this.topicPath + topic, {}, text)
  this.client.send(this.topicPath, {}, text)
}
// return IpuStomp;
// })
// export default {
//     IpuStomp: {
//         connect:IpuStomp.connect
//     }
// }

ebc-middle-platform/src/modules/call-help/current.scss

@@ -1,7 +1,7 @@
.current-container{
  display: flex;
  width: 100%;
  height: 100%;
  height: 94%;
  .left{
    margin-top: 30px;
    width: 360px;

ebc-middle-platform/src/modules/layouts/BasicLayout.vue

@@ -43,6 +43,7 @@
<script>
import GlobalLayout from '../page/GlobalLayout.vue'
import IpuStomp from '../../ipu-stomp'
export default {
  name: 'BasicLayout',
  components: {
@@ -58,6 +59,31 @@ export default {
      return this.$route.meta.keepAlive
    }
  },
  mounted() {
    // 镜屏调用
    var client
    var callbacks = {}
    callbacks.onConnected = msg => {
      console.log('连接成功：' + msg)
      client.subscribe('zhangsan', msg => {
        console.log(msg)
      })
    }
    callbacks.onFailure = msg => {
      console.log('连接失败：' + msg)
    }
    client = IpuStomp(
      {
        url: 'ws://192.168.3.200:7100/stomp',
        name: 'zhangsan',
        passcode: '123456',
        host: '',
        UUID: 'zhangsan'
      },
      callbacks
    )
    client.setTopicPath('personnel')
  },
  methods: {
    closeAlarmModal() {
      this.modal = false

ebc-middle-platform/src/modules/layouts/LayoutContent.vue

@@ -1,7 +1,7 @@
<template>
  <div class="layout-content">
    <!-- tags nav -->
    <div v-if="!hideTabGroup" class="tag-nav-wrapper">
    <div v-if="!hideTabGroup" v-show="this.$route.path!='/orientation'" class="tag-nav-wrapper">
      <tags-nav :value="$route" :list="tagNavList" :home-name="homeRoute.name" @tagSelect="handleClick" @on-close="handleCloseTag"/>
    </div>
    <!-- pageHeader , route meta :true on hide -->
@@ -35,6 +35,7 @@ export default {
    /**
     * @description 初始化标签导航
     */
    console.log(this.$route.path)
    this.setTagNavList()
  },
  methods: {

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -82,6 +82,20 @@
        </div>
      </div>
    </t-modal>
    <t-modal :visibled.sync="rescueModal" title="指派救援人员" >
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="救援人员" prop="rescue">
          <t-select v-model="formValidate.rescue" placeholder="请选择">
            <t-option>张三</t-option>
            <t-option>李四</t-option>
          </t-select>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="appoint()">指派</t-button>
      </div>
    </t-modal>
  </div>
</template>
@@ -184,7 +198,18 @@ export default {
        currentIndex: 0
      },
      trackMap: null,
      rangeDate: ''
      rangeDate: '',
      rescueModal: false,
      formValidate: {
        rescue: ''
      },
      ruleValidate: {
        rescue: [{
          required: true,
          message: '救援人员不能为空',
          trigger: 'blur'
        }]
      }
    }
  },
  computed: {
@@ -256,6 +281,7 @@ export default {
      Ai.Zoom({type: 'small'}).addTo(this.trackMap)
    },
    pointsSet() {
      window.Vue = this
      var arr = []
      this.pointsLayer = new Ai.FeatureGroup()
      var icon = (icon = Ai.IconPulse({ iconSize: [13, 13] }))
@@ -291,7 +317,7 @@ export default {
           '<div>2020.08.13 08:24:32</div>' +
         '</div></div></div>' +
         '<div style="display:flex;">' +
          '<button class="point-out" onClick="window.Vue.modal=true"><i style="font-size: 20px;" class="aidicon aidicon-user-outline"></i>指派</button>' +
          '<button class="point-out" onClick="window.Vue.rescueModal=true"><i style="font-size: 20px;" class="aidicon aidicon-user-outline"></i>指派</button>' +
          '<button class="close-confirm" onClick="window.Vue.close()"><i style="font-size: 20px;" class="aidicon aidicon-close"></i>关闭</button>' +
        '</div></div></div>'
          var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: true})
@@ -407,6 +433,21 @@ export default {
    },
    toExport() {
    },
    close(item) {
      this.$Confirm.confirm({
        title: '确认要关闭张三落水报警吗？',
        content: '关闭后将不再进行报警显示',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    },
    cancel() {
      this.rescueModal = false
    }
  }
}

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

@@ -5,37 +5,39 @@
        <div>
          <div class="label">设备类型：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.equipmentType" width="200" placeholder="请输入...">
              <t-option>风机</t-option>
              <t-option>升压站</t-option>
              <t-option>船舶</t-option>
            <t-select v-model="queryCondition.equipmentType" style="width: 200px" clearable placeholder="请输入...">
              <t-option value="1">风机</t-option>
              <t-option value="2">升压站</t-option>
              <t-option value="3">船舶</t-option>
            </t-select>
          </div>
        </div>
        <div>
          <div class="label">设备名称：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.equipmentName" filterable clearable :loading.sync="currentLoading" @load="$_onLoad" width="200">
              <t-option v-for="item in searchResult"
                        :key="item.value"
              >{{ item.label }}</t-option>
            </t-select>
            <t-input v-model="queryCondition.equipmentName" style="width: 200px" placeholder="请输入..." clearable></t-input>
<!--            <t-select v-model="queryCondition.equipmentName" filterable clearable :loading.sync="currentLoading" @load="$_onLoad" width="200">-->
<!--              <t-option v-for="item in searchResult"-->
<!--                        :key="item.value"-->
<!--              >{{ item.FACILITY_NAME }}</t-option>-->
<!--            </t-select>-->
          </div>
        </div>
        <div>
          <div class="label">设备编号：</div>
          <div class="input-rule">
            <t-select filterable
                      clearable
                      :loading.sync="currentLoading_n"
                      @load="$_onLoad_n"
                      v-model="queryCondition.equipmentNumber"
                      width="200"
            >
              <t-option v-for="item in searchResult_n"
                        :key="item.value"
              >{{ item.label }}</t-option>
            </t-select>
            <t-input v-model="queryCondition.equipmentNumber" style="width: 200px" placeholder="请输入..." clearable></t-input>
<!--            <t-select filterable-->
<!--                      clearable-->
<!--                      :loading.sync="currentLoading_n"-->
<!--                      @load="$_onLoad_n"-->
<!--                      v-model="queryCondition.equipmentNumber"-->
<!--                      width="200" id="ccc"-->
<!--            >-->
<!--              <t-option v-for="item in searchResult_n"-->
<!--                        :key="item.value"-->
<!--              >{{ item.FACILITY_CODE }}</t-option>-->
<!--            </t-select>-->
          </div>
        </div>
        <div class="btns">
@@ -55,11 +57,23 @@
    </div>
    <div>
      <t-table :data="table.data">
        <t-table-column prop="name" label="设备名称"></t-table-column>
        <t-table-column prop="number" label="设备编号"></t-table-column>
        <t-table-column prop="type" label="设备类型"></t-table-column>
        <t-table-column prop="long" label="经度"></t-table-column>
        <t-table-column prop="lat" label="纬度"></t-table-column>
        <t-table-column prop="FACILITY_NAME" label="设备名称"></t-table-column>
        <t-table-column prop="FACILITY_CODE" label="设备编号"></t-table-column>
        <t-table-column prop="FACILITY_TYPE" label="设备类型">
          <template slot-scope="scope">
            <div v-if="scope.row.FACILITY_TYPE==1">
              <span >风机</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==2">
              <span>升压站</span>
            </div>
            <div v-if="scope.row.FACILITY_TYPE==3">
              <span>船舶</span>
            </div>
          </template>
        </t-table-column>
        <t-table-column prop="LONGITUDE" label="经度"></t-table-column>
        <t-table-column prop="LATITUDE" label="纬度"></t-table-column>
        <t-table-column
            fixed="right"
            label="操作"
@@ -106,6 +120,42 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="updateModal" title="编辑设备" >
      <t-form ref="updateRow" :model="updateRow" :rules="updateRowValidate" :label-width="80" label-position="left">
<!--        <t-form-item label="设备类型" prop="type">-->
<!--          <template v-if="updateRow.FACILITY_TYPE==1">-->
<!--            风机-->
<!--          </template>-->
<!--          <template v-if="updateRow.FACILITY_TYPE==2">-->
<!--            升压站-->
<!--          </template>-->
<!--          <template v-if="updateRow.FACILITY_TYPE==3">-->
<!--            船舶-->
<!--          </template>-->
<!--        </t-form-item>-->
        <t-form-item label="设备类型" prop="FACILITY_TYPE">
          <t-select v-model="updateRow.FACILITY_TYPE" placeholder="请选择设备类型" clearable>
            <t-option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.label }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="设备名称" prop="FACILITY_NAME">
          <t-input v-model="updateRow.FACILITY_NAME" placeholder="请输入风机名称"></t-input>
        </t-form-item>
        <t-form-item label="设备编号" prop="FACILITY_CODE">
          {{updateRow.FACILITY_CODE }}
        </t-form-item>
        <t-form-item label="经度" prop="LONGITUDE">
          <t-input v-model="updateRow.LONGITUDE" placeholder="请输入数字"></t-input>
        </t-form-item>
        <t-form-item label="纬度" prop="LATITUDE">
          <t-input v-model="updateRow.LATITUDE" placeholder="请输入数字"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="updateSubmit">保存</t-button>
      </div>
    </t-modal>
  </div>
</template>
<script>
@@ -114,32 +164,12 @@ import services from '../../conf/services'
export default {
  data() {
    return {
      currentLoading: false,
      searchResult: [],
      demoDataA: [
        {
          label: 'aacc',
          value: 'a001'
        },
        {
          label: 'ccce',
          value: 'a002'
        }
      ],
      currentLoading_n: false,
      searchResult_n: [],
      demoDataA_n: [
        {
          label: 'aacc',
          value: 'a001'
        },
        {
          label: 'ccce',
          value: 'a002'
        }
      ],
      // currentLoading: false,
      // searchResult: [],
      // demoDataA: [],
      // currentLoading_n: false,
      // searchResult_n: [],
      // demoDataA_n: [],
      typeList: [
        {
          value: '1',
@@ -151,25 +181,11 @@ export default {
        },
        {
          value: '3',
          label: '测风塔'
          label: '船舶'
        }
      ],
      table: {
        data: [
          {
            name: '1#风机',
            number: 'FJ0001',
            type: '风机',
            long: '113.445454',
            lat: '23.157919'
          },
          {
            name: '1#风机',
            number: 'FJ0001',
            type: '风机',
            long: '113.445454',
            lat: '23.157919'
          }
        ],
        pager: {
          currentPage: 1,
@@ -185,6 +201,14 @@ export default {
      },
      rangeDate: '',
      modal: false,
      updateModal: false,
      updateRow: {
        FACILITY_TYPE: '',
        FACILITY_NAME: '',
        FACILITY_CODE: '',
        LONGITUDE: '',
        LATITUDE: ''
      },
      formValidate: {
        type: '',
        name: '',
@@ -211,6 +235,8 @@ export default {
              // TODO 判断编号重复
              if (false) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
@@ -232,6 +258,8 @@ export default {
                if (false) {
                  rule.message = '编号重复'
                  callback(rule.message)
                }else {
                  return true
                }
              }
            }
@@ -249,6 +277,8 @@ export default {
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
@@ -265,6 +295,70 @@ export default {
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
        ]
      },
      updateRowValidate: {
        FACILITY_TYPE: [{
          required: true,
          message: '设备类型不能为空',
          trigger: 'change'
        }],
        FACILITY_NAME: [
          {
            required: true,
            message: '设备名称不能为空',
            trigger: 'blur'
          },
          {
            message: '设备名称重复',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              // TODO 判断编号重复
              if (false) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
        ],
        LONGITUDE: [
          {
            required: true,
            message: '经度不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
        ],
        LATITUDE: [
          {
            required: true,
            message: '经度不能为空',
            trigger: 'blur'
          },
          {
            message: '请输入数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (isNaN(value)) {
                callback(rule.message)
              }else {
                return true
              }
            }
          }
@@ -273,74 +367,176 @@ export default {
    }
  },
  mounted() {
    this.getList(1, 10, '')
    this.getList(1, 10, '', '', '')
  },
  methods: {
    $_onLoad(filterValue) {
      this.queryCondition.equipmentName = filterValue
      window.setTimeout(() => {
        let d = this.demoDataA.concat()
        this.searchResult = d
        this.currentLoading = false
      }, 1000)
    },
    $_onLoad_n(filterValue) {
      this.queryCondition.equipmentNumber = filterValue
      window.setTimeout(() => {
        let d = this.demoDataA_n.concat()
        this.searchResult_n = d
        this.currentLoading_n = false
      }, 1000)
    },
    getList(pageNum, pageSize, params) {
      this.table.data = this.table.data.concat(this.table.data)
      this.table.pager.total = this.table.data.length
      // var params = new FormData()
      // params.append('data', JSON.stringify({
      //   params: {
      //     pageNum: pageNum,
      //     pageSize: pageSize,
      //     MAP_TAG_NAME: MAP_TAG_NAME
      //   }
      // }))
      // this.$test.post(services.mapTag.GET_MAP_TAG, 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 => {
      //   // 请求失败处理...
      // })
    // $_onLoad(filterValue) {
    //   this.queryCondition.equipmentName = filterValue
    //   window.setTimeout(() => {
    //     var params = new FormData()
    //     params.append('data', JSON.stringify({
    //       params: {
    //         FACILITY_NAME: filterValue
    //       }
    //     }))
    //     this.$test.post(services.equipment.GET_EQUIPMENT, params
    //     ).then(res => {
    //       // 请求成功处理...
    //       let d = res.data.result.list.concat()
    //       this.searchResult = d
    //       this.currentLoading = false
    //     }).catch(res => {
    //       // 请求失败处理...
    //     })
    //   }, 1000)
    // },
    // $_onLoad_n(filterValue) {
    //   this.queryCondition.equipmentNumber = filterValue
    //   window.setTimeout(() => {
    //     var params = new FormData()
    //     params.append('data', JSON.stringify({
    //       params: {
    //         FACILITY_CODE: filterValue
    //       }
    //     }))
    //     this.$test.post(services.equipment.GET_EQUIPMENT, params
    //     ).then(res => {
    //       // 请求成功处理...
    //       let d = res.data.result.list.concat()
    //       this.searchResult_n = d
    //       this.currentLoading_n = false
    //     }).catch(res => {
    //       // 请求失败处理...
    //     })
    //   }, 1000)
    // },
    getList(pageNum, pageSize, type, name, number) {
      var params = new FormData()
      params.append('data', JSON.stringify({
        params: {
          pageNum: pageNum,
          pageSize: pageSize,
          FACILITY_CODE: number,
          FACILITY_TYPE: type,
          FACILITY_NAME: name
        }
      }))
      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 => {
        // 请求失败处理...
      })
    },
    onChange(value) {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition.equipmentType = ''
      this.queryCondition.equipmentName = ''
      this.queryCondition.equipmentNumber = ''
      this.searchResult = [
        {
          FACILITY_CODE: '',
          FACILITY_ID: '',
          FACILITY_NAME: '',
          FACILITY_TYPE: '',
          LATITUDE: '',
          LONGITUDE: ''
        }
      ]
      this.searchResult_n = [
        {
          FACILITY_CODE: '',
          FACILITY_ID: '',
          FACILITY_NAME: '',
          FACILITY_TYPE: '',
          LATITUDE: '',
          LONGITUDE: ''
        }
      ]
      this.onSearch()
    },
    onSearch() {
      console.log(this.queryCondition.equipmentType)
      console.log(this.queryCondition.equipmentName)
      this.getList(1, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
    },
    toExport() {
    },
    onPagerChange(page) {
      this.getList(page, this.table.pager.size, '', '', '')
    },
    onSizeChange(number) {
      this.getList(1, number, '', '', '')
    },
    cancel() {
      this.modal = false
      this.updateModal = false
      this.formValidate.type = ''
      this.formValidate.name = ''
      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)
    },
    submit() {
      debugger
      this.$refs.formValidate.validate(valid => {
        console.log(valid)
        if (valid) {
          this.$Message.success('提交成功!')
          var params = new FormData()
          params.append('data', JSON.stringify({
            params: {
              FACILITY_TYPE: this.formValidate.type,
              FACILITY_NAME: this.formValidate.name,
              FACILITY_CODE: this.formValidate.number,
              LONGITUDE: this.formValidate.lng,
              LATITUDE: this.formValidate.lat
            }
          }))
          this.$test.post(services.equipment.ADD_EQUIPMENT, params
          ).then(res => {
            // 请求成功处理...
            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 => {
            // 请求失败处理...
          })
        } else {
          this.$Message.danger('表单验证失败!')
        }
      })
    },
    updateSubmit() {
      debugger
      this.$refs.updateRow.validate(valid => {
        console.log(valid)
        if (valid) {
          var params = new FormData()
          params.append('data', JSON.stringify({
            params: {
              FACILITY_ID: this.updateRow.FACILITY_ID,
              FACILITY_TYPE: this.updateRow.FACILITY_TYPE,
              FACILITY_NAME: this.updateRow.FACILITY_NAME,
              LONGITUDE: this.updateRow.LONGITUDE,
              LATITUDE: this.updateRow.LATITUDE
            }
          }))
          this.$test.post(services.equipment.ADD_EQUIPMENT, params
          ).then(res => {
            // 请求成功处理...
            this.$Message.success('提交成功!')
            this.cancel()
          }).catch(res => {
            // 请求失败处理...
          })
        } else {
          this.$Message.danger('表单验证失败!')
        }
@@ -350,7 +546,8 @@ export default {
      this.modal = true
    },
    handleClick(row) {
      this.modal = true
      this.updateModal = true
      this.updateRow = row
    },
    remove(row) {
      let that = this
@@ -360,16 +557,18 @@ export default {
        ok: function () {
          var params = new FormData()
          params.append('data', JSON.stringify({
            MAP_TAG_ID: row.MAP_TAG_ID
            params: {
              FACILITY_ID: row.FACILITY_ID
            }
          }))
          // this.$test.post(services.mapTag.DEL_MAP_TAG, params
          // ).then(res => {
          //   // 请求成功处理...
          this.$Message.success('操作成功')
          //   that.getList(that.table.pager.currentPage, that.table.pager.size, that.queryCondition.userName)
          // }).catch(res => {
          //   // 请求失败处理...
          // })
          this.$test.post(services.equipment.DEL_EQUIPMENT, params
          ).then(res => {
            // 请求成功处理...
            that.$Message.success('操作成功')
            that.getList(that.table.pager.currentPage, that.table.pager.size, that.queryCondition.equipmentType, that.queryCondition.equipmentName, that.queryCondition.equipmentNumber)
          }).catch(res => {
            // 请求失败处理...
          })
        }
      }
      this.$Confirm.confirm(confirm)

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

@@ -97,37 +97,35 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="relevance" title="关联用户" >
    <t-modal :visibled.sync="relevance" title="关联用户">
      <div>
        <t-form ref="relevanceValidate" :model="relevanceValidate" :rules="relevanceRuleValidate" :label-width="80" label-position="left">
          <t-form-item label="终端编号" prop="number">
            <div>ZDBH002</div>
          </t-form-item>
          <t-form-item label="关联类型" prop="type">
            <t-radio-group v-model="relevanceValidate.type">
              <t-radio value="0" label="用户"></t-radio>
              <t-radio value="1" label="船舶"></t-radio>
          <t-form-item label="关联类型">
            <t-radio-group v-model="relevanceValidate.type" @change="userConectChanged()">
              <t-radio v-for="(item,index) in radioList" :value="item.value" :key="index" :label="item.label"></t-radio>
            </t-radio-group>
          </t-form-item>
          <t-form-item label="关联用户" prop="user">
          <t-form-item v-for="(item,index) in itemList" v-show="item.isShow" :key="index" :label="connectName" prop="user">
            <div class="row">
              <div class="col-9">
                <t-form-item>
                  <t-select v-model="relevanceValidate.user" placeholder="请选择">
                    <t-option>张三</t-option>
                    <t-option>李四</t-option>
                  </t-select>
                </t-form-item>
                <t-select v-model="relevanceValidate.user" placeholder="请选择">
                  <t-option v-for="(todo,index) in item.goList" :key="index" :value="todo.value">{{ todo.name }}</t-option>
                </t-select>
              </div>
              <div class="col-3">
                <t-form-item>
                  <t-button>新增</t-button>
                </t-form-item>
                <t-button @click="goUserManagement()">新增</t-button>
              </div>
            </div>
          </t-form-item>
        </t-form>
      </div>
      <div slot="footer">
        <t-button @click="cancelUserModal">取消</t-button>
        <t-button color="primary" @click="confirmUserModal">确定</t-button>
      </div>
    </t-modal>
  </div>
</template>
@@ -141,6 +139,44 @@ export default {
        relevance: false,
        unrelevance: false
      },
      radioList: [
        {value: '1', label: '用户'},
        {value: '2', label: '船舶'}
      ],
      itemList: [
        {
          isRadio: '1',
          isShow: true,
          goList: [
            {
              name: '张三',
              value: '0'
            },
            {
              name: '李四',
              value: '2'
            },
            {
              name: '用户',
              value: '1'
            }
          ]
        },
        {
          isRadio: '2',
          isShow: false,
          goList: [
            {
              name: '张三',
              value: '0'
            },
            {
              name: '船舶',
              value: '1'
            }
          ]
        }
      ],
      table: {
        data: [
          {
@@ -175,6 +211,7 @@ export default {
        type: '',
        alarmPerson: ''
      },
      connectName: '关联用户',
      rangeDate: '',
      modal: false,
      formValidate: {
@@ -212,27 +249,30 @@ export default {
      },
      relevanceRuleValidate: {
        user: [
          {
            required: true,
            message: '编号不能为空',
            trigger: 'blur'
          },
          {
            message: '张三已关联终端ZDBH001，点击保存更改关联关系',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (!/^[a-zA-Z0-9-_#]+$/.test(value)) {
                callback(rule.message)
              } else {
                // TODO 判断编号重复
                if (true) {
                  rule.message = '编号重复'
                  callback(rule.message)
                }
              }
            }
          }
          { required: true, message: '请选择读写类型', trigger: 'change' }
        ]
        // user: [
        //   {
        //     required: true,
        //     message: '编号不能为空',
        //     trigger: 'blur'
        //   },
        //   {
        //     message: '张三已关联终端ZDBH001，点击保存更改关联关系',
        //     trigger: 'blur',
        //     validator: function(rule, value, callback) {
        //       if (!/^[a-zA-Z0-9-_#]+$/.test(value)) {
        //         callback(rule.message)
        //       } else {
        //         // TODO 判断编号重复
        //         if (true) {
        //           rule.message = '编号重复'
        //           callback(rule.message)
        //         }
        //       }
        //     }
        //   }
        // ]
      }
    }
  },
@@ -241,6 +281,34 @@ export default {
    this.table.pager.total = this.table.data.length
  },
  methods: {
    cancelUserModal() {
      this.relevance = false
      this.$refs['relevanceValidate'].resetFields()
    },
    confirmUserModal() {
      this.$refs['relevanceValidate'].validate(valid => {
        if (valid) {
          this.relevance = false
        }
      })
    },
    goUserManagement () {
      this.$router.push({path: '../system-management/user-management'})
      this.relevance = false
    },
    userConectChanged() {
      this.itemList.forEach(element => {
        if (element.isRadio === this.relevanceValidate.type) {
          this.radioList.forEach(todo => {
            this.relevanceValidate.user = ''
            if (todo.value === this.relevanceValidate.type) {
              this.connectName = '关联' + todo.label
            }
          })
          element.isShow = true
        } else { element.isShow = false }
      })
    },
    changeType(type) {
      Object.keys(this.relevanceType).forEach((value, key) => {
        this.relevanceType[value] = value === type