From f2ea5740f50afcbcf59cf27198fe127843db05f1 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 14 二月 2025 17:24:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/system/tijian/index.vue | 6 ++----
src/views/system/comp/index.vue | 6 ++++++
src/views/sampling/sampling/index.vue | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 4091737..925f7e6 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -21,10 +21,10 @@
</el-select>
</el-form-item>
<!-- <el-form-item label="鏄惁閲囨牱" prop="isSignFor">
- <el-select style="width:100px" v-model="queryParams.isSignFor" placeholder="鏄惁閲囨牱">
+ <el-select1 style="width:100px" v-model="queryParams.isSignFor" placeholder="鏄惁閲囨牱">
<el-option v-for="dict in dict.type.sampling_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
- </el-select>
+ </el-select1>
</el-form-item> -->
<!-- <el-form-item label="浣撴鏃堕棿" prop="tjTime">
<el-date-picker clearable v-model="queryParams.tjTime" type="date" value-format="yyyy-MM-dd"
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 8625a5e..2e9b8d3 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -289,6 +289,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
@@ -368,6 +370,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%" class="btntoleft">
@@ -455,6 +459,8 @@
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">褰撳墠椤圭洰鏉℃暟锛�<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>鏉�</div>
+
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 16%">
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 5faa56e..0ddf8eb 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1862,11 +1862,9 @@
websocket.onmessage = (event) => {
var resultObj = eval("(" + event.data + ")"); // 娉ㄦ剰锛歟val瀛樺湪瀹夊叏闅愭偅锛屽缓璁敤JSON.parse
this.readCardWebSocket(resultObj);
- websocket.close();
+
};
- websocket.onclose = () => {
- alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
- };
+
} else if (res.msg == "Y") {
/* this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
--
Gitblit v1.8.0