Merge branch 'dev' into feature-electrophoresis

src/views/DeviceRunning/DeviceFaultRecord/list.vue

@@ -97,7 +97,7 @@
                 this.searchList = searchValue
                 this.tableConfig.paginationConfig.currentPage = 1
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 点击搜索组件重置按钮
             doResetClick (searchValue) {
@@ -105,7 +105,7 @@
                 this.tableConfig.paginationConfig.currentPage = 1
                 this.tableConfig.paginationConfig.pageSize = 20
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 获取表格数据
             getTableList () {
@@ -136,13 +136,13 @@
                 this.tableConfig.paginationConfig.currentPage = 1
                 this.tableConfig.paginationConfig.pageSize = pageSize
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 当前分页页数发生了变化
             onCurrentChange (currentPage) {
                 this.tableConfig.paginationConfig.currentPage = currentPage
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             }
         },
         mounted () {

src/views/DeviceRunning/DeviceRunningTime/list.vue

@@ -68,7 +68,7 @@
             // 点击刷新按钮
             doRefreshClick () {
                 // 获取表格数据
-                this.getTableLIst().then(response => {
+                this.getTableList().then(response => {
                     this.$message.success('刷新成功！')
                 })
             },
@@ -77,7 +77,7 @@
                 this.searchList = searchValue
                 this.tableConfig.paginationConfig.currentPage = 1
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 点击搜索组件重置按钮
             doResetClick (searchValue) {
@@ -85,10 +85,10 @@
                 this.tableConfig.paginationConfig.currentPage = 1
                 this.tableConfig.paginationConfig.pageSize = 20
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 获取表格数据
-            getTableLIst () {
+            getTableList () {
                 let queryParams = {
                     searchCode: this.searchList.searchCode || 'MACHINE_RUNTIME_RECORD',
                     filters: this.searchList.filters || [],
@@ -100,7 +100,7 @@
                         if (response.list.length === 0 && response.pageNum !== 1) {
                             this.tableConfig.paginationConfig.currentPage -= 1
                             // 获取表格数据
-                            this.getTableLIst()
+                            this.getTableList()
                         } else {
                             this.tableConfig.data = _.cloneDeep(response.list)
                             this.tableConfig.paginationConfig.total = _.cloneDeep(response.total)
@@ -116,20 +116,20 @@
                 this.tableConfig.paginationConfig.currentPage = 1
                 this.tableConfig.paginationConfig.pageSize = pageSize
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             },
             // 当前分页页数发生了变化
             onCurrentChange (currentPage) {
                 this.tableConfig.paginationConfig.currentPage = currentPage
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             }
         },
         mounted () {
             setTimeout(() => {
                 this.tableConfig.height = document.querySelector('.page-pack').offsetHeight - 180
                 // 获取表格数据
-                this.getTableLIst()
+                this.getTableList()
             }, 0)
         }
     }

src/views/Monitor/components/Tooltip.vue

 <template>
     <div
         class="tooltip"
-        ref="tooltip"
-    >
-        <p><span>销售订单号: </span><span>{{ query.saleOrderNo }}</span></p>
-        <p><span>主计划工单号: </span><span>{{ query.planOrderNo }}</span></p>
-        <p><span>车间计划工单号: </span><span>{{ query.code }}</span></p>
-        <p><span>车型: </span><span>{{ query.busType }}</span></p>
-        <p><span>订单数量: </span><span>{{ query.orderSize }}</span></p>
-        <p><span>单位: </span><span>{{ query.unit }}</span></p>
-        <p><span>车间: </span><span>{{ query.shop }}</span></p>
-        <p><span>产线: </span><span>{{ query.line }}</span></p>
+        ref="tooltip">
+        <p>
+            <span>销售订单号: </span>
+            <span>{{ carStationInfo.hasOwnProperty('saleOrderNo') && carStationInfo.saleOrderNo !== null ? carStationInfo.saleOrderNo : '暂无' }}</span>
+        </p>
+        <p>
+            <span>主计划工单号: </span>
+            <span>{{ carStationInfo.hasOwnProperty('planOrderNo') && carStationInfo.planOrderNo !== null ? carStationInfo.planOrderNo : '暂无' }}</span>
+        </p>
+        <p>
+            <span>车间计划工单号: </span>
+            <span>{{ carStationInfo.hasOwnProperty('code') && carStationInfo.code !== null ? carStationInfo.code : '暂无' }}</span>
+        </p>
+        <p>
+            <span>车型: </span>
+            <span>{{ carStationInfo.hasOwnProperty('busType') && carStationInfo.busType !== null ? carStationInfo.busType : '暂无' }}</span>
+        </p>
+        <p>
+            <span>订单数量: </span>
+            <span>{{ carStationInfo.hasOwnProperty('orderSize') && carStationInfo.orderSize !== null ? carStationInfo.orderSize : '暂无' }}</span>
+        </p>
+        <p>
+            <span>单位: </span>
+            <span>{{ carStationInfo.hasOwnProperty('unit') && carStationInfo.unit !== null ? carStationInfo.unit : '暂无' }}</span>
+        </p>
+        <p>
+            <span>车间: </span>
+            <span>{{ carStationInfo.hasOwnProperty('shop') && carStationInfo.shop !== null ? carStationInfo.shop : '暂无' }}</span>
+        </p>
+        <p>
+            <span>产线: </span>
+            <span>{{ carStationInfo.hasOwnProperty('line') &&  carStationInfo.line !== null ? arStationInfo.line : '暂无' }}</span>
+        </p>
         <!-- <p><span>计划完工时间: </span><span>{{ query.saleOrderNo }}</span></p> -->
         <div
             class="close-btn"
-            @click="closeTooltip"
-        >
+            @click="closeTooltip">
             <i class="el-icon-circle-close"></i>
         </div>
     </div>
@@ -34,16 +56,17 @@ export default {
     },
     data () {
         return {
-            data: {}
+            carStationInfo: {}
         }
     },
-
     watch: {
-        query (v) {
-            this.data = _.cloneDeep(v)
+        query: {
+            handler (newVal, oldVal) {
+                this.carStationInfo = _.cloneDeep(newVal)
+            },
+            deep: true
         }
     },
-
     methods: {
         closeTooltip () {
             this.$refs.tooltip.style.visibility = 'hidden'