1.解决两个账号登录，是否被挤掉的问题

loulijun2021

2022-10-29 e713b378b01d189f972cfb5b9eae749ee95a8b51

 src/views/sbgl/wxjl.vue

@@ -2,8 +2,6 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button icon="el-icon-download" @click="upload">导入</el-button>-->
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

@@ -16,13 +14,7 @@
          style="display: flex;justify-content: space-between"
        >
          <div class="elForm">
            <el-form-item label="设备编码" label-width="70px" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="生产车间" style=" display: flex;">
            <el-form-item label="生产车间" label-width="70px" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
@@ -32,20 +24,46 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="设备编码" style=" display: flex;">
              <el-input v-model="form.eqpcode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="设备名称" style=" display: flex;">
              <el-input v-model="form.eqpname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="报修人员" style=" display: flex;">
              <el-input v-model="form.reportuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="报修时间" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label-width="70px" label="维修人员" style=" display: flex;">
              <el-input v-model="form.repairuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="维修人员" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
              <el-input v-model="form.vrifcatuser" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="维修时间" style=" display: flex;">
              <el-input v-model="form.reportdate" placeholder="请输入" style="width: 200px" />
            <el-form-item v-show="isExpandForm" label="报修时间" style=" display: flex;align-items: center">
              <el-date-picker
                v-model="form.reportdate"
                type="daterange"
                :clearable="false"
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
                end-placeholder="结束日期"
                size="mini"
              />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="验证人员" style=" display: flex;">
              <el-input v-model="form.repairdate" placeholder="请输入" style="width: 200px" />
            <el-form-item v-show="isExpandForm" label="维修时间" style=" display: flex;align-items: center">
              <el-date-picker
                v-model="form.repairdate"
                type="daterange"
                :clearable="false"
                class="timeMini"
                range-separator="~"
                start-placeholder="开始日期"
                style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
                end-placeholder="结束日期"
                size="mini"
              />
            </el-form-item>
            <el-form-item
              v-show="isExpandForm"
@@ -228,7 +246,7 @@
    </div>

    <el-dialog
      :title="operation==='add'?'新增':'维修明细'"
      title="维修明细"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
@@ -246,10 +264,10 @@
          <div v-if="dialogData1.faultimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData1.faultimage">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url)"
                @click="handlePictureCardPreview(baseUrl+item.img1url,'设备报修/故障图片')"
              >
            </div>
          </div>
@@ -260,12 +278,12 @@
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">故障描述：{{ dialogData2.faultdescr }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">故障图片：
            <div v-for="item in dialogData2.repairimage">
            <div v-for="item in dialogData2.repairimage" v-if="item.img1url!==''">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img1url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img1url)"
                @click="handlePictureCardPreview(baseUrl+item.img1url,'设备维修/故障图片')"
              >
            </div>
          </div>
@@ -273,12 +291,12 @@
          <div v-if="dialogData2.repaircontent" style="margin-bottom: 10px">维修内容：{{ dialogData2.repaircontent }}</div>
          <div v-if="dialogData2.repairpart" style="margin-bottom: 10px">更换备件：{{ dialogData2.repairpart }}</div>
          <div v-if="dialogData2.repairimage" style="display: flex;margin-bottom: 10px">备件图片：
            <div v-for="item in dialogData2.repairimage">
            <div v-for="item in dialogData2.repairimage" v-if="item.img2url!==''">
              <img
                style="width: 100px;margin-left: 10px"
                style="width: 100px;margin-right: 10px"
                :src="baseUrl+item.img2url"
                alt=""
                @click="handlePictureCardPreview(baseUrl+item.img2url)"
                @click="handlePictureCardPreview(baseUrl+item.img2url,'设备维修/备件图片')"
              >
            </div>
          </div>
@@ -287,7 +305,14 @@
          <i class="el-icon-s-operation" style="color:#42b983;" /> 设备维修验证信息：
        </div>
        <div style="display: flex;flex-direction: column;margin-left: 40px">
          <div style="margin-bottom: 10px">验证结果：xxx</div>
          <div style="margin-bottom: 10px;display: flex;">验证结果：
            <div
              :style="{backgroundColor:isResult==='通过'? '#42b983':'red'}"
              style="margin-top: 3px;margin-right: 5px;width:10px;height: 10px;border-radius: 50%;"
            />
            {{ isResult }}
          </div>

        </div>
      </div>
      <!--      图片预览对话框-->
@@ -298,7 +323,33 @@
        append-to-body
        @close="pictureHandleClose"
      >
        <img width="100%" :src="pictureUrl" alt="">
        <div style="font-size: 16px;margin-bottom: 10px">
          <i class="el-icon-s-comment" style="color:#42b983;" /> {{ pictureName }}
        </div>

        <img :key="new Date()" width="100%" :src="pictureUrl" alt="">

        <el-tooltip class="item" effect="light" content="上一张" placement="top">
          <div
            v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==0"
            style="position: absolute;top: 48%;left: 3.5%;"
          ><i
            style="color:#fff;cursor: pointer;font-size: 20px"
            class="el-icon-d-arrow-left"
            @click="arrowLeftClick(pictureUrl,pictureName)"
          /></div>
        </el-tooltip>
        <el-tooltip class="item" effect="light" content="下一张" placement="top">
          <div
            v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==pictureUrlAll.length-1"
            style="position: absolute;top: 48%;right: 3.5%;"
          >
            <i
              style="color:#fff;cursor: pointer;font-size: 20px"
              class="el-icon-d-arrow-right"
              @click="arrowRightClick(pictureUrl,pictureName)"
            /></div>
        </el-tooltip>
        <span slot="footer" class="dialog-footer">
          <div class="footerButton">
            <el-button @click="pictureVisible=false">返 回</el-button>
