From e30bac4cde234e946bef57af8c8aa50139e125db Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Sat, 8 Jun 2024 11:40:09 +0800
Subject: [PATCH] fix prod env and push device

---
 .env.prod                                     |  6 +-
 src/api/iot/device/index.ts                   |  5 +-
 src/utils/dict.ts                             |  1 +
 src/views/iot/device/DeviceForm.vue           | 12 +--
 .../device/components/DeviceAttributeList.vue | 26 +++----
 src/views/iot/device/index.vue                | 75 ++++++++-----------
 src/views/iot/formula/index.vue               |  2 +-
 src/views/mes/feedingrecord/index.vue         |  2 +-
 src/views/mes/plan/index.vue                  | 18 ++++-
 .../components/ProduceReportDetailForm.vue    | 11 ++-
 10 files changed, 77 insertions(+), 81 deletions(-)

diff --git a/.env.prod b/.env.prod
index 842ba616..c7e5c383 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,12 +4,12 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://47.106.185.127:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://47.106.185.127:48080/admin-api/infra/file/upload'
 
 # 接口地址
 VITE_API_URL=/admin-api
@@ -30,4 +30,4 @@ VITE_BASE_PATH=/
 VITE_OUT_DIR=dist-prod
 
 # 商城H5会员端域名
-VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
+VITE_MALL_H5_DOMAIN='http://localhost'
diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index 36d398dd..343e1b9a 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -72,7 +72,10 @@ export const DeviceApi = {
   exportDevice: async (params) => {
     return await request.download({ url: `/iot/device/export-excel`, params })
   },
-
+  // 物联设备配置下发
+  pushDevice: async (id: number) => {
+    return await request.get({ url: `/iot/device/pushDevice?id=` + id })
+  },
 // ==================== 子表（设备属性） ====================
 
   // 获得设备属性分页
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4325c7ce..9be180d0 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -262,4 +262,5 @@ export enum DICT_TYPE {
   IOT_DEVICE_DATA_TRANSFER_TYPE = "iot_device_data_transfer_type",
   IOT_DEVICE_DATA_TYPE = "iot_device_data_type",
   IOT_PROXY_SERVER_STATUS = "iot_proxy_server_status",
+  IOT_DEVICE_USE_TYPE = "iot_device_use_type",
 }
diff --git a/src/views/iot/device/DeviceForm.vue b/src/views/iot/device/DeviceForm.vue
index f83ce755..e310cdd2 100644
--- a/src/views/iot/device/DeviceForm.vue
+++ b/src/views/iot/device/DeviceForm.vue
@@ -153,17 +153,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="是否已下发" prop="isUpload">
-        <el-radio-group v-model="formData.isUpload">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_1_OR_0)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+
       <el-form-item label="网关id" prop="gatewayId">
         <el-input v-model="formData.gatewayId" placeholder="请输入网关id" />
       </el-form-item>
diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue
index 8c6d6eeb..971452e9 100644
--- a/src/views/iot/device/components/DeviceAttributeList.vue
+++ b/src/views/iot/device/components/DeviceAttributeList.vue
@@ -13,17 +13,9 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="地址编码" align="center" prop="attributeCode" />
       <el-table-column label="地址" align="center" prop="address" />
-      <el-table-column label="地址名称" align="center" prop="attributeName" />
+      <el-table-column label="地址名称" align="center" prop="attributeName" min-width="120px"/>
       <el-table-column label="地址描述" align="center" prop="description" />
-      <el-table-column label="地址类型" align="center" prop="addressType" />
-      <el-table-column label="地址偏移" align="center" prop="addressOffset" />
-      <el-table-column label="地址2类型" align="center" prop="address2Type" />
-      <el-table-column label="地址2偏移" align="center" prop="address2Offset" />
-      <el-table-column label="所属组" align="center" prop="groupName" />
-      <el-table-column label="所属组id" align="center" prop="groupId" />
-      <el-table-column label="安全类别" align="center" prop="securityType" />
-      <el-table-column label="读写状态" align="center" prop="ioStatus" />
-      <el-table-column label="是否线性换算" align="center" prop="isLinearTransfer">
+      <el-table-column label="线性换算" align="center" prop="isLinearTransfer">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_1_OR_0" :value="scope.row.isLinearTransfer" />
         </template>
@@ -34,11 +26,7 @@
         </template>
       </el-table-column>
       <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="输入最小值" align="center" prop="inMinValue" />
-      <el-table-column label="输入最大值" align="center" prop="inMaxValue" />
-      <el-table-column label="输出最小值" align="center" prop="outMinValue" />
-      <el-table-column label="输出最大值" align="center" prop="outMaxValue" />
-      <el-table-column label="输出数据类型" align="center" prop="outDataType" />
+      <el-table-column label="输出类型" align="center" prop="outDataType" />
       <el-table-column label="精度" align="center" prop="siemensFieldPrecision" />
       <el-table-column label="站号" align="center" prop="modbusSlaveId" />
       <el-table-column label="寄存器地址" align="center" prop="modbusFieldAddress" />
@@ -53,10 +41,14 @@
         </template>
       </el-table-column>
       <el-table-column label="系数" align="center" prop="factor" />
-      <el-table-column label="网关id" align="center" prop="gatewayId" />
+      <el-table-column label="网关" align="center" prop="gatewayId" />
        <el-table-column label="组织设备id" align="center" prop="orgId" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" prop="isEnable" />
+      <el-table-column label="启用" align="center" prop="isEnable" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 1defce00..d873c6b4 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -57,15 +57,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="网关id" prop="gatewayId">
-        <el-input
-          v-model="queryParams.gatewayId"
-          placeholder="请输入网关id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+
       <el-form-item label="组织设备id" prop="orgId">
         <el-input
           v-model="queryParams.orgId"
