From 32472073d74347c90928f3eaea52fb8c5fda9fdc Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 14 二月 2025 18:15:41 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 137 +++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 67 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 06f1247..fc71db1 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -303,14 +303,9 @@
</div>
</el-tab-pane>
<el-tab-pane label="缁勫悎" name="third">
- <!-- <div class="tab3"> -->
<el-row :gutter="20" style="width: 100%">
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
椤圭洰鍒楄〃
</div>
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
@@ -322,12 +317,8 @@
</el-tree>
</div>
</el-col>
- <el-col :span="6">
- <div style="
- text-align: center;
- margin-bottom: 10px;
- margin-top: 10px;
- ">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
@@ -345,6 +336,7 @@
margin-top: 10px;
">
宸查�夐」鐩垪琛�
+
</div>
<el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
@@ -370,50 +362,61 @@
</div>
</el-col>
</el-row>
- <!-- </div> -->
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="second">
- <div class="tab8">
- <div style="width: 500px; float: left; margin-right: 10px;">
- <div style="text-align: center;">椤圭洰鍒楄〃</div>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;"></el-input>
- <div class="tab3" style="overflow: hidden;">
- <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
- node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
- :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
- </el-tree>
- </div>
- </div>
- <div style="width: 400px; float: left; margin: 0 10px;">
- <div style="text-align: center; margin-bottom: 45px;">鏄庣粏椤圭洰鍒楄〃</div>
- <div class="tab3" style="overflow: hidden;">
- <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
- :props="defaultProps" :filter-node-method="filterNode" show-checkbox
- @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
- :render-content="renderContent">
- </el-tree>
- </div>
- </div>
- <div style="width: 500px; float: left;">
- <div style="text-align: center; margin-bottom: 45px;">宸查�夐」鐩垪琛�</div>
- <div style="height: 350px; overflow-y: auto; overflow-x: hidden;">
- <el-table :data="DataList" border style="width: 100%;" height="350" :span-method="objectSpanMethod">
- <el-table-column prop="propinName" label="妫�鏌ラ」鐩�"></el-table-column>
- <el-table-column prop="sl" label="鏁伴噺" width="56px"></el-table-column>
- <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
- <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="220px"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="50px">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" title="鍒犻櫎"></el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
- <div style="clear: both;"></div>
-</div>
- <h3 style="font-weight: 600; text-align: center; margin-top: 40px;">鍚堣锛歿{ marryall }}鍏�</h3>
-</el-tab-pane>
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px;">
+ </el-input>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+ node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6" style="min-width: 200px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+ :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+ @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+ :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+ <el-table-column prop="sl" label="鏁伴噺" width="56px">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -1817,6 +1820,7 @@
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
if (res.code == 200) {
+ console.log(res.msg, 'res.msg');
if (res.msg == "N") {
var websocket = null;
var url = this.valueUrl;
@@ -1856,12 +1860,11 @@
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
websocket.onmessage = (event) => {
- var resultObj = eval("(" + event.data + ")");
+ var resultObj = eval("(" + event.data + ")"); // 娉ㄦ剰锛歟val瀛樺湪瀹夊叏闅愭偅锛屽缓璁敤JSON.parse
this.readCardWebSocket(resultObj);
+
};
- websocket.onclose = function () {
- alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
- };
+
} else if (res.msg == "Y") {
/* this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
@@ -1880,8 +1883,8 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj) {
let _this = this;
-
- if (resultObj.code === 200 && resultObj.data.name != null) {
+ console.log(resultObj, 'resultObj');
+ if (resultObj.code === 200 && resultObj.data.name && resultObj.data.name != null) {
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
_this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
@@ -2025,9 +2028,9 @@
}
}
};
- websocket.onclose = function () {
- alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
- };
+ // websocket.onclose = function () {
+ // alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ // };
websocket.onmessage = function (event) {
var resultObj = JSON.parse(event.data);
_this.form.cusName = resultObj.data.name;
@@ -2119,9 +2122,9 @@
}
}
};
- websocket.onclose = function () {
- alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
- };
+ // websocket.onclose = function () {
+ // alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ // };
websocket.onmessage = function (event) {
var resultObj = JSON.parse(event.data);
_this.form.cusName = resultObj.data.name;
--
Gitblit v1.8.0