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

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

@@ -27,8 +27,8 @@
          </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="loading" class="reset-btn" @click="onReset">重置</t-button>
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
        </div>
      </div>
@@ -158,11 +158,14 @@ export default {
  },
  mounted() {
    this.getList()
    this.queryCondition.singleDateVal = this.getTime(2)
  },
  methods: {
    changeType(index) {
      this.queryCondition.currentIndex = index
      this.queryCondition.singleDateVal = ''
      if (this.queryCondition.singleDateVal == '') {
        this.queryCondition.singleDateVal = this.getTime(2)
      }
      this.queryCondition.dateType = !(index === 2)
      this.getList()
    },
@@ -180,7 +183,7 @@ export default {
          '日', '周', '月'
        ],
        currentIndex: 0,
        singleDateVal: '',
        singleDateVal: this.getTime(2),
        alarmPerson: ''
      }
      this.table.pager.currentPage = 1

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

@@ -19,8 +19,8 @@
          </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="loading" class="reset-btn" @click="onReset">重置</t-button>
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
        </div>
      </div>

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

@@ -26,8 +26,8 @@
          </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="loading" class="reset-btn" @click="onReset">重置</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>

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

@@ -13,15 +13,9 @@
            </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="success" icon="search-outline" @click="onSearch">查询</t-button>
            <t-button color="secondary" icon="loading" class="reset-btn" @click="onReset">重置</t-button>
            <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
          </div>
        </div>
        <div class="btns">

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

@@ -18,8 +18,8 @@
          </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="loading" class="reset-btn" @click="onReset">重置</t-button>
          <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
          <t-button color="secondary" icon="unlock-outline" @click="toExport">解绑用户</t-button>
          <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
@@ -78,7 +78,7 @@
    <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="number">
          <t-input v-model="formValidate.number" placeholder="请输入6位数字"></t-input>
          <t-input v-model="formValidate.number" placeholder="请输入6位以内数字"></t-input>
        </t-form-item>
        <t-form-item label="备注" prop="desc">
          <t-input
@@ -240,10 +240,10 @@ export default {
            trigger: 'blur'
          },
          {
            message: '请输入6位数字#',
            message: '请输入6位以内数字',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              if (!/^\d{6}$/.test(value)) {
              if (!/^[0-9][0-9]{0,5}$/.test(value)) {
                callback(rule.message)
              } else {
                // TODO 判断编号重复
@@ -289,9 +289,9 @@ export default {
                  ).then(res => {
                    // 请求成功处理...
                    if (res.data.result !== null) {
                      that.relevanceValidate.PARTY_TERMINAL_ID = res.data.result.PARTY_TERMINAL_ID
                      that.relevanceValidate.PARTY_TERMINAL_ID = res.data.result.ID
                      that.relevanceValidate.msgisShow = true
                      that.relevanceValidate.msg = res.data.result.PARTY_NAME + ' 已关联终端 ' + res.data.result.DEVICE_ID + ' ，点击保存更改关联关系'
                      that.relevanceValidate.msg = res.data.result.NAME + ' 已关联终端 ' + res.data.result.DEVICE_ID + ' ，点击保存更改关联关系'
                    } else {
                      that.relevanceValidate.msgisShow = false
                    }