From aae37a0534f682cb413c5bce1333820d44214dfc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 10:10:48 +0800
Subject: [PATCH] modified: .env.development modified: src/utils/GlobalClickMixin.js modified: src/views/experiment/inspectionApplication/Viewdetails/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/laboratory/ledger/index.vue
---
src/utils/GlobalClickMixin.js | 14 +++++++-------
.env.development | 2 +-
src/views/laboratory/ledger/index.vue | 6 ++++--
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 4 ++--
src/views/inspectionManagement/commissionInspection/index.vue | 23 ++++++++++++++---------
5 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/.env.development b/.env.development
index ab9be2d..16da8f0 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://localhost:1234/'
+VUE_APP_BASE_API = 'http://192.168.65.96:1234/'
diff --git a/src/utils/GlobalClickMixin.js b/src/utils/GlobalClickMixin.js
index 1d5f8aa..6b7752f 100644
--- a/src/utils/GlobalClickMixin.js
+++ b/src/utils/GlobalClickMixin.js
@@ -10,13 +10,13 @@
methods: {
$_handleGlobalClick(event) {
if (event.target.tagName === 'SPAN'||event.target.tagName==='BUTTON') {
- if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){
- return;
- }
- let user=JSON.parse(sessionStorage.getItem('user'));
- if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){
- return;
- }
+ // if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){
+ // return;
+ // }
+ // let user=JSON.parse(sessionStorage.getItem('user'));
+ // if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){
+ // return;
+ // }
// console.log(this.$router.currentRoute);
// console.log(user.role.roleMenuList);
// console.log(event.target.innerText);
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 4799074..9be8f3f 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -174,7 +174,7 @@
id: row.id,
userProId: val
}).then(res => {
- if (res.data) this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
+ this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
})
},
chooseEquipment(val, row) {
@@ -182,7 +182,7 @@
id: row.id,
equipmentId: val[2]
}).then(res => {
- if (res.data) this.$message.success('璁惧鍒嗛厤鎴愬姛')
+ this.$message.success('璁惧鍒嗛厤鎴愬姛')
})
}
}
diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index b6dec7b..cf60294 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div v-if="!showDetail">
+ <div>
<div class="content-main">
<div class="top-bar">
<el-form ref="form" :inline="true" :model="searchData">
@@ -24,19 +24,19 @@
</el-form-item>
</el-form>
<el-form>
- <el-popover placement="left" width="350" trigger="click">
+ <el-popover placement="left" width="400" trigger="click">
<div class="vue_qr_div">
<el-row>
<el-col>
<el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input>
- <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">鐢熸垚</el-button>
- <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">澶嶅埗</el-button>
+ <el-button size="small" type="primary" @click="viewDia=true">鐢熸垚</el-button>
+ <el-button size="small" type="primary" @click="copy">澶嶅埗</el-button>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col v-if="viewId==null">褰撳墠閾炬帴宸茶繃鏈燂紝璇风偣鍑荤敓鎴愭寜閽噸鏂扮敓鎴�</el-col>
<el-col
- v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
+ v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
</el-row>
</div>
<el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
@@ -97,9 +97,6 @@
</div>
</div>
</div>
- </div>
- <div v-else>
- <router-view />
</div>
<el-dialog title="閾炬帴鏃堕暱璁剧疆" :visible.sync="viewDia" width="30%">
<div>
@@ -228,7 +225,15 @@
view: null,
viewId: null,
viewTime: 1,
+ viewTime2: 1,
viewDia: false
+ }
+ },
+ watch:{
+ addReportDialog(newVal){
+ if(newVal === false){
+ this.resetForm("addInspectionForm");
+ }
}
},
created() {
@@ -471,7 +476,7 @@
}).then(res => {
this.view = `${this.vueIp}addCommision/${res.data.id}`
this.viewId = res.data.id
- this.viewTime = res.data.time
+ this.viewTime2 = res.data.time
})
},
getViewId() {
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index 5ce4d90..b2d13b5 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -154,7 +154,7 @@
<span><i class="el-icon-edit" />楠屾敹鏃ユ湡锛歿{ equipmentDetail.acceptanceDate }}</span>
</div>
<div class="message-item">
- <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.name }}</span>
+ <span><i class="el-icon-edit" />淇濈浜猴細{{ equipmentDetail.userName }}</span>
</div>
<div class="message-item">
<span><i class="el-icon-edit" />鏄惁鏀寔鏁伴噰锛歿{ equipmentDetail.whetherDataAcquisition == 1 ? '鏀寔' : '涓嶆敮鎸�'
@@ -777,7 +777,7 @@
this.$message.error('娣诲姞澶辫触')
}
this.$message.success('娣诲姞鎴愬姛')
- let d = this.nodeclicked
+ let d = this.nodeclicked;
this.nodeClickHandler(d);
this.addDrawerVisible = false
this.equipmentform = {}
@@ -787,6 +787,8 @@
try {
const res = await changeInstrument(this.equipmentform)
this.$message.success('淇敼鎴愬姛')
+ let d = this.nodeclicked;
+ this.nodeClickHandler(d);
this.addDrawerVisible = false
this.detailDrawer = false
} catch (error) {
--
Gitblit v1.9.3