Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

昨天 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4

 admin/src/components/business/OperaJkCabinetWindow.vue

@@ -42,6 +42,18 @@
          <span style="margin-left: 20px;">单位：分钟</span>
        </div>
      </el-form-item>
      <el-form-item label="酒精检测" prop="doubleAuth">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-switch
            v-model="form.alcoholStatus"
            active-color="#13ce66"
            inactive-color="#ff4949"
            :active-value="0"
            :inactive-value="1">
          </el-switch>
          <span style="margin-left: 20px; color: #999999;">开启后，需要酒精检测通过后，才能开门</span>
        </div>
      </el-form-item>
      <el-form-item label="双重验证" prop="doubleAuth">
        <div style="width: 100%; display: flex; align-items: center;">
          <el-switch
@@ -81,6 +93,20 @@
          :active-value="0"
          :inactive-value="1">
        </el-switch>
      </el-form-item>
      <el-form-item label="激活文件" prop="activateFile">
        <el-upload
          accept=".zip"
          class="upload-demo"
          :action="base"
          :limit="1"
          :data="{ folder: 'activate' }"
          :file-list="fileList"
          :on-success="getFile"
          :on-remove="removeFile">
          <el-button size="small" type="primary">点击上传</el-button>
          <div slot="tip" class="el-upload__tip">只能上传zip文件</div>
        </el-upload>
      </el-form-item>
      <h3 style="margin: 20px 0;">柜组信息</h3>
      <el-form-item label="排列" prop="rowNum">
@@ -137,6 +163,8 @@
      }
    };
    return {
      base: process.env.VUE_APP_API_PREFIX + 'visitsAdmin/cloudService/public/upload',
      fileList: [],
      // 表单数据
      form: {
        id: null,
@@ -160,7 +188,9 @@
        noPrefix: '',
        noLength: '',
        noIndex: '',
        sortType: 0
        sortType: 0,
        activateFile: null,
        alcoholStatus: 0
      },
      // 验证规则
      rules: {
@@ -208,6 +238,22 @@
    })
  },
  methods: {
    getFile(response) {
      this.fileList = [{
        name: response.data.originname,
        fileurl: response.data.imgaddr,
        ...response.data
      }]
      this.form.activateFile = {
        name: response.data.originname,
        fileurl: response.data.imgaddr,
        ...response.data
      }
    },
    removeFile() {
      this.form.activateFile = null
      this.fileList = []
    },
    open (title, target) {
      this.title = title
      this.loadMember()
@@ -220,6 +266,13 @@
              for (const key in this.form) {
                this.form[key] = res[key]
              }
              if (res.activateFile) {
                this.fileList = [{
                  name: res.activateFile.name,
                  url: res.activateFile.fileurlFull,
                  ...res.activateFile
                }]
              }
              this.visible = true
            })
          })