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

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

@@ -190,8 +190,10 @@ export default {
    RESCUE_LOG: '/rescue/queryPageRescueLog' // // 查询历史报警信息
  },
  workEmployee: {
    GET_JOB_POSTION: '/workEmployee/queryJobPositionList', // 查询人员信息
    GET_WORK_EMPLOYEE: '/workEmployee/queryWorkEmployee', // 查询人员信息
    GET_ALL_ORGANIZE: '/workEmployee/queryAllOrganize', // 查询部门信息
    ADD_WORK_EMPLOYEE: '/workEmployee/createWorkEmployee' // 新增人员信息
    ADD_WORK_EMPLOYEE: '/workEmployee/createWorkEmployee', // 新增人员信息
    UPD_WORK_EMPLOYEE: '/workEmployee/modifyWorkEmployee' // 修改人员信息
  }
}

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

@@ -6,7 +6,6 @@
          <div class="label">绑定状态:</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.isBindDevice" placeholder="请选择...">
              <t-option value="0">全部</t-option>
              <t-option value="1">已绑定</t-option>
              <t-option value="2">未绑定</t-option>
            </t-select>
@@ -16,7 +15,7 @@
          <div class="label">终端类型:</div>
          <div class="input-rule">
            <t-select v-model="queryCondition.type" placeholder="请选择...">
              <t-option v-for="(item, index) in deviceTypes" :key="index" :value="item.code">{{ item.value }}</t-option>
              <t-option v-for="(item, index) in deviceTypes" :key="index" :value="item.deviceTypeId">{{ item.deviceTypeName }}</t-option>
            </t-select>
          </div>
        </div>
@@ -43,16 +42,16 @@
      </div>
    </div>
    <div>
      <t-table :data="table.data" @selection-change="handleSelectionChange">
      <t-table :data="table.data" :loading="tableLoading" @selection-change="handleSelectionChange">
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="deviceTypeName" label="终端类型"></t-table-column>
        <t-table-column prop="deviceNo" label="终端编号"></t-table-column>
        <t-table-column prop="bindName" label="关联用户/船舶"></t-table-column>
        <t-table-column prop="remarks" label="备注"></t-table-column>
        <t-table-column
            fixed="right"
            label="操作"
            width="220"
          fixed="right"
          label="操作"
          width="220"
        >
          <template slot-scope="scope">
            <a href="javascript:void(0)" size="sm" @click="() => handleClickUser(scope.row)">关联</a>
