Merge remote-tracking branch 'origin/master'

Admin

2022-08-17 3c8ada71c2f06f4c43e25e16a9717dc96caa9f5a

 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>