冲突

Your Name

2022-08-17 2475c65a3c091cee4fe48f49e0f53697403750df

冲突

 src/views/intellectInspect/intelligentLine/index.vue

@@ -23,7 +23,9 @@
                <div class="line-map" v-if="dataList && dataList.length > 0">
                    <div class="line-item" v-for="(item, index) in dataList" :key="index">
                        <div class="picbox">
                            <img src="../../../assets/loginPage/equipment.jpg" />
                        <div class="imgbox">
                            <img :src="item.rfidImage==null?defaultImg:item.rfidImage"/>
                        </div>
                            <p>
                                RFID: <span>{{ item.rfid }}</span>
                            </p>
@@ -32,7 +34,7 @@
                            </p>
                        </div>
                        <div class="area-head">
                            <div class="indicator" :class="item.points.some((e) => e.reportResult == 1) ? 'somewarning' : item.points.some((e) => e.reportResult == null) ? 'someUndone' : ''">
                        <div class="indicator" :class="item.points.some((e) => e.reportResult == 1) ? 'somewarning' : (item.points.some((e) => e.reportResult == null) ? 'someUndone' : '')">
                                <div class="indi-dot"></div>
                                <!--              <div class="indi-pulse"></div>-->
                                <!--              <div class="indi-pulse1"></div>-->
@@ -94,7 +96,6 @@
import { ElTable } from 'element-plus';
import { FormInstance, FormRules, ElMessage } from 'element-plus';
import { useUserInfo } from '/@/stores/userInfo';
import Cookies from 'js-cookie';

// 定义接口来定义对象的类型
interface stateType {
@@ -104,7 +105,7 @@
    socket: any;
    socketData: string;
    data: Array<any>;
    id: string;
    id: string
}
export default {
    name: 'intelligentLine',
@@ -127,10 +128,10 @@
            setInterval(() => {
                state.present = new Date().toLocaleString();
            }, 1000);
            let curId = route.query.id;
            state.id = curId.toString();
            getLine(state.id);
            getUrl(state.id);
            let curId = route.query.id
            state.id = curId.toString()
            getLine(state.id)
            getUrl(state.id)
        });

        const dataList = computed(() => {
@@ -142,15 +143,15 @@
        const getUrl = async (id: string) => {
            const res = await lineApi().getUrl();
            if (res.data.code === '200') {
                state.path = 'http://' + res.data.data.ip + ':' + res.data.data.port + '/ws/test/';
                state.path = 'http://' + res.data.data.ip + ':' + res.data.data.port + '/ws/test/'
                if (typeof WebSocket === 'undefined') {
                    alert('您的浏览器不支持socket');
                } else {
                    // 实例化socket
                    // debugger
                    let uid = userInfos.value.uid.toString();
                    var url = state.path + Cookies.get('uid') + '*' + id;
                    console.log(url, 'url', uid, 'uid');
                    let uid =  userInfos.value.uid.toString()
                    var url = state.path + uid + '*' + id;
                    console.log(url,'url',uid,'uid')
                    url = url.replace('https', 'ws').replace('http', 'ws');
                    console.log(url, '获取地址');
                    state.socket = new WebSocket(url);
@@ -165,7 +166,7 @@
                    // 监听socket消息
                    state.socket.onmessage = (msg) => {
                        if (msg.data === '连接成功') return;
                        console.log(msg.data, 'data');
                        console.log(msg.data,'data')
                        userInfos.value.dataList = JSON.parse(msg.data);
                    };
                }
@@ -175,7 +176,7 @@
                    message: res.data.msg
                });
            }
        };
        }

        // const send = () => {
        //     state.socket.send(params);
@@ -222,7 +223,7 @@
                state.socket.onclose = () => {
                    console.log('socket已经关闭');
                };
            });
            })
        });
        return {
            dataList,
@@ -978,6 +979,7 @@
            align-items: flex-start;

            .line-item {

                .area-head {
                    position: relative;
                    width: 100%;
@@ -1109,7 +1111,7 @@
                    }
                    .fadeLine {
                        width: 100%;
                        border-top: 1px solid rgba(54, 252, 252, 0.6);
                        border-top: 1px solid rgba(54,252,252,.6);
                    }
                }
                .fadeBorder {