@@ -135,52 +127,28 @@
       @current-change="handleCurrentChange"
     >
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="设备配置id" align="center" prop="deviceConfigId" />
-      <el-table-column label="设备编号" align="center" prop="deviceCode" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType" />
-      <el-table-column label="Siemens系列" align="center" prop="siemensSeries">
+      <el-table-column label="设备编号" align="center" prop="deviceCode" min-width="120px" />
+      <el-table-column label="设备名称" align="center" prop="deviceName" min-width="120px" />
+      <el-table-column label="设备类型" align="center" prop="deviceType" >
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.IOT_SIEMENS_TYPE" :value="scope.row.siemensSeries" />
+          <dict-tag :type="DICT_TYPE.IOT_DEVICE_TYPE" :value="scope.row.deviceType" />
         </template>
       </el-table-column>
-      <el-table-column label="siemens连接参数" align="center" prop="siemensConnectParam" />
-      <el-table-column label="modbus协议类型" align="center" prop="modbusProtocol">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.IOT_MODBUS_TYPE" :value="scope.row.modbusProtocol" />
-        </template>
-      </el-table-column>
-      <el-table-column label="modbus模式" align="center" prop="modbusPattern">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.IOT_MODBUS_MOLD" :value="scope.row.modbusPattern" />
-        </template>
-      </el-table-column>
-      <el-table-column label="modbus串口号" align="center" prop="portName">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.IOT_MODBUS_PORT" :value="scope.row.portName" />
-        </template>
-      </el-table-column>
-
-      <el-table-column label="是否已下发" align="center" prop="isUpload">
+      <el-table-column label="已下发" align="center" prop="isUpload">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_1_OR_0" :value="scope.row.isUpload" />
         </template>
       </el-table-column>
-      <el-table-column label="网关id" align="center" prop="gatewayId" />
-      <el-table-column label="组织设备id" align="center" prop="orgId" />
+      <el-table-column label="网关" align="center" prop="gatewayId" />
+      <el-table-column label="组织设备" align="center" prop="orgId" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="数采设备类型" align="center" prop="deviceUseType">
+      <el-table-column label="数采类型" align="center" prop="deviceUseType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_DEVICE_USE_TYPE" :value="scope.row.deviceUseType" />
         </template>
       </el-table-column>
-      <el-table-column label="ap_ip" align="center" prop="apIp" />
-      <el-table-column label="网桥ip" align="center" prop="gateBridgeIp" />
-      <el-table-column label="串口服务器IP" align="center" prop="comServerIp" />
-      <el-table-column label="串口服务器端口" align="center" prop="comServerPort" />
-      <el-table-column label="PLC控制器地址" align="center" prop="plcControllerIp" />
-      <el-table-column label="PLC触控屏地址" align="center" prop="plcScreenIp" />
-      <el-table-column label="i机台id" align="center" prop="orgMachineId" />
+
+      <el-table-column label="机台" align="center" prop="orgMachineId" />
 
       <el-table-column label="是否启用" align="center" prop="isEnable" >
         <template #default="scope">
@@ -200,6 +168,14 @@
           <el-button
             link
             type="primary"
+            @click="handlePushDevice( scope.row.id)"
+            v-hasPermi="['iot:device:update']"
+          >
+            下发
+          </el-button>
+          <el-button
+            link
+            type="warning"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['iot:device:update']"
           >
@@ -318,7 +294,18 @@ const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
-
+/** 下发操作 */
+const handlePushDevice = async (id: number) => {
+  try {
+    // 二次确认
+    await message.confirm("确定要下发该设备到网关吗？")
+    // 发起
+    await DeviceApi.pushDevice(id)
+    message.success("下发完成！")
+    // 刷新列表
+    await getList()
+  } catch {}
+}
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/iot/formula/index.vue b/src/views/iot/formula/index.vue
index 1d5ce45b..2f91148a 100644
--- a/src/views/iot/formula/index.vue
+++ b/src/views/iot/formula/index.vue
@@ -137,7 +137,7 @@
         <template #default="scope">
           <el-button
             link
-            type="primary"
+            type="warning"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['iot:formula:update']"
           >
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 1948e6fe..33e0fcf2 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -170,7 +170,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
+        label="投料时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 053bc2f1..d7c9e4f6 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -162,7 +162,7 @@
 
       <el-table-column label="备注" align="center" prop="remark" />
 
-      <el-table-column label="操作" align="center" fixed="right" width="150">
+      <el-table-column label="操作" align="center" fixed="right" width="250">
         <template #default="scope">
           <el-button
             link
@@ -180,6 +180,22 @@
           >
             派工
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:plan:update']"
+          >
+            开工
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:plan:update']"
+          >
+            完工
+          </el-button>
           <el-button
             link
             type="danger"
diff --git a/src/views/mes/producereport/components/ProduceReportDetailForm.vue b/src/views/mes/producereport/components/ProduceReportDetailForm.vue
index 43998fd7..56521055 100644
--- a/src/views/mes/producereport/components/ProduceReportDetailForm.vue
+++ b/src/views/mes/producereport/components/ProduceReportDetailForm.vue
@@ -36,7 +36,13 @@
       </el-form-item>
       <el-form-item label="是否启用" prop="isEnable">
         <el-radio-group v-model="formData.isEnable">
-          <el-radio label="1">请选择字典生成</el-radio>
+          <el-radio
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="成品数量" prop="qualityNumber">
@@ -68,6 +74,7 @@
 </template>
 <script setup lang="ts">
 import { ProduceReportApi } from '@/api/mes/producereport'
+import {getBoolDictOptions} from "@/utils/dict";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -170,4 +177,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>