From b551fe34750b501a66540166d14a1b688c090cd4 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 5 Jul 2024 11:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93-=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E9=A1=B5=E9=9D=A2+=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/outbound/component/DialogPush.vue | 98 +++++++++++++++++++
 .../claimAndreturn/picking/outbound/index.vue | 73 +++++++++++++-
 .../machinery/IOTequipment/index.vue          |  7 ++
 .../machinery/coding/component/BindIOT.vue    |  2 +-
 .../machinery/coding/component/MapDIalog.vue  | 40 +++++---
 .../machinery/coding/index.vue                |  8 +-
 6 files changed, 208 insertions(+), 20 deletions(-)
 create mode 100644 sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue
new file mode 100644
index 00000000..9c09ad00
--- /dev/null
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/component/DialogPush.vue
@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <!-- 弹框: 内容是transfer -->
+    <el-dialog title="请选择接收人员" :visible.sync="open" width="40%" @close="handleClose" append-to-body>
+      <el-transfer
+        class="centered-transfer"
+        :titles="titles"
+        :button-texts="['移除', '添加']"
+        v-model="value"
+        :data="data"
+        filterable
+        filter-placeholder="请输入搜索内容"
+        @change="dataChange"
+      ></el-transfer>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DialogPush',
+  data() {
+    return {
+      value: [], // 已选中的人员
+      // 弹出层标题
+      titles: ['人员列表', '接收人'],
+      open: false, // 是否打开弹框
+      data: [
+        {
+          key: 0,
+          label: '张小刚',
+          disabled: false,
+        },
+        {
+          key: 1,
+          label: '李小明',
+          disabled: false,
+        },
+        {
+          key: 2,
+          label: '王小红',
+          disabled: false,
+        },
+        {
+          key: 3,
+          label: '赵小芳',
+          disabled: false,
+        },
+      ],
+    }
+  },
+  methods: {
+    openDialog() {
+      this.open = true
+      // 清空已选中的人员
+      this.value = []
+      this.getPersonnelList()
+    },
+    // 显隐列初始默认隐藏列
+    handleClose() {
+      this.open = false
+      this.$emit('getList')
+    },
+    // 获取人员列表
+    getPersonnelList() {
+      console.log('🚀 ~ getPersonnelList ~ getPersonnelList:', )
+      // 接口().then(res => {
+      //   this.data = {
+      //     key: res.id,
+      //     label: res.name,
+      //     disabled: false,
+      //  }
+      // })
+      
+    },
+    dataChange() {
+      console.log('🚀 ~ dataChange ~ dataChange:', this.value)
+    },
+    submit() {
+      console.log('🚀 ~ submit ~ submit:', this.value)
+
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.centered-transfer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 75088a6a..83c9fbd1 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -92,6 +92,16 @@
                     v-hasPermi="['picking:outbound:export']"
                     >导出</el-button
                 >
+                <!-- 推送 -->
+                <el-button
+                    type="primary"
+                    plain
+                    size="mini"
+                    @click="handlePush"
+                    v-hasPermi="['picking:outbound:push']"
+                    :disabled="selectList.length == 0"
+                    >推送到智慧工地</el-button
+                >
             </el-col>
             <right-toolbar
                 :showSearch.sync="showSearch"
@@ -99,8 +109,8 @@
             ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="leaseList" border>
-            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+        <el-table v-loading="loading" :data="leaseList" border @selection-change="handleSelect">
+            <el-table-column type="selection" width="55" align="center" :selectable="(row) => row.taskStatus == 35" />
             <el-table-column
                 align="center"
                 label="序号"
@@ -151,11 +161,42 @@
                 prop="taskName"
                 :show-overflow-tooltip="true"
             ></el-table-column>
+            <el-table-column
+                label="推送状态"
+                align="center"
+                prop="pushStatus"
+                show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+                    <el-tag
+                        v-if="scope.row.pushStatus == 0"
+                        type="success"
+                        size="mini"
+                        >已推送</el-tag
+                    >
+                    <el-tag
+                        v-else
+                        type="danger"
+                        size="mini"
+                        >未推送</el-tag
+                    >
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="位置信息"
+                align="center"
+                prop="location"
+            >
+                <template v-slot="{row}">
+                    <i class="el-icon-location-information" style="color: #459BD4; font-size: 24px;" @click="handleMap(row)"></i>
+                </template>
+            </el-table-column>
 
             <el-table-column
                 label="操作"
                 align="center"
                 class-name="small-padding fixed-width"
+                width="150"
             >
                 <template slot-scope="scope">
                     <el-button
@@ -509,6 +550,9 @@
                 </el-table-column>
             </el-table>
         </el-dialog>
+
+        <MapDialog ref="mapDIalog" @getList="getList" />
+        <DialogPush ref="dialogPush" @getList="getList" />
     </div>
 </template>
 
@@ -525,10 +569,12 @@ import {
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
+import MapDialog from '@/views/warehouseManage/machinery/coding/component/MapDialog'
+import DialogPush from './component/DialogPush'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
     name: 'receiveOut',
-    components: { Treeselect },
+    components: { Treeselect, MapDialog, DialogPush },
     data() {
         return {
             // 遮罩层
@@ -602,6 +648,7 @@ export default {
             outTotal: 0, //编码弹窗分页-总数
             outCodeList: [], //编码弹窗表格数据
             outNumList: [], //数量弹窗表格数据
+            selectList: [],
         }
     },
     created() {
@@ -833,6 +880,26 @@ export default {
                 `领料出库_${new Date().getTime()}.xlsx`,
             )
         },
+        // 推送智慧工地
+        handlePush() {
+            console.log('🚀 ~ handlePush ~ :',)
+            this.$refs.dialogPush.openDialog(true)
+        },
+        handleSelect(val) {
+            console.log('🚀 ~ handleSelect ~ :', val)
+            this.selectList = val
+            console.log('🚀 ~ handleSelect ~ this.selectList:', this.selectList)
+        },
+        handleMap(row) {
+            console.log('~ handleMap ~ 地图', row)
+            const params = {
+                deviceType: row.deviceType,
+            }
+            // 点击打开弹框
+            this.$refs.mapDIalog.openMapDialog(true)
+            this.$refs.mapDIalog.getEquipmentInfo(params)
+            this.$refs.mapDIalog.initMap()
+        },
     },
 }
 </script>
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue
index 21afdb41..e7fcb097 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/IOTequipment/index.vue
@@ -43,6 +43,7 @@
           <el-button type="text" size="small" @click="handleCheck(row)">记录</el-button>
           <el-button type="text" size="small" @click="handleEdit(row)">修改</el-button>
           <el-button type="text" size="small" style="color: red" @click="handleDelete(row)">删除</el-button>
+          <el-button type="text" size="small" style="color: red" @click="handleUnbind(row)">解绑</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -267,6 +268,12 @@ export default {
       //   this.getList()
       // })
     },
+    handleUnbind(row) {
+      const params = {
+        id: row.id,
+      }
+      console.log('🚀 ~ handleUnbind ~ 解绑', row)
+    },
     selectionChange(val) {
       console.log('🚀 ~ selectionChange ~ val:', val)
     },
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
index 7e2b391f..6e9ced37 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
@@ -26,7 +26,7 @@
       <el-table-column label="设备类型" prop="type" align="center" />
       <el-table-column label="设备编号" prop="code" align="center" />
       <el-table-column label="设备状态" prop="bindTime" align="center" />
-      <el-table-column label="解绑日期" prop="unbindTime" align="center" />
+      <el-table-column label="绑定日期" prop="unbindTime" align="center" />
 
       <el-table-column label="操作" align="center">
         <template v-slot="{ row }">
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
index 0bf51ece..ab9bb469 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
@@ -5,12 +5,14 @@
       <!-- 表单 根据日期查询设备轨迹 -->
       <el-card shadow="hover">
         <el-form :model="queryForm" inline>
-          <el-form-item label="日期">
+          <el-form-item label="查询日期">
             <el-date-picker
               v-model="queryForm.date"
-              type="date"
-              placeholder="请选择日期"
-              style="width: 200px"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="请选择开始日期"
+              end-placeholder="请选择结束日期"
+              style="width: 330px"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
             ></el-date-picker>
@@ -78,10 +80,19 @@ export default {
       ],
     }
   },
