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

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

@@ -4,13 +4,14 @@
      <div class="search-ctn">
        <div>
          <t-button-group>
            <t-button :class="timeType.day?'active':''" color="secondary" @click="changeType('day')">日</t-button>
            <!-- <t-button :class="timeType.day?'active':''" color="secondary" @click="changeType('day')">日</t-button>
            <t-button :class="timeType.week?'active':''" color="secondary" @click="changeType('week')">月</t-button>
            <t-button :class="timeType.month?'active':''" color="secondary" @click="changeType('month')">年</t-button>
            <t-button :class="timeType.month?'active':''" color="secondary" @click="changeType('month')">年</t-button> -->
            <t-button v-for="(item,index) in queryCondition.type" :class="index==queryCondition.currentIndex?'active':''" :key="index" color="secondary" @click="changeType(index)">{{ item }}</t-button>
          </t-button-group>
        </div>
        <div>
          <t-date-picker v-model="singleDateVal" style="width:120px" placeholder="时间" @date-change="onChangeDate"
          <t-date-picker v-model="queryCondition.singleDateVal" style="width:120px" placeholder="时间" @date-change="onChangeDate"
          ></t-date-picker>
        </div>
        <div>
@@ -33,10 +34,10 @@
      <t-table :data="table.data">
        <t-table-column prop="name" label="姓名"></t-table-column>
        <t-table-column prop="job" label="职务"></t-table-column>
        <t-table-column v-if="timeType.day" prop="time" label="打卡时间"></t-table-column>
        <t-table-column v-if="!timeType.day" prop="attendance" label="出勤天数（天）"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex === 0" prop="time" label="打卡时间"></t-table-column>
        <t-table-column v-if="queryCondition.currentIndex !== 0" prop="attendance" label="出勤天数（天）"></t-table-column>
        <t-table-column
          v-if="!timeType.day"
          v-if="queryCondition.currentIndex !== 0"
          fixed="right"
          label="操作"
          width="120"
