From 6909c00e1010683bbdfa6237c1bebafcfa28fb9d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 25 二月 2023 13:53:51 +0800
Subject: [PATCH] 1.质检方案 静态实现50%
---
src/views/sbgl/wxjl.vue | 144 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 120 insertions(+), 24 deletions(-)
diff --git a/src/views/sbgl/wxjl.vue b/src/views/sbgl/wxjl.vue
index 8fd105b..2d549ea 100644
--- a/src/views/sbgl/wxjl.vue
+++ b/src/views/sbgl/wxjl.vue
@@ -2,7 +2,7 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
- <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ <el-button v-waves type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
</div>
<div class="bodyTopFormGroup">
@@ -11,10 +11,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿"style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -33,7 +33,7 @@
<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="缁翠慨浜哄憳" 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;">
@@ -67,7 +67,6 @@
</el-form-item>
<el-form-item
v-show="isExpandForm"
- label-width="70px"
label="楠岃瘉鏃堕棿"
style=" display: flex;align-items: center"
>
@@ -84,9 +83,9 @@
/>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
<div
@@ -131,6 +130,7 @@
<el-table-column
prop="repair_code"
label="缁翠慨鍗曞彿"
+ show-tooltip-when-overflow
min-width="160"
sortable="custom"
/>
@@ -159,28 +159,33 @@
prop="request_person"
label="鎶ヤ慨浜�"
sortable="custom"
+ show-tooltip-when-overflow
width="100"
/>
<el-table-column
prop="request_date"
label="鎶ヤ慨鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="repair_person"
label="缁翠慨浜�"
+ show-tooltip-when-overflow
width="100"
sortable="custom"
/>
<el-table-column
prop="repair_date"
label="缁翠慨瀹屾垚鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="cycleDate"
+ show-tooltip-when-overflow
label="缁翠慨鏃堕暱"
width="120"
sortable="custom"
@@ -193,11 +198,13 @@
prop="verify_person"
label="楠岃瘉浜�"
width="100"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="verify_date"
label="楠岃瘉鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -205,15 +212,16 @@
prop="verify_result"
label="楠岃瘉缁撴灉"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
<div v-if="row.verify_result==='閫氳繃'" style="display: flex;align-items: center">
- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
閫氳繃
</div>
<div v-if="row.verify_result==='涓嶉�氳繃'" style="display: flex;align-items: center">
- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />
+ <i class="el-icon-info" style="margin-right: 2px" />
涓嶉�氳繃
</div>
</template>
@@ -226,7 +234,8 @@
<template slot-scope="{row}">
<i
class="el-icon-tickets"
- style="cursor: pointer;color: #42b983;margin-right: 15px"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
@click="edit('edit',row)"
/>
</template>
@@ -246,6 +255,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
title="缁翠慨鏄庣粏"
:visible.sync="dialogVisible"
width="800px"
@@ -256,7 +266,7 @@
>
<div style="font-size:16px;">
<div style="margin-bottom: 20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧鎶ヤ慨淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧鎶ヤ慨淇℃伅锛�
</div>
<div style="display: flex;flex-direction: column;margin-left: 40px">
<div style="margin-bottom: 10px">鏁呴殰鏉ユ簮锛歿{ dialogData1.faultsource }}</div>
@@ -267,13 +277,13 @@
style="width: 100px;margin-right: 10px"
:src="baseUrl+item.img1url"
alt=""
- @click="handlePictureCardPreview(baseUrl+item.img1url)"
+ @click="handlePictureCardPreview(baseUrl+item.img1url,'璁惧鎶ヤ慨/鏁呴殰鍥剧墖')"
>
</div>
</div>
</div>
<div style="margin-bottom: 20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧缁翠慨淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧缁翠慨淇℃伅锛�
</div>
<div style="display: flex;flex-direction: column;margin-left: 40px">
<div style="margin-bottom: 10px">鏁呴殰鎻忚堪锛歿{ dialogData2.faultdescr }}</div>
@@ -283,7 +293,7 @@
style="width: 100px;margin-right: 10px"
:src="baseUrl+item.img1url"
alt=""
- @click="handlePictureCardPreview(baseUrl+item.img1url)"
+ @click="handlePictureCardPreview(baseUrl+item.img1url,'璁惧缁翠慨/鏁呴殰鍥剧墖')"
>
</div>
</div>
@@ -296,16 +306,28 @@
style="width: 100px;margin-right: 10px"
:src="baseUrl+item.img2url"
alt=""
- @click="handlePictureCardPreview(baseUrl+item.img2url)"
+ @click="handlePictureCardPreview(baseUrl+item.img2url,'璁惧缁翠慨/澶囦欢鍥剧墖')"
>
</div>
</div>
</div>
<div style="margin-bottom: 20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 璁惧缁翠慨楠岃瘉淇℃伅锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 璁惧缁翠慨楠岃瘉淇℃伅锛�
</div>
<div style="display: flex;flex-direction: column;margin-left: 40px">
- <div style="margin-bottom: 10px">楠岃瘉缁撴灉锛歿{ isResult }}</div>
+ <div style="margin-bottom: 10px;display: flex;">楠岃瘉缁撴灉锛�
+
+ <i
+ v-if="isResult==='閫氳繃'"
+ class="el-icon-success"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right: 2px"
+ />
+ <i v-if="isResult==='涓嶉�氳繃'" class="el-icon-info" style="margin-right: 2px" />
+
+ {{ isResult }}
+ </div>
+
</div>
</div>
<!-- 鍥剧墖棰勮瀵硅瘽妗�-->
@@ -316,18 +338,46 @@
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:$store.state.settings.theme}" /> {{ 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:$store.state.settings.theme}"
+ style="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:$store.state.settings.theme}"
+ style="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>
+ <el-button v-waves @click="pictureVisible=false">杩� 鍥�</el-button>
</div>
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">杩� 鍥�</el-button>
- <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
@@ -351,12 +401,15 @@
import { handleDatetime } from '@/utils/global'
import { DeviceUpdateOutExcel, DeviceUpdateSearch, DeviceUpdateSubSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'Zzjg',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -387,10 +440,12 @@
isResult: '', // 楠岃瘉缁撴灉
operation: '',
- baseUrl: 'http://121.196.36.24:8001/', // 鍥剧墖棰勮鍦板潃鍓嶇紑
+ baseUrl: '', // 鍥剧墖棰勮鍦板潃鍓嶇紑
pictureVisible: false, // 鍥剧墖棰勮瀵硅瘽妗�
pictureUrl: '', // 鍥剧墖棰勮Url
+ pictureName: '', // 鍥剧墖棰勮鍚嶇О
+ pictureUrlAll: [], // 鍥剧墖棰勮鍦板潃鐨勬墍鏈塙rl
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
@@ -411,6 +466,8 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ this.baseUrl = process.env.VUE_APP_BASE_API_FILE
},
methods: {
handleRequest() {
@@ -506,19 +563,58 @@
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 reportdate = this.form.reportdate
--
Gitblit v1.9.3