From a750f21d3be0da35b3a1ef47905b4bbbeac117e8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 18:00:19 +0800
Subject: [PATCH] bug修复
---
.env.development | 2 +-
src/views/experiment/inspectionApplication/index.vue | 8 ++++----
src/views/experiment/planAssignments/plan.vue | 4 ++--
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 10 +++++-----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.env.development b/.env.development
index d00c942..ab9be2d 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.110.107:1234/'
+VUE_APP_BASE_API = 'http://localhost:1234/'
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index a1d8f27..4799074 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -86,20 +86,20 @@
</el-table-column>
<el-table-column prop="required" label="鍐呮帶鍊�">
</el-table-column>
- <el-table-column prop="userName" label="璐ｄ换浜�" width="220px">
+ <el-table-column prop="userId" label="璐ｄ换浜�" width="220px">
<template slot-scope="scope">
- <el-select v-model="scope.row.username" slot="append"
+ <el-select v-model="scope.row.userId" slot="append"
@change="(val)=>chooseUseProId(val, scope.row)">
<el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
:value="item.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="inspectionMaterialId" label="瀹為獙璁惧" width="220px">
+ <el-table-column prop="instrumentId" label="瀹為獙璁惧" width="300px">
<template slot-scope="scope">
- <el-cascader v-model="scope.row.instrumentName" :options="devices"
+ <el-cascader v-model="scope.row.instrumentId" :options="devices"
:props="{label: 'Name',value: 'Id',children: 'childrenList'}"
- @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
+ @change="(val)=>chooseEquipment(val, scope.row)" style="width: 100%;"></el-cascader>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index a3ea6ff..841c940 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -56,11 +56,11 @@
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
<el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
- <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
+ <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="100px">
<template slot-scope="scope">
- <div v-if="scope.row.type === 0"><span>鍘熸潗鏂欐楠�</span></div>
- <div v-if="scope.row.type === 1"><span>濮旀墭妫�楠�</span></div>
- <div v-if="scope.row.type === 2"><span>鎴愬搧妫�楠�</span></div>
+ <div v-if="scope.row.type === 0"><el-tag type="success">鍘熸潗鏂欐楠�</el-tag></div>
+ <div v-if="scope.row.type === 2"><el-tag>濮旀墭妫�楠�</el-tag></div>
+ <div v-if="scope.row.type === 1"><el-tag type="warning">鎴愬搧妫�楠�</el-tag></div>
</template>
</el-table-column>
<el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 5eb0f53..8ec2c74 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -139,7 +139,7 @@
<el-button @click="upDia = false">鍙� 娑�</el-button>
</span>
</el-dialog>
- <el-dialog title="妫�楠�" :visible.sync="upInsDia" width="500px">
+ <el-dialog title="妫�楠�" :visible.sync="upInsDia" width="600px">
<div class="body" style="max-height: 50vh;overflow-y: auto;">
<el-row style="line-height: 46px;">
<el-col :span="5" style="font-size: 14px;text-align: right;">鐢宠鍗曠紪鐮侊細</el-col>
@@ -355,7 +355,7 @@
this.upInsDia = false
this.selectDataList()
this.$confirm(
- `<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
+ `<p style="line-height: 80px">鎮ㄧ殑椤圭洰锛�${this.upData.name}锛夋楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`,
'鎻愪氦鎴愬姛', {
confirmButtonText: '纭畾',
cancelButtonText: '鍏抽棴',
--
Gitblit v1.9.3