@@ -76,11 +77,6 @@ import './attendance.scss'
export default {
  data() {
    return {
      timeType: {
        day: true,
        week: false,
        month: false
      },
      table: {
        data: [
          {
@@ -109,10 +105,13 @@ export default {
        }
      },
      queryCondition: {
        type: '',
        type: [
          '日', '月', '年'
        ],
        currentIndex: 0,
        singleDateVal: '',
        alarmPerson: ''
      },
      singleDateVal: '',
      modal: false,
      modalData: {
        table: [{
@@ -145,10 +144,8 @@ export default {
    this.table.pager.total = this.table.data.length
  },
  methods: {
    changeType(type) {
      Object.keys(this.timeType).forEach((value, key) => {
        this.timeType[value] = value === type
      })
    changeType(index) {
      this.queryCondition.currentIndex = index
    },
    onChangeDate(value) {
      console.log(value)
@@ -158,7 +155,14 @@ export default {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition = {
        type: [
          '日', '月', '年'
        ],
        currentIndex: 0,
        singleDateVal: '',
        alarmPerson: ''
      }
    },
    onSearch() {

ebc-middle-platform/src/modules/attendance/track.vue

@@ -4,7 +4,7 @@
      <div class="search-ctn">
        <div>
          <div class="input-rule">
            <t-date-picker v-model="rangeDate" limit-date="10" type="dateRange" style="width:250px" placeholder="选择时间段" @date-change="onChange"></t-date-picker>
            <t-date-picker v-model="queryCondition.rangeDate" limit-date="10" type="dateRange" style="width:250px" placeholder="选择时间段" @date-change="onChange"></t-date-picker>
          </div>
        </div>
        <div>
@@ -83,10 +83,9 @@ export default {
        }
      },
      queryCondition: {
        type: '',
        rangeDate: [],
        alarmPerson: ''
      },
      rangeDate: ''
      }
    }
  },
  mounted() {
@@ -96,7 +95,10 @@ export default {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition = {
        rangeDate: [],
        alarmPerson: ''
      }
    },
    onSearch() {

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

@@ -1,11 +1,11 @@
.current-container{
  display: flex;
  width: "100%";
  height: 700px;
  width: 100%;
  height: 100%;
  .left{
    margin-top: 30px;
    width: 360px;
    height: 700px;
    height: 100%;
    .item{
      width: 300px;
      margin: 10px 30px;
@@ -80,7 +80,7 @@
    padding: 40px 30px 0 0;
    #current-map{
      width: 100%;
      height: 700px;
      height: 100%;
    }
  }
}
@@ -128,7 +128,7 @@
    }
    .hand-alarm{
      color: #FAAD14;
      background-color: #FFF7E8;
      background-color: #495571;
      margin: 7.5px 0 0 5px;
      padding: 0 5px;
      font-size: 8px;

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

@@ -14,7 +14,7 @@
          </div>
          <div class="row">
            <div>救援人</div>
            <div>{{ item.rescue }}</div>
            <div>{{ item.rescue==''?'--':item.rescue }}</div>
          </div>
          <div class="row">
            <div>报警时间</div>
@@ -26,14 +26,28 @@
          </div>
        </div>
        <div class="footer">
          <t-button icon="user-outline" color="primary">指派</t-button>
          <t-button icon="close" color="primary">关闭</t-button>
          <t-button v-show="item.rescue==''" icon="user-outline" color="primary" @click="showModal(item)">指派</t-button>
          <t-button icon="close" color="primary" @click="close(item)">关闭</t-button>
        </div>
      </div>
    </t-scroll-bar>
    <div class="right">
      <div id="current-map"></div>
    </div>
    <t-modal :visibled.sync="modal" 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>
<script>
@@ -46,7 +60,7 @@ export default {
          name: '张三',
          type: 1,
          number: 'ZDBH0001',
          rescue: '--',
          rescue: '',
          alarmTime: '2020.08.13 08:24:32',
          positionTime: '2020.08.13 08:24:32'
        },
@@ -54,7 +68,7 @@ export default {
          name: '张三',
          type: 2,
          number: 'ZDBH0001',
          rescue: '--',
          rescue: '',
          alarmTime: '2020.08.13 08:24:32',
          positionTime: '2020.08.13 08:24:32'
        },
@@ -62,7 +76,7 @@ export default {
          name: '张三',
          type: 2,
          number: 'ZDBH0001',
          rescue: '--',
          rescue: '海事局A',
          alarmTime: '2020.08.13 08:24:32',
          positionTime: '2020.08.13 08:24:32'
        },
@@ -70,17 +84,32 @@ export default {
          name: '张三',
          type: 2,
          number: 'ZDBH0001',
          rescue: '--',
          rescue: '',
          alarmTime: '2020.08.13 08:24:32',
          positionTime: '2020.08.13 08:24:32'
        }
      ],
      activeIndex: 0
      activeIndex: 0,
      modal: false,
      formValidate: {
        rescue: ''
      },
      ruleValidate: {
        rescue: [{
          required: true,
          message: '救援人员不能为空',
          trigger: 'blur'
        }]
      },
      map: null,
      alarmPoint: null,
      rescuePoint: null,
      polyline: null
    }
  },
  mounted() {
    this.map = new Ai.Map('current-map', {
      ak: 'MTYwMDkMTAwMU1UWXdNRGs1T0RZeE1EZzNPU014TnpRdw__',
      ak: 'MTYwMTMMTAwMU1UWXdNVE0wTlRNMU16WTBNeU14TnpRdw__',
      center: [39.915599, 116.406568],
      zoom: 5
    })
@@ -89,18 +118,31 @@ export default {
    this.map.addLayer(maplayer)
    var la = Ai.WMTSLayer('http://192.168.74.216:5071/gisserver/dzht:dzht/wmts')
    this.map.addLayer(la)
    var icon = Ai.Icon({
  },
  methods: {
    choose(item, index) {
      this.activeIndex = index
      if (this.map.hasLayer(this.alarmPoint)) {
        this.map.removeLayer(this.alarmPoint)
      }
      if (this.map.hasLayer(this.rescuePoint)) {
        this.map.removeLayer(this.rescuePoint)
      }
      if (this.map.hasLayer(this.polyline)) {
        this.map.removeLayer(this.polyline)
      }
      var icon = Ai.Icon({
      // 设置图标URL路径
      iconUrl: '/static/images/worker.png',
      // 设置图标大小
      iconSize: [20, 20],
      // 设置点对象和图标的相对偏移量
      iconAnchor: [0, 0]
    })
    var point = Ai.Point([32.12222, 116.222157], {icon: icon})
    point.on('click', (e) => {
      console.log(e)
      var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="alarm">落水报警</div></div><div class="middle"><div class="row">' +
        iconUrl: '/static/images/worker(1).png',
        // 设置图标大小
        iconSize: [20, 20],
        // 设置点对象和图标的相对偏移量
        iconAnchor: [0, 0]
      })
      this.alarmPoint = Ai.Point([29.86089241772908, 122.09930419921876], {icon: icon})
      this.alarmPoint.on('click', (e) => {
        console.log(e)
        var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="hand-alarm">救援人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
@@ -108,18 +150,69 @@ export default {
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
      var popup = Ai.Popup({minWidth: 300, offset: [0, -10]})
      // 设置弹出框弹出位置
        .setLatLng({lat: 32.12222, lng: 116.222157})
      // 设置弹出框弹出内容
        .setContent(content)
        .openOn(this.map)
    })
    this.map.addLayer(point)
  },
  methods: {
    choose(item, index) {
      this.activeIndex = index
        var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
        // 设置弹出框弹出位置
          .setLatLng({lat: 29.86089241772908, lng: 122.09930419921876})
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
      this.map.addLayer(this.alarmPoint)
      this.rescuePoint = Ai.Point([29.388158098102554, 122.45361328125], {icon: Ai.Icon({
      // 设置图标URL路径
        iconUrl: '/static/images/worker.png',
        // 设置图标大小
        iconSize: [20, 20],
        // 设置点对象和图标的相对偏移量
        iconAnchor: [0, 0]
      })})
      this.rescuePoint.on('click', (e) => {
        console.log(e)
        var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="alarm">报警人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
        var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
        // 设置弹出框弹出位置
          .setLatLng({lat: 29.388158098102554, lng: 122.45361328125})
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
      this.map.addLayer(this.rescuePoint)
      var lineWktstr = 'LINESTRING ( 122.09930419921876 29.86089241772908,122.18582153320314 29.6913335169976,122.21878051757814 29.42494595179543,122.45361328125 29.388158098102554)'
      this.polyline = Ai.Polyline(lineWktstr, {color: 'red'})
      this.map.addLayer(this.polyline)
      this.map.on('click', function(evt) {
        var lat = evt.latlng.lat // 点击地图时的纬度
        var lng = evt.latlng.lng // 点击地图时的经度
        console.log(lng, lat)
      })
    },
    showModal(item) {
      this.modal = true
    },
    cancel() {
      this.modal = false
    },
    appoint() {
    },
    close(item) {
      this.$Confirm.confirm({
        title: '确认要关闭张三落水报警吗？',
        content: '关闭后将不再进行报警显示',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    }
  }
}

ebc-middle-platform/src/modules/call-help/history.vue

@@ -22,7 +22,7 @@
        </li>
        <li>
          <div class="input-rule">
            <t-date-picker v-model="rangeDate" limit-date="10" type="dateRange" style="width:250px" placeholder="选择时间段" @date-change="onChange"></t-date-picker>
            <t-date-picker v-model="queryCondition.rangeDate" limit-date="10" type="dateRange" style="width:250px" placeholder="选择时间段" @date-change="onChange"></t-date-picker>
          </div>
        </li>
        <div class="btns">
@@ -50,7 +50,7 @@
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="rescuePlayback(scope.row)">救援回放</a>
            <a href="javascript:void(0)" size="sm" @click="remove(scope.$index)">删除</a>
            <a href="javascript:void(0)" size="sm" @click="deleteHistory(scope.row)">删除</a>
          </template>
        </t-table-column>
      </t-table>
@@ -201,11 +201,15 @@ export default {
      },
      queryCondition: {
        type: '',
        alarmPerson: ''
        alarmPerson: '',
        rangeDate: []
      },
      rangeDate: '',
      modal: false,
      speed: '1'
      speed: '1',
      map: null,
      alarmPoint: null,
      rescuePoint: null,
      polyline: null
    }
  },
  mounted() {
@@ -219,74 +223,17 @@ export default {
    this.map.addLayer(maplayer)
    var la = Ai.WMTSLayer('http://192.168.74.216:5071/gisserver/dzht:dzht/wmts')
    this.map.addLayer(la)
    var icon = Ai.Icon({
      // 设置图标URL路径
      iconUrl: '/static/images/worker(1).png',
      // 设置图标大小
      iconSize: [20, 20],
      // 设置点对象和图标的相对偏移量
      iconAnchor: [0, 0]
    })
    var point = Ai.Point([29.86089241772908, 122.09930419921876], {icon: icon})
    point.on('click', (e) => {
      console.log(e)
      var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="hand-alarm">救援人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
      var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
      // 设置弹出框弹出位置
        .setLatLng({lat: 29.86089241772908, lng: 122.09930419921876})
      // 设置弹出框弹出内容
        .setContent(content)
        .openOn(this.map)
    })
    this.map.addLayer(point)
    point = Ai.Point([29.388158098102554, 122.45361328125], {icon: Ai.Icon({
      // 设置图标URL路径
      iconUrl: '/static/images/worker.png',
      // 设置图标大小
      iconSize: [20, 20],
      // 设置点对象和图标的相对偏移量
      iconAnchor: [0, 0]
    })})
    point.on('click', (e) => {
      console.log(e)
      var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="alarm">报警人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
      var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
      // 设置弹出框弹出位置
        .setLatLng({lat: 29.388158098102554, lng: 122.45361328125})
      // 设置弹出框弹出内容
        .setContent(content)
        .openOn(this.map)
    })
    this.map.addLayer(point)
    var lineWktstr = 'LINESTRING ( 122.09930419921876 29.86089241772908,122.18582153320314 29.6913335169976,122.21878051757814 29.42494595179543,122.45361328125 29.388158098102554)'
    var polyline = Ai.Polyline(lineWktstr, {color: 'red'})
    this.map.addLayer(polyline)
    this.map.on('click', function(evt) {
      var lat = evt.latlng.lat // 点击地图时的纬度
      var lng = evt.latlng.lng // 点击地图时的经度
      console.log(lng, lat)
    })
  },
  methods: {
    onChange(value) {
      console.log('date change:' + value)
    },
    onReset() {
      this.queryCondition = {
        type: '',
        alarmPerson: '',
        rangeDate: []
      }
    },
    onSearch() {
@@ -302,6 +249,89 @@ export default {
    },
    rescuePlayback(row) {
      this.modal = true
      if (this.map.hasLayer(this.alarmPoint)) {
        this.map.removeLayer(this.alarmPoint)
      }
      if (this.map.hasLayer(this.rescuePoint)) {
        this.map.removeLayer(this.rescuePoint)
      }
      if (this.map.hasLayer(this.polyline)) {
        this.map.removeLayer(this.polyline)
      }
      var icon = Ai.Icon({
      // 设置图标URL路径
        iconUrl: '/static/images/worker(1).png',
        // 设置图标大小
        iconSize: [20, 20],
        // 设置点对象和图标的相对偏移量
        iconAnchor: [0, 0]
      })
      this.alarmPoint = Ai.Point([29.86089241772908, 122.09930419921876], {icon: icon})
      this.alarmPoint.on('click', (e) => {
        console.log(e)
        var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="hand-alarm">救援人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
        var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
        // 设置弹出框弹出位置
          .setLatLng({lat: 29.86089241772908, lng: 122.09930419921876})
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
      this.map.addLayer(this.alarmPoint)
      this.rescuePoint = Ai.Point([29.388158098102554, 122.45361328125], {icon: Ai.Icon({
      // 设置图标URL路径
        iconUrl: '/static/images/worker.png',
        // 设置图标大小
        iconSize: [20, 20],
        // 设置点对象和图标的相对偏移量
        iconAnchor: [0, 0]
      })})
      this.rescuePoint.on('click', (e) => {
        console.log(e)
        var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>张三</div><div class="alarm">报警人员</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>ZDBH0001</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>2020.08.13 08:24:32</div>' +
          '</div></div></div>'
        var popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
        // 设置弹出框弹出位置
          .setLatLng({lat: 29.388158098102554, lng: 122.45361328125})
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      })
      this.map.addLayer(this.rescuePoint)
      var lineWktstr = 'LINESTRING ( 122.09930419921876 29.86089241772908,122.18582153320314 29.6913335169976,122.21878051757814 29.42494595179543,122.45361328125 29.388158098102554)'
      this.polyline = Ai.Polyline(lineWktstr, {color: 'red'})
      this.map.addLayer(this.polyline)
      this.map.on('click', function(evt) {
        var lat = evt.latlng.lat // 点击地图时的纬度
        var lng = evt.latlng.lng // 点击地图时的经度
        console.log(lng, lat)
      })
    },
    deleteHistory(row) {
      console.log(1)
      this.$Confirm.confirm({
        title: '确认要删除改历史报警吗？',
        content: '删除后不可恢复',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    }
  }
}

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

@@ -11,11 +11,17 @@
    }
    .oparate-btn{
      position: absolute;
      float: left;
      margin-top: -450px;
      z-index: 10;
      left:40px;
      top: 120px;
      bottom: 0;
      margin: auto;
      height: 60px;
    }
}
.tabs-content{
  height: 100%;
}
.demo__slipbox .slipbox__header{
    text-align: left;
@@ -44,12 +50,81 @@
  padding: 10px;
}
  .normalCss{
    border-color: rgba(141, 138, 138, 0.63);
    border-width:0.5px;
  }
  .moveCss{
    border-color: #19bb20;
.normalCss{
  border-color: rgba(141, 138, 138, 0.63);
  border-width:0.5px;
}
.moveCss{
  border-color: #19bb20;
}
.tips-item{
  // width: 300px;
  // margin: 10px 30px;
  // border: 1px solid #E0E0E0;
  border-radius: 5px;
  background: #344979;
  .top{
    display: flex;
    border-bottom: 1px solid #99A3BA;
    height: 40px;
    line-height: 40px;
    padding-left: 20px;
    font-size: 12px;
    color: #ffffff;
    .user-pic{
      width: 25px;
      height: 25px;
      border-radius: 50%;
      background-image: url('/static/images/user.png');
      background-size: 100% 100%;
      margin: 7.5px 5px 0 0;
    }
    .alarm{
      color: #F5222D;
      background-color: #343E6B;
      margin: 7.5px 0 0 5px;
      padding: 0 5px;
      font-size: 8px;
      height: 25px;
      line-height: 25px;
    }
    .hand-alarm{
      color: #FAAD14;
      background-color:#495571;
      margin: 7.5px 0 0 5px;
      padding: 0 5px;
      font-size: 8px;
      height: 25px;
      line-height: 25px;
    }
  }
  .middle{
    padding-left: 20px;
    line-height: 30px;
    font-size: 10px;
    color: #ffffff;
    .row{
      display: flex;
      margin: 0;
      justify-content: space-between;
      >div{
        flex: 1;
        text-align: left;
      }
    }
  }
  .footer{
    height: 40px;
    border-top: 1px solid #E0E0E0;
    display: flex;
    justify-content: flex-end;
    button{
      height: 25px;
      line-height: 25px;
      margin: 7.5px 10px 0 0;
    }
  }
}
  
  

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

@@ -35,9 +35,9 @@
          <div class="slipbox__header"></div>
        </template>
        <template>
          <t-tabs>
            <t-tab-panel label="全部" panel-id="tab-1">
              <t-scroll-bar style="height:550px;" :auto-hide="false">
          <t-tabs style="height:100%">
            <t-tab-panel label="全部" panel-id="tab-1" style="height:100%;">
              <t-scroll-bar style="height:100%;" :auto-hide="false">
                <ul style="padding-left: 0px;">
                  <li
                    class="liCss"
@@ -76,7 +76,7 @@
              </t-scroll-bar>
            </t-tab-panel>
            <t-tab-panel label="在线" panel-id="tab-2" icon="home">
              <t-scroll-bar style="height:550px;" :auto-hide="false">
              <t-scroll-bar  style="height:100%" :auto-hide="false">
                <ul style="padding-left: 0px;">
                  <li
                    class="liCss"
@@ -114,8 +114,8 @@
                </ul>
              </t-scroll-bar>
            </t-tab-panel>
            <t-tab-panel label="SOS" panel-id="tab-3" icon="home">
              <t-scroll-bar style="height:550px;" :auto-hide="false">
            <t-tab-panel label="SOS" panel-id="tab-3" icon="home" style="height:100%;">
              <t-scroll-bar style="height:100%;" :auto-hide="false">
                <ul style="padding-left: 0px;">
                  <li
                    class="liCss"
@@ -153,8 +153,8 @@
                </ul>
              </t-scroll-bar>
            </t-tab-panel>
            <t-tab-panel label="离线" panel-id="tab-4" icon="home">
              <t-scroll-bar style="height:550px;" :auto-hide="false">
            <t-tab-panel label="离线" panel-id="tab-4" icon="home" >
              <t-scroll-bar style="height:100%" :auto-hide="false">
                <ul style="padding-left: 0px;">
                  <li
                    class="liCss"
@@ -197,25 +197,26 @@
      </t-slipbox>
    </div>
    <div class="oparate-btn">
      <t-button v-if="visible" color="info" icon="left-circle-outline" @click.native="hideSlip"></t-button>
      <t-button v-else color="info" icon="right-circle-outline" @click.native="showSlip"></t-button>
      <t-button v-if="visible" color="info"  style="height:60px" icon="left-circle-outline" @click.native="hideSlip"></t-button>
      <t-button v-else color="info" icon="right-circle-outline" style="height:60px" @click.native="showSlip"></t-button>
    </div>
  </div>
</template>
<script>
import "./orientation.scss";
import { forEach, filter } from "lodash";
import { forEach, filter , find} from "lodash";
export default {
  data() {
    return {
      map: null,
      pointsarr:[],
      pointsarr:null,
      polylinearr: "122.0352 32.4444,122.0372 32.4444,122.0400 32.4366,122.2922 32.4233",
      polygonarr: "122.2302 32.5444,122.2302 32.3444, 122.4302 32.3444,122.4302 32.6044,122.2302 32.5444",
      popup:null,
      visible: true,
      shadow: false,
      styls: { width: "400px", height: "600px", margin: "120px 0 0 75px" },
      styls: { width: "400px", height: "70%", margin: "120px 0 0 75px" },
      clickActiveName: "",
      moveActiveName: "",
      dataList: [
@@ -260,7 +261,7 @@ export default {
          number: "ZDBH0004",
          type: "离线",
          Longitude: "32.555",
          latitude: "122.0752",
          latitude: "121.0752",
          alarmTime: "2020.7.10 08:21:43",
          newMarkerTime: "2020.7.10 08:21:43",
          rescuePerson: "海事局A",
@@ -304,6 +305,7 @@ export default {
    this.pointsSet();
    this.polyline();
    this.polygon();
     this.map.setZoom(9);
  },
  methods: {
    initMap(value) {
@@ -311,20 +313,24 @@ export default {
        this.map.remove();
      }
      this.map = new Ai.Map("div1", {
        ak: "MTYwMTEMTAwMU1UWXdNVEV3TXpRek16STVOU014TnpRdw__",
        ak: "MTYwMTIMTAwMU1UWXdNVEkxTnpNMk16ZzBPU014TnpRdw__",
        center:[39.915599, 122.406568],
        
      });
      var maplayer = null;
      maplayer = Ai.TileLayer("http://192.168.74.189:9999/tdtvector");
      var la = Ai.WMTSLayer('http://192.168.74.216:5071/gisserver/dzht:dzht/wmts');
      this.map.addLayer(maplayer);
      this.map.addLayer(la);
      this.map.setView([39.915599, 122.406568], 3); //地图定位
      
      Ai.Scale({position:"bottomright"}).addTo(this.map);
      Ai.Zoom({type:"small"}).addTo(this.map);
    },
    pointsSet() {
      var arr = [];
      var pointsLayer= new Ai.LayerGroup();
      this.pointsLayer= new Ai.FeatureGroup();
      var icon = (icon = Ai.IconPulse({ iconSize: [13, 13] }));
      forEach(this.dataList, function (value) {
      forEach(this.dataList, (value)=>{
        var point1;
        if (value.type == "落水告警") {
          point1 = new Ai.Point([value.Longitude, value.latitude], {
@@ -334,11 +340,11 @@ export default {
          point1 = new Ai.Point([value.Longitude, value.latitude]);
        }
        pointsLayer.addLayer(point1);
        this.pointsLayer.addLayer(point1);
        arr.push(point1);
        //this.pointsarr.push(point1);
      });
      this.map.addLayer(pointsLayer);
      this.map.addLayer(this.pointsLayer);
      this.map.fitBoundsForLayers(arr);
    },
    polyline() {
@@ -367,10 +373,38 @@ export default {
    showSlip() {
      this.visible = true;
    },
    showPopup(number){
      if (this.popup != null && this.popup != "") {
              this.popup.closePopup();
              this.popup.remove();
      }
      var data=find(this.dataList,  (o)=> {
        return o.number == number;
      });
      if(data!=null&&data!="")
      {
        var content = '<div class="tips-item"><div class="top"><div class="user-pic"><t-icon icon="user-outline"></t-icon></div><div>'+data.name+'</div><div class="hand-alarm">'+data.type+'</div></div><div class="middle"><div class="row">' +
            '<div>终端编号</div>' +
            '<div>'+data.number+'</div>' +
          '</div>' +
          '<div class="row">' +
            '<div>最新定位时间</div>' +
            '<div>'+data.newMarkerTime+'</div>' +
          '</div></div></div>'
         this.popup = Ai.Popup({minWidth: 300, offset: [0, -10], autoClose: false})
        // 设置弹出框弹出位置
          .setLatLng({lat: data.Longitude, lng: data.latitude})
        // 设置弹出框弹出内容
          .setContent(content)
          .openOn(this.map)
      }
    },
    hideSlip() {
      this.visible = false;
    },
    changeColor(number) {
      this.showPopup(number);
      this.clickActiveName = number;
    },
    changeMoveColor(number) {

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

@@ -1,4 +1,4 @@
.track-container{
.equipment-container{
  width: 97%;
  margin: 20px auto;
  padding: 20px;
@@ -11,18 +11,13 @@
      overflow: hidden;
      margin: 0;
      padding: 0;
      position: relative;
      display: flex;
      justify-content: space-between;
      position: relative;
      justify-content: flex-start;
      >div{
        display: flex; 
        margin: 0 20px 16px 0;    
        line-height: 2;
        .label-content{
          display: flex; 
          margin: 0 20px 16px 0;    
          line-height: 2;
        }
        .input-rule{
          flex: 1;
          margin:0 0 0 20px;
@@ -31,6 +26,9 @@
          }
        }
      }
      .label{
        min-width: 30px;
      }
      .btns button{
        margin: 0 2px;
      }

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

@@ -1,43 +1,43 @@
<template>
  <div class="track-container">
  <div class="equipment-container">
    <div class="search-container">
      <div class="search-ctn">
        <div>
          <div class="label-content">
            <div class="label">设备类型：</div>
            <div class="input-rule">
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
                <t-option>张三</t-option>
                <t-option>李四</t-option>
              </t-select>
            </div>
          <div class="label">设备类型：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
              <t-option>张三</t-option>
              <t-option>李四</t-option>
            </t-select>
          </div>
          <div class="label-content">
            <div class="label">设备名称：</div>
            <div class="input-rule">
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
                <t-option>张三</t-option>
                <t-option>李四</t-option>
              </t-select>
            </div>
          </div>
          <div class="label-content">
            <div class="label">设备编号：</div>
            <div class="input-rule">
              <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
                <t-option>张三</t-option>
                <t-option>李四</t-option>
              </t-select>
            </div>
        </div>
        <div>
          <div class="label">设备名称：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
              <t-option>张三</t-option>
              <t-option>李四</t-option>
            </t-select>
          </div>
          <div class="btns">
            <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
            <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
            <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
            <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
        </div>
        <div>
          <div class="label">设备编号：</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.alarmPerson" width="200" placeholder="请输入...">
              <t-option>张三</t-option>
              <t-option>李四</t-option>
            </t-select>
          </div>
        </div>
        <div class="btns">
          <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
          <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
        </div>
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
          <t-button color="success" icon="plus-outline" @click="addEquipment">新增</t-button>

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

@@ -49,7 +49,7 @@
               @on-change="onPagerChange">
      </t-pager>
    </div>
    <t-modal :visibled.sync="addMark" :ok="submitMark" :cancel="cancel" class="modal" title="新增标记" ok-text="保存" width="1500px" >
    <t-modal :visibled.sync="addMark" :ok="submitMark" :cancel="cancel" class="modal" title="新增标记" ok-text="保存" width="80%" >
      <div class="top">
        <div>
          <div class="label">标记类型:</div>
@@ -164,7 +164,7 @@ export default {
  },
  mounted() {
    this.map = new Ai.Map('modalMap', {
      ak: 'MTYwMDkMTAwMU1UWXdNRGs1T0RZeE1EZzNPU014TnpRdw__',
      ak: 'MTYwMTMMTAwMU1UWXdNVE0wTlRNMU16WTBNeU14TnpRdw__',
      center: [39.915599, 116.406568],
      zoom: 5
    })

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

@@ -25,6 +25,9 @@
          }
        }
      }
      .label{
        width: 60px;
      }
      .btns button{
        margin: 0 2px;
      }

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

@@ -27,6 +27,8 @@
          <t-button color="secondary" icon="unlock-outline" @click="toExport">解绑用户</t-button>
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
        </div>
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
@@ -60,10 +62,10 @@
          width="220"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">关联用户</a>
            <a href="javascript:void(0)" size="sm" @click="remove(scope.$index)">解绑用户</a>
            <a href="javascript:void(0)" size="sm" @click="() => {relevance = true}">关联用户</a>
            <a href="javascript:void(0)" size="sm" @click="solution(scope.$index)">解绑用户</a>
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">编辑</a>
            <a href="javascript:void(0)" size="sm" @click="remove(scope.$index)">删除</a>
            <a href="javascript:void(0)" size="sm" @click="delete(scope.$index)">删除</a>
          </template>
        </t-table-column>
      </t-table>
@@ -95,6 +97,32 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <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="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>
              </div>
              <div class="col-3">
                <t-form-item>
                  <t-button>新增</t-button>
                </t-form-item>
              </div>
            </div>
          </t-form-item>
        </t-form>
      </div>
    </t-modal>
  </div>
</template>
<script>
@@ -170,6 +198,34 @@ export default {
            }
          }
        ]
      },
      relevance: false,
      relevanceValidate: {
        user: ''
      },
      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)
                }
              }
            }
          }
        ]
      }
    }
  },
@@ -215,6 +271,30 @@ export default {
          this.$Message.danger('表单验证失败!')
        }
      })
    },
    solution(row) {
      this.$Confirm.confirm({
        title: '确认要解除终端ZDBH001和张三的关联关系吗？',
        content: '解绑后将不可通过终端ZDH001获取张三的定位信息',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    },
    delete(row) {
      this.$Confirm.confirm({
        title: '确认要删除终端ZDBH001吗？',
        content: '删除后不可恢复',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    }
  }
}

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

@@ -1,4 +1,4 @@
.track-container{
.user-container{
  width: 97%;
  margin: 20px auto;
  padding: 20px;

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

@@ -1,5 +1,5 @@
<template>
  <div class="track-container">
  <div class="user-container">
    <div class="search-container">
      <div class="search-ctn">
        <div>
@@ -37,6 +37,8 @@
            <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
          </div>
        </div>
      </div>
      <div class="search-ctn" style="justify-content: flex-end;">
        <div class="btns">
          <t-button color="success" icon="upload-outline" @click="onReset">导入</t-button>
          <t-button color="success" icon="download-outline" @click="onReset">下载模板</t-button>
@@ -59,13 +61,13 @@
          width="240"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">关联终端</a>
            <a href="javascript:void(0)" size="sm" @click="() => {relevance = true}">关联终端</a>
            <span class="mod-line">|</span>
            <a href="javascript:void(0)" size="sm" @click="remove(scope.$index)">解绑终端</a>
            <a href="javascript:void(0)" size="sm" @click="solution(scope.$index)">解绑终端</a>
            <span class="mod-line">|</span>
            <a href="javascript:void(0)" size="sm" @click="handleClick(scope.row)">编辑</a>
            <span class="mod-line">|</span>
            <a href="javascript:void(0)" size="sm" @click="remove(scope.$index)">删除</a>
            <a href="javascript:void(0)" size="sm" @click="delete(scope.$index)">删除</a>
          </template>
        </t-table-column>
      </t-table>
@@ -78,7 +80,7 @@
               @on-change="onPagerChange">
      </t-pager>
    </div>
    <t-modal :visibled.sync="modal" title="新增设备" >
    <t-modal :visibled.sync="modal" title="新增用户" >
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="姓名" prop="name">
          <t-input v-model="formValidate.name" placeholder="请输入风机名称"></t-input>
@@ -112,6 +114,32 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <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>李四</div>
          </t-form-item>
          <t-form-item label="关联终端" prop="terminal">
            <div class="row">
              <div class="col-9">
                <t-form-item>
                  <t-select v-model="relevanceValidate.terminal" placeholder="请选择">
                    <t-option>张三</t-option>
                    <t-option>李四</t-option>
                  </t-select>
                </t-form-item>
              </div>
              <div class="col-3">
                <t-form-item>
                  <t-button>新增</t-button>
                </t-form-item>
              </div>
            </div>
          </t-form-item>
        </t-form>
      </div>
    </t-modal>
  </div>
</template>
<script>
@@ -242,6 +270,34 @@ export default {
            }
          }
        ]
      },
      relevance: false,
      relevanceValidate: {
        terminal: ''
      },
      relevanceRuleValidate: {
        terminal: [
          {
            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)
                }
              }
            }
          }
        ]
      }
    }
  },
@@ -282,6 +338,30 @@ export default {
    },
    addUser() {
      this.modal = true
    },
    solution(row) {
      this.$Confirm.confirm({
        title: '确认要解除张三和终端ZDBH001的关联关系吗？',
        content: '解绑后将不可通过终端ZDH001获取张三的定位信息',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    },
    delete(row) {
      this.$Confirm.confirm({
        title: '确认要删除用户张三吗？',
        content: '删除后不可恢复',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
        }
      })
    }
  }
}