-  mounted() {},
+  mounted() {
+    this.getEquipmentInfo()
+  },
   methods: {
     handleQuery() {
       console.log('🚀 ~ handleQuery ~ 查询:', this.queryForm.date)
+      const params = {
+        date: this.queryForm.date,
+      }
+      this.getEquipmentInfo(params)
+      // 先销毁地图 再重新初始化
+      this.map.clearOverlays()
+      this.initMap()
     },
     openMapDialog(val) {
       this.openMap = val
@@ -91,9 +102,14 @@ export default {
       this.$emit('getList')
     },
     // 获取装备信息
-    getEquipmentInfo(params) {
+    getEquipmentInfo(params = {}) {
       console.log('🚀 ~ getEquipmentInfo ~ 获取装备信息', params)
-      this.equipment = params.deviceType
+      // 接口(params).then(res => {
+      //   this.equipment = res.equipment
+      //   this.equipmentNumber = res.equipmentNumber
+      //   this.engineering = res.engineering
+      //   this.linePointList = res.linePointList
+      // })
     },
     // 初始化地图和轨迹
     initMap() {
@@ -106,6 +122,7 @@ export default {
 
         // 添加轨迹
         let pointList = []
+        if (this.linePointList.length === 0) return
         for (var i = 0; i < this.linePointList.length; i++) {
           pointList.push(new BMapGL.Point(this.linePointList[i].lng, this.linePointList[i].lat))
         }
@@ -122,7 +139,7 @@ export default {
         })
 
         // 设置起点终点图标
-        this.simulateMovement()
+        this.triggerMovement()
         trackAni.start()
       })
     },
@@ -136,10 +153,9 @@ export default {
       let endMarker = new BMapGL.Marker(endLatLng, { icon: endIcon })
       this.map.addOverlay(endMarker)
     },
-
-    // 模拟轨迹运动结束后的回调
-    simulateMovement() {
-      // 模拟轨迹运动结束后获取起点和终点的经纬度坐标
+    // 轨迹运动结束后的回调
+    triggerMovement() {
+      // 轨迹运动结束后获取起点和终点的经纬度坐标
       let startLatLng = new BMapGL.Point(this.linePointList[0].lng, this.linePointList[0].lat)
       let endLatLng = new BMapGL.Point(
         this.linePointList[this.linePointList.length - 1].lng,
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 768b29c1..01a87d73 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -533,7 +533,7 @@
             </div>
         </el-dialog>
 
-        <MapDialog ref="mapDIalog" @getList="getList" />
+        <MapDialog ref="mapDialog" @getList="getList" />
     </div>
     <div v-else>
         <BindIOT :isShow="isShow" />
@@ -824,9 +824,9 @@ export default {
                 deviceType: row.deviceType,
             }
             // 点击打开弹框
-            this.$refs.mapDIalog.openMapDialog(true)
-            this.$refs.mapDIalog.getEquipmentInfo(params)
-            this.$refs.mapDIalog.initMap()
+            this.$refs.mapDialog.openMapDialog(true)
+            this.$refs.mapDialog.getEquipmentInfo(params)
+            this.$refs.mapDialog.initMap()
         }
     },
 }