From fd33107c412decf4a72184558354314a9c82e92c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 11:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/view/notice.vue | 2 +-
src/main.js | 8 ++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 2 ++
src/components/view/a6-device-overview.vue | 2 +-
src/components/view/b1-inspect-order-plan.vue | 6 +++---
src/components/view/a6-personnel-overview.vue | 2 +-
src/components/view/index-index.vue | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 5653f45..cb67224 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1653,6 +1653,7 @@
}
}
})
+ console.log(1111,str)
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
@@ -1665,6 +1666,7 @@
.insProduct[i].inspectionItemSubclass==null||this.currentSample
.insProduct[i].inspectionItemSubclass==undefined?'':this.currentSample
.insProduct[i].inspectionItemSubclass
+ console.log(inspectionItemClass, inspectionItem, inspectionItemSubclass)
if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass +inspectionItem+inspectionItemSubclass ===
str) {
ids.push({
diff --git a/src/components/view/a6-device-overview.vue b/src/components/view/a6-device-overview.vue
index 2aeccb3..c2a41c2 100644
--- a/src/components/view/a6-device-overview.vue
+++ b/src/components/view/a6-device-overview.vue
@@ -152,7 +152,7 @@
</div>
</div>
<div class="table" v-loading="loading">
- <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||loading">
+ <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
<ul class="card">
<li v-for="(m,i) in list" :key="i">
<el-image class="img" :src="javaApi+'/img/'+m.imageUpload">
diff --git a/src/components/view/a6-personnel-overview.vue b/src/components/view/a6-personnel-overview.vue
index be6ce03..b4aa372 100644
--- a/src/components/view/a6-personnel-overview.vue
+++ b/src/components/view/a6-personnel-overview.vue
@@ -91,7 +91,7 @@
</div>
</div>
<div class="table" v-loading="loading">
- <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||loading">
+ <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
<ul class="card" style="margin-top: 10px;">
<li v-for="(m,i) in list" :key="i">
<el-image style="width: 80px;
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 50b9edb..22dc87d 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -233,9 +233,9 @@
font: '妫�楠�',
type: 'text',
method: 'handleInspection',
- disabFun: (row, index) => {
- return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
- }
+ // disabFun: (row, index) => {
+ // return row.userId == null || row.insState == 3 || row.insState == 5||JSON.parse(localStorage.getItem("user")).name != row.userName
+ // }
// disabFun: (row, index) => {
// return row.userId == null || row.insState == 3 || row.insState == 5
// }
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 288e95b..465a45c 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -378,7 +378,7 @@
<div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==5}" @click="currentIndex=5">閫氱煡閫氬憡</div>
</div>
<div class="right-3-list" v-loading="listLoading">
- <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>1||listLoading">
+ <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>0||listLoading">
<div class="list3-item" v-for="(m,i) in list" :key="i">
<div class="list3-item-title">
<img src="../../../static/img/index-tip.svg" alt="">
diff --git a/src/main.js b/src/main.js
index defe566..fe3f8d2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,13 +15,13 @@
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';
// 寮狅細192.168.45.249
-const javaApi = 'http://172.20.10.4:8001';
+// const javaApi = 'http://172.20.10.4:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -33,7 +33,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.47.2:8001';
Vue.prototype.HaveJson = (val) => {
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 94e76ef..359ec7b 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -7,7 +7,7 @@
:before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
<div class="notice-content" v-loading="loading">
<el-button size="small" type="primary" @click="handleDropdownAll(1)" style="margin-bottom: 10px;margin-left: 330px;">鍏ㄩ儴宸茶</el-button>
- <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>1||loading">
+ <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>0||loading">
<div
class="notice-content-item"
v-for="(m,i) in list"
--
Gitblit v1.9.3