From bad2bc143be3f8ddb93a1c9f984127b3ccf43e8f Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 31 三月 2025 17:47:14 +0800
Subject: [PATCH] 11

---
 src/components/public/index.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 83d1bf4..6d83be2 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -1,7 +1,8 @@
 <template>
     <div>
         <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-            <h3 v-if="fList.proResult ">妫�娴嬬粨鏋� :{{ fList.proResult }}</h3>
+            <h3 v-if="fList.proResult ">妫�娴嬮」鐩� :{{ fList.project.proName }}</h3>
+            <h3 v-if="fList.proResult ">妫�娴嬬粨鏋� :{{ fList.proResult }}{{fList.project.proMetering}}</h3>
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
                 <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
                     <el-input v-model="queryParams.bingzhong" placeholder="璇疯緭鍏ョ畝绉�" clearable
@@ -93,7 +94,7 @@
                 // if (this.fList.proResult == "") {
                 let data = {
                     proId: fList.proId,
-                    ruleStr: fList.proResult,
+                    // ruleStr: fList.proResult,
                 }
                 getlist(data).then(res => {
                     this.dataList = res.rows
@@ -174,7 +175,12 @@
             this.list = selection
             this.form.desc = ""
             this.list.forEach(element => {
-                this.form.desc += element.bingzhong + ","
+                if( element.bingzhong){
+this.form.desc += element.bingzhong + ","
+                }else{
+                    this.form.desc += element.ruleStr + ","
+                }
+                
             });
         },
         handleOk() {

--
Gitblit v1.8.0