@@ -329,11 +380,9 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import ImportPicker from '@/components/ImportPicker'
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceRepairTakeOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/sbgl'
import { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'

export default {
@@ -352,10 +401,10 @@
        eqpcode: '', // 设备编码
        eqpname: '', // 设备名称
        reportuser: '', // 报修人员
        repairuser: '', // 报修时间
        vrifcatuser: '', // 维修人员
        reportdate: '', // 维修时间
        repairdate: '', // 验证人员
        repairuser: '', // 维修人员
        vrifcatuser: '', // 验证人员
        reportdate: '', // 报修时间
        repairdate: '', // 维修时间
        vrifcatdate: '', // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
@@ -368,12 +417,15 @@
      dialogVisible: false,
      dialogData1: {},
      dialogData2: {},
      isResult: '', // 验证结果
      operation: '',

      baseUrl: 'http://121.196.36.24:8001/', // 图片预览地址前缀

      pictureVisible: false, // 图片预览对话框
      pictureUrl: '', // 图片预览Url
      pictureName: '', // 图片预览名称
      pictureUrlAll: [], // 图片预览地址的所有Url

      title_value: '数据导入 / 点检部位',
      code: '4',
@@ -404,7 +456,35 @@
      })
    },
    async getDeviceUpdateSearch() {
      const res = await DeviceUpdateSearch(this.form)
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate, // 验证时间
        prop: 'repair_code', // 排序字段
        order: 'desc', // 排序字段
        page: 1, // 第几页
        rows: 20 // 每页多少条
      }

      const res = await DeviceUpdateSearch(data)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
@@ -452,12 +532,6 @@
      this.form.vrifcatdate = ''
      this.getDeviceUpdateSearch()
    },

    // 新增按钮
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // 修改按钮
    async edit(operation, row) {
      this.operation = operation
@@ -466,35 +540,86 @@
      const { data: res } = await DeviceUpdateSubSearch({ repair_code: row.repair_code })
      this.dialogData1 = res.data1
      this.dialogData2 = res.data2
      this.isResult = row.verify_result

      // 设备报修图片集合
      if (this.dialogData1.faultimage) {
        this.dialogData1.faultimage.forEach(item => {
          this.pictureUrlAll.push(
            { url: this.baseUrl + item.img1url, name: '设备报修/故障图片' }
          )
        })
      }
      // 设备维修图片集合
      if (this.dialogData2.repairimage) {
        this.dialogData2.repairimage.forEach(item => {
          this.pictureUrlAll.push(
            {
              url: item.img1url ? this.baseUrl + item.img1url : this.baseUrl + item.img2url,
              name: item.img1url ? '设备维修/故障图片' : '设备维修/备件图片'
            }
          )
        })
      }
    },
    handlePictureCardPreview(url) {
    handlePictureCardPreview(url, name) {
      this.pictureVisible = true
      this.pictureUrl = url
      this.pictureName = name
    },
    arrowLeftClick(pictureUrl, pictureName) {
      this.pictureUrlAll.forEach((item, index) => {
        if (item.url === pictureUrl) {
          this.pictureUrl = this.pictureUrlAll[index - 1].url
          this.pictureName = this.pictureUrlAll[index - 1].name
        }
      })
    },
    arrowRightClick(pictureUrl, pictureName) {
      this.pictureUrlAll.forEach((item, index) => {
        if (item.url === pictureUrl) {
          this.pictureUrl = this.pictureUrlAll[index + 1].url
          this.pictureName = this.pictureUrlAll[index + 1].name
        }
      })
    },
    pictureHandleClose() {
      this.pictureUrl = ''
      this.pictureName = ''
    },
    // 对话框关闭事件
    handleClose() {
      this.dialogData1 = {}
      this.dialogData2 = {}
      this.isResult = ''
      this.pictureUrlAll = []
    },
    async download() {
      // let tempDate = this.form.repairdate
      // if (tempDate.length > 0) {
      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      // }
      // const data = {
      //   wkshopcode: this.form.wkshopcode,
      //   eqpcode: this.form.eqpcode,
      //   eqpname: this.form.eqpname,
      //   stanedname: this.form.stanedname,
      //   repairuser: this.form.repairuser,
      //   repairdate: tempDate,
      //   repairresult: this.form.repairresult
      // }
      // const { data: res } = await DeviceUpdateOutExcel(data)
      // window.location.href = res
      let reportdate = this.form.reportdate
      if (reportdate.length > 0) {
        reportdate = handleDatetime(reportdate[0]) + '~' + handleDatetime(reportdate[1])
      }
      let repairdate = this.form.repairdate
      if (repairdate.length > 0) {
        repairdate = handleDatetime(repairdate[0]) + '~' + handleDatetime(repairdate[1])
      }
      let vrifcatdate = this.form.vrifcatdate
      if (vrifcatdate.length > 0) {
        vrifcatdate = handleDatetime(vrifcatdate[0]) + '~' + handleDatetime(vrifcatdate[1])
      }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        eqpcode: this.form.eqpcode, // 设备编码
        eqpname: this.form.eqpname, // 设备名称
        reportuser: this.form.reportuser, // 报修人员
        repairuser: this.form.repairuser, // 维修人员
        vrifcatuser: this.form.vrifcatuser, // 验证人员
        reportdate, // 报修时间
        repairdate, // 维修时间
        vrifcatdate // 验证时间
      }
      const { data: res } = await DeviceUpdateOutExcel(data)
      window.location.href = res
    },
    // 对话框取消
    dialogVisibleCancel() {