@@ -75,7 +74,7 @@
      <t-form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" label-position="left">
        <t-form-item label="终端类型" prop="type">
          <t-select v-model="formValidate.type" label-in-value placeholder="请选择...">
            <t-option v-for="(item, index) in deviceTypes" :key="index" :value="item.code">{{ item.value }}</t-option>
            <t-option v-for="(item, index) in deviceTypes" :key="index" :value="item.deviceTypeId">{{ item.deviceTypeName }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="终端编号" prop="number">
@@ -83,10 +82,10 @@
        </t-form-item>
        <t-form-item label="备注" prop="desc">
          <t-input
              v-model="formValidate.desc"
              :autosize="{minRows: 2,maxRows: 5}"
              type="textarea"
              placeholder="请输入..."
            v-model="formValidate.desc"
            :autosize="{minRows: 2,maxRows: 5}"
            type="textarea"
            placeholder="请输入..."
          ></t-input>
        </t-form-item>
      </t-form>
@@ -105,10 +104,10 @@
        </t-form-item>
        <t-form-item label="备注" prop="desc">
          <t-input
              v-model="updateFormValidate.desc"
              :autosize="{minRows: 2,maxRows: 5}"
              type="textarea"
              placeholder="请输入..."
            v-model="updateFormValidate.desc"
            :autosize="{minRows: 2,maxRows: 5}"
            type="textarea"
            placeholder="请输入..."
          ></t-input>
        </t-form-item>
      </t-form>
@@ -128,15 +127,13 @@
              <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 v-for="(item,index) in itemList" v-show="item.isShow" :key="index" :label="connectName" prop="user">
          <t-form-item v-for="(item,index) in itemList" v-if="item.isShow" :key="index" :label="connectName" prop="user">
            <div class="row">
              <div class="col-9">
                <t-select v-model="relevanceValidate.user"
                          :loading.sync="currentLoading"
                          placeholder="请选择"
                          filterable
                          clearable
                          @load="$_onLoad"
                >
                  <t-option v-for="(todo,index) in item.goList" :key="index" :value="todo">{{ todo.name }}({{ todo.code }})</t-option>
                </t-select>
@@ -162,9 +159,10 @@
      </div>
      <div slot="footer">
        <t-button @click="cancelUserModal">取消</t-button>
        <t-button color="primary" @click="confirmUserModal">确定</t-button>
        <t-button :loading="loading" color="primary" @click="confirmUserModal">确定</t-button>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
@@ -204,17 +202,20 @@ export default {
        }
      },
      queryCondition: {
        isBindDevice: '0',
        isBindDevice: '',
        type: '',
        deviceNo: ''
      },
      deviceTypes: [],
      selections: [],
      loading: false,
      currentLoading: false,
      connectName: '关联用户',
      rangeDate: '',
      modal: false,
      updateModal: false,
      tableLoading: true,
      fullLoading: false,
      updateFormValidate: {
        number: '',
        type: '',
@@ -266,7 +267,7 @@ export default {
              }
            }
          }
        ],
        ]
      },
      relevance: false,
      relevanceValidate: {
@@ -303,22 +304,28 @@ export default {
  },
  methods: {
    getList() {
      this.tableLoading = true
      this.table.data = []
      this.$test.post(services.device.GET_DEVICE, {
        pageNumber: this.table.pager.currentPage,
        pageSize: this.table.pager.size,
        IsBindDevice: this.queryCondition.isBindDevice,
        deviceNo: this.queryCondition.deviceNo,
        deviceTypeId: this.queryCondition.type
        data: {
          IsBindDevice: this.queryCondition.isBindDevice,
          deviceNo: this.queryCondition.deviceNo,
          deviceTypeId: this.queryCondition.type
        }
      }).then(res => {
        // 请求成功处理...
        this.tableLoading = false
        this.table.data = res.data.dataList
        this.table.pager.total = res.data.dataNum
      }).catch(res => {
        // 请求失败处理...
        this.tableLoading = false
      })
    },
    initItemList(name) { // 获取人员和设备的数据
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '1', name:name} // 查询人员
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '1', name: name} // 查询人员
      ).then(res => {
        // 请求成功处理...
        this.currentLoading = false
@@ -326,7 +333,7 @@ export default {
      }).catch(res => {
        // 请求失败处理...
      })
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '2', name:name} // 查询设备
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '2', name: name} // 查询设备
      ).then(res => {
        // 请求成功处理...
        this.currentLoading = false
@@ -354,40 +361,42 @@ export default {
      this.initItemList(filterValue)
    },
    cancelUserModal() {
      this.relevance = false
      this.$refs['relevanceValidate'].resetFields()
      this.itemList.forEach(e => {
        e.isShow = false
      })
      this.relevance = false
    },
    confirmUserModal() { // 绑定操作提交
      var that = this
      this.$refs['relevanceValidate'].validate(valid => {
        if (valid) {
          var params = new FormData()
          if (this.relevanceValidate.type === '1') {
            params.append('data', JSON.stringify({
              type: '1',
              PARTY_TYPE: 1,
              PARTY_CODE: this.relevanceValidate.user.employeeNo,
              PARTY_TERMINAL_ID: this.relevanceValidate.PARTY_TERMINAL_ID,
              PARTY_NAME: this.relevanceValidate.user.userName,
              PARTY_POST: this.relevanceValidate.user.duty,
              DEVICE_ID: this.relevanceValidate.id
            }))
          this.loading = true
          var id = ''
          if (that.relevanceValidate.type === '1') {
            id = that.relevanceValidate.user.id
          } else {
            params.append('data', JSON.stringify({
              type: '2',
              FACILITY_ID: this.relevanceValidate.user.id,
              DEVICE_ID: this.relevanceValidate.id
            }))
            id = that.relevanceValidate.user.id
          }
          that.fullLoading = true
          that.$test.post(services.device.BIND_DEVICE, {
            bindType: this.relevanceValidate.type,
            deviceId: this.relevanceValidate.id,
            associatedId: id
          }
          this.$test.post(services.device.BIND_DEVICE, params
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              this.relevance = false
              this.loading = false
              this.$Message.success('提交成功!')
              this.getList()
            }
          }).catch(res => {
            // 请求失败处理...
            this.loading = false
            this.fullLoading = false
          })
        }
      })
@@ -414,7 +423,7 @@ export default {
      })
    },
    onReset() {
      this.queryCondition.isBindDevice = 0
      this.queryCondition.isBindDevice = ''
      this.queryCondition.type = ''
      this.queryCondition.deviceNo = ''
      this.onSearch()
@@ -447,7 +456,7 @@ export default {
      var that = this
      this.$refs.formValidate.validate(valid => {
        if (valid) {
          debugger
          that.fullLoading = true
          that.$test.post(services.device.ADD_DEVICE, {
            deviceTypeId: that.formValidate.type.value,
            deviceTypeName: that.formValidate.type.label,
@@ -455,12 +464,13 @@ export default {
            remarks: that.formValidate.desc
          }).then(res => {
            // 请求成功处理...
            that.fullLoading = false
            if (res.data.result) {
              that.$Message.success('提交成功!')
              that.cancel()
              this.getList()
              that.getList()
            } else {
              this.$Message.danger(res.data.errMsg)
              that.$Message.danger(res.data.errMsg)
            }
          }).catch(res => {
            // 请求失败处理...
@@ -471,6 +481,7 @@ export default {
      })
    },
    updateSubmit() { // 编辑提交
      this.fullLoading = true
      this.$test.post(services.device.UPD_DEVICE, {
        deviceId: this.updateFormValidate.id,
        deviceTypeName: this.updateFormValidate.type,
@@ -478,6 +489,7 @@ export default {
        remarks: this.updateFormValidate.desc
      }).then(res => {
        // 请求成功处理...
        this.fullLoading = false
        if (res.data.result) {
          this.$Message.success('提交成功!')
          this.cancel()
@@ -487,6 +499,7 @@ export default {
        }
      }).catch(res => {
        // 请求失败处理...
        this.fullLoading = false
      })
    },
    solution(row) { // 解绑
@@ -498,16 +511,13 @@ export default {
      } else {
        this.$Confirm.confirm({
          title: '确认要解除终端' + row.deviceNo + '和' + row.bindName + '的关联关系吗？',
          content: '解绑后将不可通过终端' + row.deviceNo + '获取' + row.bindName + '的定位信息',
          content: '解绑后将不可通过终端 ' + row.deviceNo + ' 获取 ' + row.bindName + '的定位信息',
          ok: () => {
            var params = new FormData()
            params.append('data', JSON.stringify({
              DEVICE_ID: row.deviceId
            }))
            // console.log(that.formValidate.desc)
            this.$test.post(services.device.UNBIND_DEVICE, params
            this.fullLoading = true
            this.$test.post(services.device.UNBIND_DEVICE, {deviceId: row.deviceId}
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
@@ -516,6 +526,7 @@ export default {
              }
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
            })
          },
          cancel: () => {
@@ -525,39 +536,42 @@ export default {
      }
    },
    toBatchSolution(row) { // 批量解绑
      // if (row.bindName === '--') {
      //   this.$Confirm.info({
      //     title: '提示',
      //     content: '该终端未绑定对象,无需解绑'
      //   })
      // } else {
      //   this.$Confirm.confirm({
      //     title: '确认要解除终端' + row.deviceNo + '和' + row.bindName + '的关联关系吗？',
      //     content: '解绑后将不可通过终端' + row.deviceNo + '获取' + row.bindName + '的定位信息',
      //     ok: () => {
      //       var params = new FormData()
      //       params.append('data', JSON.stringify({
      //         DEVICE_ID: row.deviceId
      //       }))
      //       // console.log(that.formValidate.desc)
      //       this.$test.post(services.device.UNBIND_DEVICE, params
      //       ).then(res => {
      //         // 请求成功处理...
      //         if (res.data.result) {
      //           this.$Message.success('解绑成功!')
      //           this.getList()
      //         } else {
      //           this.$Message.danger('解绑失败!')
      //         }
      //       }).catch(res => {
      //         // 请求失败处理...
      //       })
      //     },
      //     cancel: () => {
      //       console.log('点击了取消')
      //     }
      //   })
      // }
      if (this.selections.length === 0) {
        this.$Confirm.info({
          title: '提示',
          content: '请选中需要删除的终端。'
        })
      } else {
        var deviceId = ''
        for (let i = 0; i < this.selections.length; i++) {
          deviceId += this.selections[i].deviceId + ','
        }
        deviceId = deviceId.substring(0, deviceId.length - 1)
        this.$Confirm.confirm({
          title: '确认要解除选中终端的关联关系吗？',
          content: '解绑后将不可通过终端获取定位信息',
          ok: () => {
            this.fullLoading = true
            this.$test.post(services.device.UNBIND_DEVICE, {deviceId: deviceId}
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
              } else {
                this.$Message.danger('解绑失败!')
              }
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
            })
          },
          cancel: () => {
            console.log('点击了取消')
          }
        })
      }
    },
    handleClick(row) {
      this.$test.post(services.device.GET_ONE_DEVICE, {deviceId: row.deviceId}
@@ -589,34 +603,42 @@ export default {
      this.$test.post(services.device.GET_BIND_DEVICE, {deviceId: row.deviceId}
      ).then(res => {
        // 请求成功处理...
        if (res.data.resultData.bindName == '--') {
        if (res.data.resultData == null) {
          this.relevanceValidate.msgisShow = false
          this.relevanceValidate.msg = ''
        } else {
          this.relevanceValidate.msgisShow = true
          this.relevanceValidate.msg = '当前终端已关联 ' + res.data.resultData.bindName + ' ,点击保存更改关联关系'
          var name = ''
          if (res.data.resultData.bindType === '1') {
            name = res.data.resultData.name
          } else {
            name = res.data.resultData.resourceToolName
          }
          this.relevanceValidate.msg = '当前终端已关联 ' + name + ' ,点击保存更改关联关系'
        }
      }).catch(res => {
        // 请求失败处理...
      })
    },
    removeD(row) {
      let that = this
      let confirm = {
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: function () {
        ok: () => {
          this.fullLoading = true
          this.$test.post(services.device.DEL_DEVICE, {deviceId: row.deviceId}
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              that.$Message.success('操作成功')
              that.getList()
              this.$Message.success('操作成功')
              this.getList()
            } else {
              that.$Message.danger(res.data.errMsg)
              this.$Message.danger(res.data.errMsg)
            }
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        }
      }
@@ -634,22 +656,24 @@ export default {
          deviceId += this.selections[i].deviceId + ','
        }
        deviceId = deviceId.substring(0, deviceId.length - 1)
        let that = this
        let confirm = {
          title: '请确认',
          content: '删除后不可恢复,确认删除吗?',
          ok: function () {
          ok: () => {
            this.fullLoading = true
            this.$test.post(services.device.DEL_DEVICE, {deviceId: deviceId}
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                that.$Message.success('操作成功')
                that.getList()
                this.$Message.success('操作成功')
                this.getList()
              } else {
                that.$Message.danger(res.data.errMsg)
                this.$Message.danger(res.data.errMsg)
              }
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
            })
          }
        }