更新生产环境的基础URL,优化设备名称匹配逻辑,删除不再使用的文件
已删除1个文件
已修改4个文件
53 ■■■■ 文件已修改
Code Management/WCS/WIDESEAWCS_Client/src/api/http.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/项目图纸/电芯2F图纸与电气编号对照(08项目)/08二楼输送布局点位图1106(4).dwg.bak 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
@@ -20,7 +20,7 @@
}
else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = 'http://192.168.5.251:9291/';
    axios.defaults.baseURL = 'http://192.168.20.251:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue
@@ -21,7 +21,7 @@
const num = reactive([])
onMounted(() => {
  eventBus.on('locationData', eventData => {
    if (eventData.deviceName === "分容3线入库输送线" || eventData.deviceName === "分容出库输送线") {
    if (eventData.deviceName.indexOf("分容") != -1) {
      if (devices.length <= 0) {
        devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
      }
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue
@@ -15,33 +15,32 @@
import DeviceStacker from "@/components/DeviceStacker.vue";
// å †åž›æœº
const Stackers = reactive([]);
var  i=0;
var i = 0;
// è®¾å¤‡åˆ—表(修改重复设备名称)
const devices = reactive([]);
const num = reactive([])
onMounted(() => {
  eventBus.on('stackerData', eventData => {
  eventBus.on('locationData', eventData => {
    // console.log(eventData)
      console.log(eventData)
    if (eventData.deviceName === "老化入库输送线") {
    if (devices.length <= 0) {
    console.log(eventData)
    if (eventData.deviceName.indexOf("老化") != -1) {
      if (devices.length <= 0) {
        devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
      }
      else {
        const device = devices.find(c => c.childDeviceCode == eventData.data.childDeviceCode)
        if(device){
        if (device) {
          device.data = eventData.data
        }else{
        } else {
          devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
        }
      }
    }
  })
  eventBus.on('stackerData', eventData => {
    if (eventData.deviceName == "老化1号堆垛机") {
    if (eventData.deviceName.indexOf("老化") != -1) {
      if (Stackers.length == 0) {
        Stackers.push({ deviceName: eventData.deviceName, data: eventData.data });
      }
@@ -58,6 +57,4 @@
  })
})
</script>
<style scoped>
</style>
<style scoped></style>
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue
@@ -15,33 +15,33 @@
import DeviceStacker from "@/components/DeviceStacker.vue";
// å †åž›æœº
const Stackers = reactive([]);
var  i=0;
var i = 0;
// è®¾å¤‡åˆ—表(修改重复设备名称)
const devices = reactive([]);
const num = reactive([])
onMounted(() => {
  eventBus.on('locationData', eventData => {
    // console.log(eventData)
      console.log(eventData)
    if (eventData.deviceName === "常温入库输送线") {
    if (devices.length <= 0) {
    console.log(eventData)
    if (eventData.deviceName.indexOf("常温") != -1) {
      if (devices.length <= 0) {
        devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
      }
      else {
        const device = devices.find(c => c.childDeviceCode == eventData.data.childDeviceCode)
        if(device){
        if (device) {
          device.data = eventData.data
        }else{
        } else {
          devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
        }
      }
    }
  })
  eventBus.on('stackerData', eventData => {
    if (eventData.deviceName.indexOf("常温")) {
    if (eventData.deviceName.indexOf("常温") != -1) {
      if (Stackers.length == 0) {
        Stackers.push({ deviceName: eventData.deviceName, data: eventData.data });
      }
@@ -58,6 +58,4 @@
  })
})
</script>
<style scoped>
</style>
<style scoped></style>
ÏîÄ¿×ÊÁÏ/ÏîĿͼֽ/µçо2FͼֽÓëµçÆø±àºÅ¶ÔÕÕ£¨08ÏîÄ¿£©/08¶þÂ¥ÊäËͲ¼¾Öµãλͼ1106(4).dwg.bak
Binary files differ