From a42bb6f81ac140f191d4fb3980d5564bb0eb063b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 18 八月 2023 18:07:38 +0800
Subject: [PATCH] modified: .env.development modified: .env.production modified: .env.staging modified: src/views/laboratory/measure/Add.vue modified: src/views/laboratory/measure/index.vue
---
.env.staging | 2
.env.development | 2
src/views/laboratory/measure/Add.vue | 113 ++++++++++++++++++++++++++++++++++++-
src/views/laboratory/measure/index.vue | 4
.env.production | 2
5 files changed, 115 insertions(+), 8 deletions(-)
diff --git a/.env.development b/.env.development
index 9ad2460..e363056 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
diff --git a/.env.production b/.env.production
index b6b82fb..64b7d95 100644
--- a/.env.production
+++ b/.env.production
@@ -3,5 +3,5 @@
# base api
# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
diff --git a/.env.staging b/.env.staging
index d5bc70f..4b2b496 100644
--- a/.env.staging
+++ b/.env.staging
@@ -5,6 +5,6 @@
# base api
# VUE_APP_BASE_API = '/stage-api'
-VUE_APP_BASE_API = 'http://192.168.110.87:1234/'
+VUE_APP_BASE_API = 'http://192.168.110.254:1234/'
diff --git a/src/views/laboratory/measure/Add.vue b/src/views/laboratory/measure/Add.vue
index a2f0802..0cf9cd1 100644
--- a/src/views/laboratory/measure/Add.vue
+++ b/src/views/laboratory/measure/Add.vue
@@ -1,10 +1,117 @@
<template>
<div>
- 11112561564564456456
+ <el-col :span="10">
+ <p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
+ </el-col>
+ <el-col>
+ <el-form :model="planAddInfo" style="padding-left: 150px;">
+ <el-form-item>
+ <el-col :span="6" style="display: flex;justify-content: space-around;">
+ <span>璐熻矗浜猴細</span>
+ <el-select v-model="planAddInfo.measurePerson" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
+ <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
+ <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="8" style="display: flex;justify-content: space-around;">
+ <span>璁″垝鏃堕棿锛�</span>
+ <el-date-picker v-model="planAddInfo.planDate" type="daterange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-col>
+ <el-col :span="5"></el-col>
+ <el-col :span="5" style="display: flex;justify-content: space-around;">
+ <span>璁￠噺鍗曚綅锛�</span>
+ <el-input style="width: 150px;" v-model="planAddInfo.unit" placeholder=""></el-input>
+ </el-col>
+ </el-form-item>
+ </el-form>
+ </el-col>
+ <el-col>
+ <el-col style="font-size: 13px;padding-left: 55px;">
+ 璁￠噺淇℃伅
+ </el-col>
+ <el-col>
+ <el-progress style="width: 95%;padding-left: 40px;margin-top: 20px;" :percentage="6" :stroke-width="2"
+ :show-text="false"></el-progress>
+ </el-col>
+ </el-col>
+ <el-col style="width:93%;height: 20vh;margin-top: 30px; margin-left: 40px;">
+ <el-table ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
+ :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+ :data="codePointsTable" style="width: 100%">
+ <el-table-column type="index" label="搴忓彿" min-width="90" />
+ <el-table-column prop="equipmentPointName" label="浠櫒璁惧鍚嶇О" min-width="150">
+ <template slot-scope="scope">
+ <span v-show="!codePointesTableStatus">{{ scope.row.equipmentPoint }}</span>
+ <el-input v-show="codePointesTableStatus" v-model="scope.row.equipmentPoint" />
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="measuringRange" label="娴嬮噺鑼冨洿" min-width="150">
+ <template slot-scope="scope">
+ <span v-show="!codePointesTableStatus">{{ scope.row.measuringRange }}</span>
+ <el-input v-show="codePointesTableStatus" v-model="scope.row.measuringRange" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" min-width="150">
+ <template slot-scope="scope">
+ <span v-show="!codePointesTableStatus">{{ scope.row.unit }}</span>
+ <el-input v-show="codePointesTableStatus" v-model="scope.row.unit" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="descriptiveness" label="鎻忚堪" min-width="200">
+ <template slot-scope="scope">
+ <span v-show="!codePointesTableStatus">{{ scope.row.descriptiveness }}</span>
+ <el-input v-show="codePointesTableStatus" v-model="scope.row.descriptiveness" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="descriptiveness" label="鎿嶄綔" min-width="200">
+ <template slot-scope="scope">
+ <el-tag type="" icon=""></el-tag>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
</div>
</template>
<script>
-export default{
-
+export default {
+ data() {
+ return {
+ planAddInfo: {
+ plannedOrderNumber: 7897897987,
+ measurePerson: '鏌愭煇浜�',
+ planDate: "2021-09-08 ~ 2024-08-09",
+ unit: '鏌愭煇妫�娴嬪眬',
+ createPerson: '鏌愭煇璐熻矗浜�',
+ createTime: '2021-09-08'
+ },
+ codePointsTable: [{
+ id: '',
+ equipmentPointName: '',
+ measuringRange: '',
+ termValidity: "",
+ planDate: null,
+ }],
+ // 鐮佺偣琛ㄦ牸鐨勭姸鎬侊細鏁版嵁灞曠ずfalse/鏂板杈撳叆true
+ codePointesTableStatus: true,
+ }
+ },
+ methods: {
+ // 鏂板璁惧鐮佺偣
+ addNewCodePoints() {
+ //
+ if (!this.codePointsTable) {
+ this.codePointsTable = []
+ }
+ const newObj = {}
+ newObj.equipmentPointName = ''
+ newObj.descriptiveness = ''
+ newObj.unit = ''
+ newObj.instrumentId = this.equipmentDetail.id
+ this.codePointsTable.push(newObj)
+ }
+ }
}
</script>
\ No newline at end of file
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 0330afc..d133f34 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -117,11 +117,11 @@
</div>
</div>
</div>
- <div style="position: absolute;top:14px;left: 9px;transition: 1s;width: 100%;height: 82vh;background-color: #fff;z-index: 21;">
+ <div style="position: absolute;top:14px;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;">
<Add/>
</div>
<div id="myMOdel"
- :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 100%; height: 65vh; background-color: #fff;z-index: 20;`">
+ :style="`position: absolute;transition: 1s;top:${mymodelTop}px; left: 9px; width: 99%; height: 65vh; background-color: #fff;z-index: 20;`">
<el-col :span="10">
<p style="font-size: 13px;padding-left: 40px;">璁″垝淇℃伅</p>
</el-col>
--
Gitblit v1.9.3