From 7257363fabc7b4f11fb5dfa1a553b1bc6f89bd02 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 七月 2024 16:14:39 +0800
Subject: [PATCH] 检验任务-k检验值输入不进去
---
src/components/do/a6-device/operation-overview.vue | 13 ++++
src/components/view/a6-device.vue | 108 +++++++++++++++++++++++++++++++++++-
static/js/worker.js | 2
src/main.js | 8 +-
src/components/do/b1-inspect-order-plan/Inspection.vue | 24 +++++---
src/components/do/a6-device/files.vue | 8 ++
src/components/do/a6-device/check-and-accept.vue | 8 ++
7 files changed, 154 insertions(+), 17 deletions(-)
diff --git a/src/components/do/a6-device/check-and-accept.vue b/src/components/do/a6-device/check-and-accept.vue
new file mode 100644
index 0000000..322eab3
--- /dev/null
+++ b/src/components/do/a6-device/check-and-accept.vue
@@ -0,0 +1,8 @@
+<!--
+ * @Author: licp lichunping@guanfang.com.cn
+ * @Date: 2024-07-29 15:44:19
+ * @LastEditors: licp lichunping@guanfang.com.cn
+ * @LastEditTime: 2024-07-29 16:11:59
+ * @FilePath: \center-lims-before\src\components\do\a6-device\check-and-accept.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
diff --git a/src/components/do/a6-device/files.vue b/src/components/do/a6-device/files.vue
new file mode 100644
index 0000000..96e1efa
--- /dev/null
+++ b/src/components/do/a6-device/files.vue
@@ -0,0 +1,8 @@
+<!--
+ * @Author: licp lichunping@guanfang.com.cn
+ * @Date: 2024-07-29 15:43:42
+ * @LastEditors: licp lichunping@guanfang.com.cn
+ * @LastEditTime: 2024-07-29 15:43:48
+ * @FilePath: \center-lims-before\src\components\do\a6-device\files.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
diff --git a/src/components/do/a6-device/operation-overview.vue b/src/components/do/a6-device/operation-overview.vue
new file mode 100644
index 0000000..390d388
--- /dev/null
+++ b/src/components/do/a6-device/operation-overview.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>杩愯鎬昏</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index db673ff..a9c309d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2186,8 +2186,7 @@
conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
a.template.forEach( b => {
- if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
- .length === 4)) {
+ if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc).length === 4)) {
count1++
b.v.v = count1
}
@@ -2195,12 +2194,14 @@
b.v.v = this.getAsk(b.i)
}
if (b.v.ps != undefined && typeof b.v.ps.value ==='string'&&b.v.ps.value.includes('妫�楠屽��')) {
- b.v.v = ''
+ this.$set(b.v, 'v','' )
+ // b.v.v = ''
b.u = ''
b.i && this.param[b.i].insValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁＄畻鍊�') {
- b.v.v = ''
+ this.$set(b.v, 'v','' )
+ // b.v.v = ''
b.i && this.param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
@@ -2570,11 +2571,16 @@
return sum
},
handleInput (n) {
- n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
- n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
- n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
- n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
- n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
+ try {
+ n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
+ n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+ n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
+ } catch (error) {
+ console.log(error);
+ }
+
},
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
diff --git a/src/components/view/a6-device.vue b/src/components/view/a6-device.vue
index 1b660a4..2ea9f0b 100644
--- a/src/components/view/a6-device.vue
+++ b/src/components/view/a6-device.vue
@@ -2,17 +2,87 @@
<div class="device-page">
<div class="device-left">
<el-input placeholder="杈撳叆璁惧鍚嶇О" suffix-icon="el-icon-search" v-model="search" size="small"
- style="margin-bottom: 5px;" clearable></el-input>
+ @keyup.enter="handleSearch"
+ style="margin-bottom: 5px;" clearable @change="handleSearch"></el-input>
+ <ul v-loading="loading">
+ <li v-for="(item,index) in 28" :title="item" :class="{active:index==current}" @click="getCurrentDevice(item,index)">璁惧鍒楄〃璁惧鍒楄〃璁惧鍒楄〃璁惧鍒楄〃</li>
+ </ul>
</div>
- <div class="device-right"></div>
+ <div class="device-right">
+ <el-radio-group v-model="currentPage" size="small">
+ <el-radio-button :label="item.id" v-for="(item,index) in tabList" :key="index"
+ size="small">{{ item.title }}</el-radio-button>
+ </el-radio-group>
+ <div class="device-right-content">
+ <component :is="currentPage"></component>
+ </div>
+ </div>
</div>
</template>
<script>
+import operationOverview from '../do/a6-device/operation-overview.vue';
export default {
+ components:{
+ operationOverview,
+ },
data(){
return {
- search:''
+ search:'',
+ current:0,
+ loading:false,
+ tabList:[
+ {
+ id:'operationOverview',
+ title:'璁惧杩愯鎬昏',
+ },
+ {
+ id:1,
+ title:'璁惧妗ｆ',
+ },
+ {
+ id:2,
+ title:'璁惧楠屾敹',
+ },
+ {
+ id:3,
+ title:'璁惧鏍″噯',
+ },
+ {
+ id:4,
+ title:'璁惧鏍告煡',
+ },
+ {
+ id:5,
+ title:'璁惧缁存姢',
+ },
+ {
+ id:6,
+ title:'璁惧鍊熺敤',
+ },
+ {
+ id:7,
+ title:'璁惧鏁呴殰',
+ },
+ {
+ id:8,
+ title:'浣跨敤璁板綍',
+ },
+ {
+ id:9,
+ title:'璁惧鍋滅敤/鍚敤',
+ },
+ ],
+ currentPage:'operationOverview'
+ }
+ },
+ methods:{
+ handleSearch(m){
+ // this.loading = true;
+ },
+ getCurrentDevice(item,index){
+ this.current = index;
+ this.currentPage = 'operationOverview';
}
}
}
@@ -31,10 +101,42 @@
background: #fff;
margin-right: 10px;
border-radius: 16px;
+ box-sizing: border-box;
+ padding: 10px 16px;
+}
+.device-left ul{
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ font-size: 14px;
+ color: #999999;
+ cursor: pointer;
+ margin-top: 10px;
+ height: calc(100% - 46px);
+ overflow-y: scroll;
+}
+.device-left ul li{
+ white-space: nowrap; /* 绂佹鎹㈣ */
+ overflow: hidden; /* 闅愯棌婧㈠嚭鐨勬枃鏈� */
+ text-overflow: ellipsis; /* 鐢ㄧ渷鐣ュ彿琛ㄧず婧㈠嚭鐨勬枃鏈� */
+ padding: 3px 0;
+
+}
+.device-left ul li:hover{
+ color: #3A7BFA;
+}
+.device-left ul li.active{
+ color: #3A7BFA;
}
.device-right{
background: #fff;
flex: 1;
border-radius: 16px;
+ box-sizing: border-box;
+ padding: 10px 16px;
+}
+.device-right-content{
+ margin-top: 10px;
+ height: calc(100% - 42px);
}
</style>
diff --git a/src/main.js b/src/main.js
index 01126d7..5009ba5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,12 +15,12 @@
Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
-// Vue.prototype.PROJECT = '瑁呭鐢电紗'
+// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.92.249:8001';
+// const javaApi = 'http://192.168.92.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -32,7 +32,7 @@
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-// const javaApi = 'http://10.16.173.59:8001';
+const javaApi = 'http://10.16.173.59:8001';
// const javaApi = 'http://192.168.92.249:8001';
Vue.prototype.HaveJson = (val) => {
diff --git a/static/js/worker.js b/static/js/worker.js
index e6e931f..beba853 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -857,7 +857,7 @@
} else if (isPoint) {
return str.replace('ABS', '').replace(/\(|\)/g, '')
}else {
- // console.log('str', str,eval(str))
+ // console.log('str', str)
return eval(str)
}
} catch (error) {
--
Gitblit v1.9.3