From d866bc76c47192aed91ebb30c34feac8c8aabffc Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Thu, 4 Jul 2024 14:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E6=A1=B6=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf-web/src/views/recyclebucket/form.vue | 38 ++++++++++++++-----
 .../src/views/recycledevice/index.vue         | 13 ++++---
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
index 2b98095..5cb2c13 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
@@ -98,7 +98,27 @@
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="所属设备" prop="deviceCode">
-                <JnpfPopupSelect
+                <PopupSelectDeviceCode
+                  v-model="dataForm.deviceCode"
+                  @change="changeData('deviceCode', -1)"
+                  :rowIndex="null"
+                  :formData="dataForm"
+                  :templateJson="interfaceRes.deviceCode"
+                  placeholder="请选择"
+                  propsValue="deviceCode"
+                  popupWidth="800px"
+                  popupTitle="选择数据"
+                  popupType="dialog"
+                  relationField="deviceName"
+                  field="deviceCode"
+                  interfaceId="564713894723988869"
+                  :pageSize="20"
+                  :columnOptions="deviceCodecolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </PopupSelectDeviceCode>
+                <!-- <JnpfPopupSelect
                   v-model="dataForm.deviceCode"
                   @change="changeData('deviceCode', -1)"
                   :rowIndex="null"
@@ -117,7 +137,7 @@
                   clearable
                   :style="{ width: '100%' }"
                 >
-                </JnpfPopupSelect>
+                </JnpfPopupSelect> -->
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
@@ -703,8 +723,8 @@ export default {
       ],
       doorNumProps: { label: "fullName", value: "id" },
       deviceCodecolumnOptions: [
-        { label: "设备编码", value: "device_code" },
-        { label: "设备名称", value: "device_name" }
+        { label: "设备编码", value: "deviceCode" },
+        { label: "设备名称", value: "deviceName" }
       ],
       isShowOptions: [
         { fullName: "关闭", id: "0" },
@@ -1056,35 +1076,35 @@ export default {
     // 表单提交
     dataFormSubmit(type) {
       if (this.dataForm.price == null && !this.useUnifiedConfig) {
-        this.$message.error('请选择配置或输入回收单价');
+        this.$message.error("请选择配置或输入回收单价");
         return;
       }
       if (this.useUnifiedConfig) {
         this.dataForm.price = null;
       }
       if (this.dataForm.fullSet == null && !this.usefullSetConfig) {
-        this.$message.error('请选择配置或选择满溢报警');
+        this.$message.error("请选择配置或选择满溢报警");
         return;
       }
       if (this.usefullSetConfig) {
         this.dataForm.fullSet = "-1";
       }
       if (this.dataForm.smogSet == null && !this.useSmogSetConfig) {
-        this.$message.error('请选择配置或选择烟雾报警');
+        this.$message.error("请选择配置或选择烟雾报警");
         return;
       }
       if (this.useSmogSetConfig) {
         this.dataForm.smogSet = "-1";
       }
       if (this.dataForm.warningWeight == null && !this.warningWeightConfig) {
-        this.$message.error('请选择配置或输入重量上限');
+        this.$message.error("请选择配置或输入重量上限");
         return;
       }
       if (this.warningWeightConfig) {
         this.dataForm.warningWeight = null;
       }
       if (this.dataForm.closeDelay == null && !this.closeDelayConfig) {
-        this.$message.error('请选择配置或输入关门延时');
+        this.$message.error("请选择配置或输入关门延时");
         return;
       }
       if (this.closeDelayConfig) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue
index 6c2ddca..93ef24b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue
@@ -262,15 +262,16 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="投口状态" width="200" algin="center">
+          <el-table-column label="投口状态" width="280" algin="center">
             <template slot-scope="scope">
               <div v-for="(item, index) in scope.row.buckets">
                 <el-row>
-                  <el-col :span="14">
-                    <div>{{ item.showName }} {{ item.currentWeight }} KG</div>
+                  <el-col :span="24">
+                    <div>桶名称：{{ item.showName }} 当前：{{ item.currentWeight }} KG  预警：{{ item.warningWeightWeight }} KG</div>
                   </el-col>
-                  <el-col :span="10">
+                  <!-- <el-col :span="10">
                     <div>
+                      {{ item.progress }}
                       <el-progress
                         :percentage="item.progress"
                         :color="[
@@ -280,7 +281,7 @@
                         ]"
                       ></el-progress>
                     </div>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
               </div>
             </template>
@@ -747,7 +748,7 @@ export default {
                 smogStatus.title = "投递柜内有桶烟雾报警";
               }
               o1.progress = Math.ceil(
-                (o1.currentWeight / o1.warningWeight) * 100
+                (parseInt(o1.currentWeight) / parseInt(o1.warningWeight)) * 100
               );
               return o1;
             });