feat: 更新生产线配置并优化WebSocket连接
- 移除未使用的生产线组件和配置 - 添加WebSocket URL配置项 - 将WebSocket连接改为使用uni.connectSocket - 添加连接状态日志便于调试
This commit is contained in:
@@ -37,10 +37,10 @@ export default {
|
|||||||
// 产线列表(原Tab列表改造,可外部传入,此处保留默认值)
|
// 产线列表(原Tab列表改造,可外部传入,此处保留默认值)
|
||||||
lineList: [
|
lineList: [
|
||||||
{ name: "科伦普重工-酸轧机组", key: "acidity" },
|
{ name: "科伦普重工-酸轧机组", key: "acidity" },
|
||||||
{ name: "科伦普重工-彩涂机组", key: "paint" },
|
// { name: "科伦普重工-彩涂机组", key: "paint" },
|
||||||
{ name: "科伦普重工-镀锌线一组", key: "zinc1" },
|
{ name: "科伦普重工-镀锌线一组", key: "zinc1" },
|
||||||
{ name: "科伦普重工-镀锌线二组", key: "zinc2" },
|
// { name: "科伦普重工-镀锌线二组", key: "zinc2" },
|
||||||
{ name: "科伦普重工-镀锌线三组", key: "zinc3" },
|
// { name: "科伦普重工-镀锌线三组", key: "zinc3" },
|
||||||
],
|
],
|
||||||
// 当前选中的产线索引(关联picker)
|
// 当前选中的产线索引(关联picker)
|
||||||
currentLineIndex: 0,
|
currentLineIndex: 0,
|
||||||
|
|||||||
@@ -170,6 +170,7 @@ export default {
|
|||||||
this.socketClient = createMeasureSocket({
|
this.socketClient = createMeasureSocket({
|
||||||
type: 'track_measure',
|
type: 'track_measure',
|
||||||
onOpen: () => {
|
onOpen: () => {
|
||||||
|
console.log('初始化socket成功')
|
||||||
this.isConnected = true
|
this.isConnected = true
|
||||||
},
|
},
|
||||||
onClose: () => {
|
onClose: () => {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
// baseUrl: 'http://192.168.31.116:8080',
|
// baseUrl: 'http://192.168.31.116:8080',
|
||||||
baseUrl: 'http://140.143.206.120:8080',
|
baseUrl: 'http://140.143.206.120:8080',
|
||||||
|
wsUrl: 'ws://140.143.206.120:18081',
|
||||||
// baseUrl: 'http://localhost:8080',
|
// baseUrl: 'http://localhost:8080',
|
||||||
// 应用信息
|
// 应用信息
|
||||||
appInfo: {
|
appInfo: {
|
||||||
|
|||||||
@@ -5,10 +5,10 @@
|
|||||||
|
|
||||||
<view class="content-wrapper">
|
<view class="content-wrapper">
|
||||||
<Acidity v-if="active == 0"/>
|
<Acidity v-if="active == 0"/>
|
||||||
<Paint v-else-if="active == 1"/>
|
<!-- <Paint v-else-if="active == 1"/> -->
|
||||||
<Zinc1 v-else-if="active == 2"></Zinc1>
|
<Zinc1 v-else-if="active == 1"></Zinc1>
|
||||||
<Zinc2 v-else-if="active == 3"></Zinc2>
|
<!-- <Zinc2 v-else-if="active == 3"></Zinc2> -->
|
||||||
<Zinc3 v-else-if="active == 4"></Zinc3>
|
<!-- <Zinc3 v-else-if="active == 4"></Zinc3> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -16,24 +16,33 @@ export function createMeasureSocket({
|
|||||||
|
|
||||||
const wsBase = (config.wsUrl || config.baseUrl || '').replace(/^http/, 'ws')
|
const wsBase = (config.wsUrl || config.baseUrl || '').replace(/^http/, 'ws')
|
||||||
const url = `${wsBase}/websocket?type=${type}`
|
const url = `${wsBase}/websocket?type=${type}`
|
||||||
|
console.log(url)
|
||||||
|
|
||||||
function connect() {
|
function connect() {
|
||||||
manualClose = false
|
manualClose = false
|
||||||
socket = new WebSocket(url)
|
// socket = new WebSocket(url)
|
||||||
|
socket = uni.connectSocket({
|
||||||
|
url,
|
||||||
|
success() {
|
||||||
|
console.log('连接成功')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
socket.onopen = () => {
|
console.log(socket)
|
||||||
|
socket.onOpen = () => {
|
||||||
|
console.log('连接成功')
|
||||||
onOpen && onOpen()
|
onOpen && onOpen()
|
||||||
}
|
}
|
||||||
|
|
||||||
socket.onmessage = (evt) => {
|
socket.onMessage = (evt) => {
|
||||||
onMessage && onMessage(evt.data)
|
onMessage && onMessage(evt.data)
|
||||||
}
|
}
|
||||||
|
|
||||||
socket.onerror = (err) => {
|
socket.onError = (err) => {
|
||||||
onError && onError(err)
|
onError && onError(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
socket.onclose = (evt) => {
|
socket.onClose = (evt) => {
|
||||||
onClose && onClose(evt)
|
onClose && onClose(evt)
|
||||||
if (!manualClose) {
|
if (!manualClose) {
|
||||||
setTimeout(connect, 3000)
|
setTimeout(connect, 3000)
|
||||||
|
|||||||
Reference in New Issue
Block a user