From 927e286f1b6114ba628a88959f278e0ff1973806 Mon Sep 17 00:00:00 2001
From: yjl <1490736767@qq.com>
Date: Tue, 3 Jan 2023 18:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E9=87=91=E9=99=B5=E7=81=A3bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                         |  4 +-
 .../fourEngin/command/rightThree.vue          | 20 ++---
 src/views/projectAdmin/zjsj/command/index.vue |  2 +-
 .../bicarbonEquipment/bicarbonEquipment.vue   | 16 +++-
 .../bicarbonEquipmentManage.vue               | 16 +++-
 .../photovoltaic/photovoltaic.vue             | 15 +++-
 .../photovoltaic/photovoltaicEquipment.vue    | 81 ++++++++++++-------
 7 files changed, 105 insertions(+), 49 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index e771f34b..0a86e0c8 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -40,12 +40,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
-  // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地1
+   axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地1
   // axios.defaults.baseURL = 'http://192.168.34.116:18070/' // 邱平毅本地2
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc'  // 邱平毅vpn本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-   axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
   // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
diff --git a/src/views/projectAdmin/fourEngin/command/rightThree.vue b/src/views/projectAdmin/fourEngin/command/rightThree.vue
index 6a13eeb4..f1676b47 100644
--- a/src/views/projectAdmin/fourEngin/command/rightThree.vue
+++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue
@@ -33,17 +33,17 @@ export default {
       let data = {
         projectSn: this.$store.state.projectSn,
       };
-      getProjectDetail(data).then((res) => {
-        if (res.code == 200) {
-          getEpidemicBroadcastApi({adCode: res.result.cityCode }).then(res => {
-            console.log('res--------',res);
+      // getProjectDetail(data).then((res) => {
+      //   if (res.code == 200) {
+      //     getEpidemicBroadcastApi({adCode: res.result.cityCode }).then(res => {
+      //       console.log('res--------',res);
 
-        if (res.code == 200) {
-          this.list= res.result
-        }
-      })
-        }
-      });
+      //   if (res.code == 200) {
+      //     this.list= res.result
+      //   }
+      // })
+      // }
+      // });
     },
     toMore() {
       // let dom = document.getElementById('more')
diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue
index f41379f4..3f49b3f8 100644
--- a/src/views/projectAdmin/zjsj/command/index.vue
+++ b/src/views/projectAdmin/zjsj/command/index.vue
@@ -39,7 +39,7 @@
 <script>
 import LeftOne from './leftOne'
 import LeftTwo from './leftTwo'
-import LeftThree from './LeftThree'
+import LeftThree from './leftThree'
 import LeftFour from './leftFour'
 import Center from './center'
 import CenterBOne from './centerBOne'
diff --git a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue
index 6e903d21..f3a726f5 100644
--- a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue
+++ b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue
@@ -47,13 +47,13 @@
         ></el-pagination>
       </vue-scroll>
       <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="150px">
-          <el-form-item label="设备名称：">
+        <el-form ref="form" :model="form" label-width="150px"  :rules="addEditRules">
+          <el-form-item label="设备名称：" prop="equipmentId">
             <el-select v-model="equipmentId" placeholder="请选择" style="width:350px">
               <el-option v-for="item in EquipmentList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="加油量：">
+          <el-form-item label="加油量：" prop="fuel">
             <el-input v-model="fuel" style="width:350px" placeholder="请输入"></el-input>
           </el-form-item>
         </el-form>
@@ -96,6 +96,16 @@ export default {
   },
   data() {
     return {
+      addEditRules: {
+        fuel: [
+          { required: true, message: "请输入加油量", trigger: 'blur' },
+          { required: true, message: "请输入加油量", trigger: 'change' }
+        ],
+        equipmentId: [
+          { required: true, message: "请输入设备名称", trigger: 'blur' },
+          { required: true, message: "请输入设备名称", trigger: 'change' }
+        ]
+      },
       typeList: {
         1: '柴油',
         2: '汽油'
diff --git a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue
index 61ea9c01..ee5958c0 100644
--- a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue
+++ b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue
@@ -56,14 +56,14 @@
         ></el-pagination>
       </vue-scroll>
       <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="150px">
-          <el-form-item label="设备名称：">
+        <el-form ref="form" :model="form" label-width="150px"  :rules="addEditRules">
+          <el-form-item label="设备名称：" prop="name">
             <el-input v-model="form.name" style="width:350px" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="车牌号：">
             <el-input v-model="form.plateNumber" style="width:350px" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="燃油类型：">
+          <el-form-item label="燃油类型：" prop="valueFuel">
             <el-select v-model="valueFuel" placeholder="请选择" style="width:350px" @change="changeFuelType($event)">
               <el-option v-for="item in fuelType" :key="item.id" :label="item.typeName" :value="item.typeName"> </el-option>
             </el-select>
@@ -115,6 +115,16 @@ export default {
   },
   data() {
     return {
+      addEditRules: {
+        valueFuel: [
+          { required: true, message: "请输入设备编号", trigger: 'blur' },
+          { required: true, message: "请输入设备编号", trigger: 'change' }
+        ],
+        name: [
+          { required: true, message: "请输入设备名称", trigger: 'blur' },
+          { required: true, message: "请输入设备名称", trigger: 'change' }
+        ]
+      },
       typeList: {
         1: '柴油',
         2: '汽油'
diff --git a/src/views/projectLevel/photovoltaic/photovoltaic.vue b/src/views/projectLevel/photovoltaic/photovoltaic.vue
index 440a69d2..2a555748 100644
--- a/src/views/projectLevel/photovoltaic/photovoltaic.vue
+++ b/src/views/projectLevel/photovoltaic/photovoltaic.vue
@@ -47,13 +47,13 @@
         ></el-pagination>
       </vue-scroll>
       <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="150px">
-          <el-form-item label="设备名称：">
+        <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules"> 
+          <el-form-item label="设备名称：" prop="value">
             <el-select v-model="value" placeholder="请选择" style="width:350px" @change="changeName($event)">
               <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.name"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="发电量(度)：">
+          <el-form-item label="发电量(度)：" prop="generatingCapacity">
             <el-input v-model="form.generatingCapacity" placeholder="请输入" style="width:350px"></el-input>
           </el-form-item>
         </el-form>
@@ -96,6 +96,15 @@ export default {
   },
   data() {
     return {
+      addEditRules: {
+        value: [
+          { required: true, message: "请选择设备", trigger: 'blur' },
+        ],
+        generatingCapacity: [
+          { required: true, message: "请输入发电量", trigger: 'blur' },
+          { required: true, message: "请输入发电量", trigger: 'change' }
+        ]
+      },
       projectSn: '',
       formInline: {
         buildName: ''
diff --git a/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue b/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue
index fbd68a0a..b6b07c5d 100644
--- a/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue
+++ b/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue
@@ -16,6 +16,7 @@
       <vue-scroll style="height: 100%">
         <el-table class="tables" :data="tableList">
           <el-table-column prop="name" label="设备名称" align="center"></el-table-column>
+          <el-table-column prop="devSn" label="设备编号" align="center"></el-table-column>
           <el-table-column prop="hourGeneratingCapacity" label="每小时发电量/度" align="center"></el-table-column>
           <el-table-column prop="attenuationRate" label="衰减率" align="center"></el-table-column>
           <el-table-column prop="isc" label="短路电流" align="center"></el-table-column>
@@ -56,14 +57,17 @@
         ></el-pagination>
       </vue-scroll>
       <el-dialog title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="150px">
-          <el-form-item label="设备名称：">
+        <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules">
+          <el-form-item label="设备名称：" prop="name">
             <el-input v-model="form.name" placeholder="请输入" style="width:350px"></el-input>
           </el-form-item>
+          <el-form-item label="设备编号：" prop="code">
+            <el-input v-model="form.code" placeholder="请输入" style="width:350px"></el-input>
+          </el-form-item>
           <el-form-item label="衰减率(%)：">
             <el-input v-model="form.attenuationRate" placeholder="请输入" style="width:350px"></el-input>
           </el-form-item>
-          <el-form-item label="每小时发电量(度)：">
+          <el-form-item label="每小时发电量(度)：" prop="hourGeneratingCapacity">
             <el-input v-model="form.hourGeneratingCapacity" placeholder="请输入" style="width:350px"></el-input>
           </el-form-item>
           <el-form-item label="短路电流：">
@@ -101,6 +105,9 @@
           <el-form-item label="设备名称：">
             <el-input v-model="editForm.name" style="width:350px"></el-input>
           </el-form-item>
+          <el-form-item label="设备编号：">
+            <el-input v-model="editForm.code" placeholder="请输入" style="width:350px"></el-input>
+          </el-form-item>
           <el-form-item label="衰减率(%)：">
             <el-input v-model="editForm.attenuationRate" style="width:350px"></el-input>
           </el-form-item>
@@ -149,6 +156,20 @@ export default {
   },
   data() {
     return {
+      addEditRules: {
+        code: [
+          { required: true, message: "请输入设备编号", trigger: 'blur' },
+          { required: true, message: "请输入设备编号", trigger: 'change' }
+        ],
+        hourGeneratingCapacity: [
+          { required: true, message: "请输入每小时发电量", trigger: 'blur' },
+          { required: true, message: "请输入每小时发电量", trigger: 'change' }
+        ],
+        name: [
+          { required: true, message: "请输入设备名称", trigger: 'blur' },
+          { required: true, message: "请输入设备名称", trigger: 'change' }
+        ]
+      },
       projectSn: '',
       formInline: {
         buildName: ''
@@ -163,6 +184,7 @@ export default {
       form: {
         attenuationRate: '',
         name: '',
+        code: '',
         hourGeneratingCapacity: '',
         isc: '',
         modelNumber: '',
@@ -176,6 +198,7 @@ export default {
       editForm: {
         attenuationRate: '',
         name: '',
+        code: '',
         hourGeneratingCapacity: '',
         isc: '',
         modelNumber: '',
@@ -193,20 +216,21 @@ export default {
     this.getListData()
   },
   methods: {
-    noAdd(){
+    noAdd() {
       this.dialogVisibleAdd = false
       this.form = {
-              attenuationRate: '',
-              name: '',
-              hourGeneratingCapacity: '',
-              isc: '',
-              modelNumber: '',
-              ocv: '',
-              size: '',
-              specification: '',
-              standardOperatingCurrent: '',
-              standardOperatingVoltage: '',
-              standardPower: ''
+        attenuationRate: '',
+        name: '',
+        code: '',
+        hourGeneratingCapacity: '',
+        isc: '',
+        modelNumber: '',
+        ocv: '',
+        size: '',
+        specification: '',
+        standardOperatingCurrent: '',
+        standardOperatingVoltage: '',
+        standardPower: ''
       }
     },
     okAdd() {
@@ -214,6 +238,7 @@ export default {
       let data = {
         projectSn: this.projectSn,
         name: this.form.name,
+        devSn: this.form.code,
         attenuationRate: this.form.attenuationRate,
         hourGeneratingCapacity: this.form.hourGeneratingCapacity,
         id: this.form.id,
@@ -231,18 +256,19 @@ export default {
           this.$message.success('新增成功！')
           this.getListData()
           this.form = {
-              attenuationRate: '',
-              name: '',
-              hourGeneratingCapacity: '',
-              isc: '',
-              modelNumber: '',
-              ocv: '',
-              size: '',
-              specification: '',
-              standardOperatingCurrent: '',
-              standardOperatingVoltage: '',
-              standardPower: ''
-      }
+            attenuationRate: '',
+            code: '',
+            name: '',
+            hourGeneratingCapacity: '',
+            isc: '',
+            modelNumber: '',
+            ocv: '',
+            size: '',
+            specification: '',
+            standardOperatingCurrent: '',
+            standardOperatingVoltage: '',
+            standardPower: ''
+          }
         } else {
           this.$message.success('新增失败！')
         }
@@ -252,6 +278,7 @@ export default {
       this.dialogVisibleEdit = false
       let data = {
         projectSn: this.projectSn,
+        code: this.editForm.code,
         name: this.editForm.name,
         attenuationRate: this.editForm.attenuationRate,
         hourGeneratingCapacity: this.editForm.hourGeneratingCapacity,