From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/sbgl/wxjl.vue | 239 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 182 insertions(+), 57 deletions(-)
diff --git a/src/views/sbgl/wxjl.vue b/src/views/sbgl/wxjl.vue
index d24301a..52d730f 100644
--- a/src/views/sbgl/wxjl.vue
+++ b/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">楠岃瘉缁撴灉锛歺xx</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: [], // 鍥剧墖棰勮鍦板潃鐨勬墍鏈塙rl
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() {
--
Gitblit v1.9.3