From 0095c6ecba5dad7df99aea5a6c708a96741b1479 Mon Sep 17 00:00:00 2001
From: jiangyinzhi <4617248933@YFZMY.COM>
Date: Thu, 15 Aug 2024 11:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/energyEfficiency/clockIn/index.vue  | 2 +-
 src/views/enterprise/generalEnergy.vue        | 4 ++--
 src/views/enterprise/generalEnergyAddEdit.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/energyEfficiency/clockIn/index.vue b/src/views/energyEfficiency/clockIn/index.vue
index d3dc10c..75270cc 100644
--- a/src/views/energyEfficiency/clockIn/index.vue
+++ b/src/views/energyEfficiency/clockIn/index.vue
@@ -177,12 +177,12 @@ export default {
       getPosition((data) => {
           console.log('-------------------------位置信息', data, typeof(data));
         if (data) {
-          console.log(data.longitude, 'lgitude位置信息')
           if(typeof(data) == 'string'){
             let dataArr = data.split(',')
             that.$set(that.formData, 'lgitude', dataArr[0].match(/\d+\.\d{2}/)[0])
             that.$set(that.formData, 'ltitude', dataArr[1].match(/\d+\.\d{2}/)[0])
           }else{
+            console.log(data.longitude, 'lgitude位置信息')
             that.$set(that.formData, 'lgitude', (data.longitude+'').match(/\d+\.\d{2}/)[0])
             that.$set(that.formData, 'ltitude', (data.latitude+'').match(/\d+\.\d{2}/)[0])
           }
diff --git a/src/views/enterprise/generalEnergy.vue b/src/views/enterprise/generalEnergy.vue
index 812403a..b849895 100644
--- a/src/views/enterprise/generalEnergy.vue
+++ b/src/views/enterprise/generalEnergy.vue
@@ -8,7 +8,7 @@
         <!-- <div class="title" style="margin-top: 20px;margin-left: 5px;">通用能源系统</div> -->
         <div class="partTwo-box">
           <div class="partTwo-content">
-            <div class="title">配电系统基本信息 <span style="font-size: 14px; color: #bbbbbb;"> 35kV 及以上</span></div>
+            <div class="title">配电系统基本信息 <span style="font-size: 14px; color: #bbbbbb;"> 10kV 及以上</span></div>
             <van-swipe-cell :right-width="65" v-for="(item, index) in list" :key="index">
               <div class="msg-card" @click="generalenergyaddedit(item.id)">
                 <div>
@@ -21,7 +21,7 @@
                     <span>型号 {{ item.systemModel }} </span><span><van-icon name="arrow" color="#fff" /></span>
                   </div>
                   <div class="space-between" style="margin-top: 10px;font-size: 12px;">
-                    <span>额定容量：{{ item.ratedCapacityValue }} kVA</span><span>额定一次电压：{{ item.ratedVoltageValue }} kV</span>
+                    <span>单台额定容量：{{ item.ratedCapacityValue }} kVA</span><span>额定一次电压：{{ item.ratedVoltageValue }} kV</span>
                   </div>
                 </div>
               </div>
diff --git a/src/views/enterprise/generalEnergyAddEdit.vue b/src/views/enterprise/generalEnergyAddEdit.vue
index 60159f0..cbe262b 100644
--- a/src/views/enterprise/generalEnergyAddEdit.vue
+++ b/src/views/enterprise/generalEnergyAddEdit.vue
@@ -8,7 +8,7 @@
                         <van-cell-group>
                             <van-field v-model="form.systemModel" required :rules="[{  required: true },{pattern:/^.{2,20}$/, message:'2≤型号长度≤20'}]" label="型号" maxlength="20" placeholder="请输入型号"/>
                             <van-field v-input.numNo0 v-model="form.systemNum" type="number" required :rules="[{  required: true }]" label="台数（台）" placeholder="请输入台数" />
-                            <van-field v-input.numNo0 v-model="form.ratedCapacityValue" required :rules="[{  required: true }]" ltype="number" label="额定容量（kVA）" placeholder="请输入" @blur="handelChange('ratedCapacityValue',50,'额定容量')"/>
+                            <van-field v-input.numNo0 v-model="form.ratedCapacityValue" required :rules="[{  required: true }]" ltype="number" label="单台额定容量（kVA）" placeholder="请输入" @blur="handelChange('ratedCapacityValue',50,'单台额定容量')"/>
                             <van-field v-input.floatNo0 v-model="form.ratedVoltageValue" required :rules="[{  required: true }]" type="number" label="额定一次电压（kV）" placeholder="请输入" @blur="handelChange('ratedVoltageValue',10,'额定一次电压')"/>
                             <van-field v-input.num v-model="form.absoleteElecNum" type="number" label="淘汰电机数量" placeholder="请输入" />
                             <van-field v-input.num v-model="form.absoleteNum" type="number" label="淘汰变压器数量" placeholder="请输入" />