From b419be50b2431fe1297709b555a169e502ca3464 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 12 七月 2024 17:11:13 +0800
Subject: [PATCH] 修改分数无效
---
static/js/worker.js | 2 +-
src/view/notice.vue | 2 +-
src/main.js | 4 ++--
src/components/view/a6-device-overview.vue | 2 +-
src/components/view/a6-personnel-overview.vue | 2 +-
src/components/view/index-index.vue | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/view/a6-device-overview.vue b/src/components/view/a6-device-overview.vue
index 60d3d15..2aeccb3 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">
+ <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||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 f546787..be6ce03 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">
+ <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>1||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/index-index.vue b/src/components/view/index-index.vue
index e3ece03..288e95b 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>0">
+ <scroll-pagination @load="getList" :finishLoding="finishLoding" :list="list" v-if="list.length>1||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 d3987dd..421b5e3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,8 +32,8 @@
//瑁呭鐢电紗娴嬭瘯搴�
Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-// const javaApi = 'http://10.16.173.59:8001';
-const javaApi = 'http://192.168.47.2:8001';
+const javaApi = 'http://10.16.173.59:8001';
+// const javaApi = 'http://192.168.47.2:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
diff --git a/src/view/notice.vue b/src/view/notice.vue
index a7cc226..94e76ef 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);">
+ <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>1||loading">
<div
class="notice-content-item"
v-for="(m,i) in list"
diff --git a/static/js/worker.js b/static/js/worker.js
index db988b7..8bcac61 100644
--- a/static/js/worker.js
+++ b/static/js/worker.js
@@ -272,7 +272,7 @@
try {
if(getInspectionValueType(item.i)==1){
let tell = currentSample.insProduct.find(m => m.id == item.i).tell?currentSample.insProduct.find(m => m.id == item.i).tell.split('&'):null;
- isPoint = this.PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
+ isPoint = PROJECT=='瑁呭鐢电紗'&&tell&&tell.length>0&&typeof tell[0] =='string'&&tell[0].includes('/') // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
comResult = compute(item.v.f.replace(/=/g, ' '),comValue, isPoint)
let list3 = list2.map(item=>item+'')
isToExponential = list3.some(val => val.includes('e+'))
--
Gitblit v1.9.3