From e10cfb4fae63266a26336729cf55604b0553dd80 Mon Sep 17 00:00:00 2001
From: nieli <329261568@qq.com>
Date: Tue, 17 Jan 2023 11:41:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E7=94=B5=E4=BB=B7?=
 =?UTF-8?q?=E5=90=88=E5=90=8C=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/iot/contract.js                       |  58 +++++++++-
 src/views/iot/project/index.vue               |   4 +-
 .../iot/project/profileV2/EObjectInfo.vue     | 104 +++++++++++++++++-
 .../iot/project/profileV2/EPrice/index.vue    |  26 ++---
 5 files changed, 172 insertions(+), 24 deletions(-)

diff --git a/.env.development b/.env.development
index c4ab480f..0a0d95d3 100644
--- a/.env.development
+++ b/.env.development
@@ -14,11 +14,11 @@ port= 9988
 // 陈志荣 本地
  //target = http://192.168.18.140:8899
 // 黄明 本地
-// target = http://192.168.18.134:8899
+ target = http://192.168.18.134:8899
 //target = http://192.168.18.139:8899
 // target = http://192.168.18.136:8899
 
 // 测试端
-  target = http://192.168.10.241:32024
+//  target = http://192.168.10.241:32024
 // 开发端
 // target = http://192.168.10.241:30646
diff --git a/src/api/iot/contract.js b/src/api/iot/contract.js
index 8a684473..6a8ddd99 100644
--- a/src/api/iot/contract.js
+++ b/src/api/iot/contract.js
@@ -20,7 +20,7 @@ export function getContract(contractId) {
 // 新增电价合同
 export function addContract(data) {
     return request({
-        url: '/iot/contract/addContract',
+        url: '/iot/contract',
         method: 'post',
         data: data
     })
@@ -51,3 +51,59 @@ export function exportContract(query) {
         params: query
     })
 }
+
+
+//////////////////////
+
+
+// 查询电价合同列表
+export function listUserContract(query) {
+    return request({
+        url: '/iot/userContract/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询电价合同详细
+export function getUserContract(contractId) {
+    return request({
+        url: '/iot/userContract/' + contractId,
+        method: 'get'
+    })
+}
+
+// 新增电价合同
+export function addUserContract(data) {
+    return request({
+        url: '/iot/userContract',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改电价合同
+export function updateUserContract(data) {
+    return request({
+        url: '/iot/userContract',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除电价合同
+export function delUserContract(contractId) {
+    return request({
+        url: '/iot/userContract/' + contractId,
+        method: 'delete'
+    })
+}
+
+// 导出电价合同
+export function exportUserContract(query) {
+    return request({
+        url: '/iot/userContract/export',
+        method: 'get',
+        params: query
+    })
+}
diff --git a/src/views/iot/project/index.vue b/src/views/iot/project/index.vue
index 7b25e496..a9bd1841 100644
--- a/src/views/iot/project/index.vue
+++ b/src/views/iot/project/index.vue
@@ -201,7 +201,7 @@
             </el-col>
           </el-row>
 
-          <!-- <el-form-item label="电价合同:">
+          <el-form-item label="电价合同:">
             <e-dialog-table-input
               :table="selectPriceTable"
               :refurbishFun="listContract"
@@ -212,7 +212,7 @@
               psize="small"
               @change="handleProiceDialogEvent"
             />
-          </el-form-item> -->
+          </el-form-item>
 
           <el-form-item label="行政区划" prop="regionalismId">
             <!-- <el-input v-model="form.regionalismId" placeholder="请输入行政区划代码" /> -->
diff --git a/src/views/iot/project/profileV2/EObjectInfo.vue b/src/views/iot/project/profileV2/EObjectInfo.vue
index 2ca2aa50..be06ee83 100644
--- a/src/views/iot/project/profileV2/EObjectInfo.vue
+++ b/src/views/iot/project/profileV2/EObjectInfo.vue
@@ -90,6 +90,93 @@
 
     <!-- ---- -->
 
+    <div class="group-list-info" style="margin-top: 20px">
+      <div class="top">
+        <div class="top-label">
+          <svg-icon
+            icon-class="A_product1"
+            style="margin-right: 2px; height: 20px; width: 20px"
+          />电价合同
+          <span
+            v-if="updateState === false"
+            style="margin: 0px 15px 0 10px; font-weight: 200; font-size: 14px"
+            >{{ contrctInfo.contractName }}</span
+          >
+        </div>
+      </div>
+    </div>
+
+    <div class="group-list-table">
+      <div class="table-row">
+        <div class="table-row-col">
+          <div class="title">合同ID</div>
+          <div class="content">
+            <span class="name">{{ contrctInfo.contractId }}</span>
+            <el-button
+              type="text"
+              size="small"
+              @click.stop="copyText(contrctInfo.contractId)"
+              >复制</el-button
+            >
+          </div>
+        </div>
+        <div class="table-row-col">
+          <div class="title">合同类型</div>
+          <div class="content">
+            <span class="group-id">{{ contrctInfo.contractTypeName }}</span>
+          </div>
+        </div>
+        <div class="table-row-col">
+          <div class="title">合同状态</div>
+          <div class="content">
+            <span class="group-id">{{
+              contrctInfo.status === "0" ? "启用" : "禁用"
+            }}</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="table-row">
+        <div class="table-row-col">
+          <div class="title" style="height: 160px">合同规则</div>
+          <div class="content" style="overflow: auto">
+            <div
+              class="crat-warp"
+              v-for="item in contrctInfo.priceContractRuleList"
+              :key="item.ruleNum"
+            >
+              <div class="title-span">{{ item.ruleName }}</div>
+              <div
+                class="time-wrap"
+                v-if="contrctInfo.contractType === 'PEAK_VALLEY'"
+              >
+                <span class="time-title">时间:</span>
+                <div class="time-val">
+                  <span style="color: #3300ff">{{ item.minTime }}</span>
+                  <span>~</span>
+                  <span style="color: #3300ff">{{ item.maxTime }}</span>
+                </div>
+              </div>
+              <div class="time-wrap" v-else>
+                <div class="vlue-warp">
+                  <span>最小值:</span>
+                  <span>{{ item.minVal }}</span>
+                </div>
+                <div class="vlue-warp" >
+                  <span>最大值:</span>
+                  <span :title="item.maxVal">{{ item.maxVal }}</span>
+                </div>
+              </div>
+              <div class="dj-wrap">
+                <span class="dj-title">单价:</span>
+                <span class="dj-value">{{ item.unitPrice }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
   </div>
 </template>
 <script >
@@ -113,11 +200,14 @@ export default {
     },
   },
   watch: {
-    infoData(val) {
-      if (val) {
-        //this.getContractById();
-      }
-    },
+    infoData: {
+      handler: function(val, oldVal) {
+        if (val) {
+          this.getContractById()
+        }
+      },
+      deep: true
+    }
   },
   data() {
     return {
@@ -126,7 +216,7 @@ export default {
     };
   },
   created() {
-    // this.getContractById()
+    this.getContractById()
   },
   methods: {
     // 菜单状态字典翻译
@@ -138,10 +228,12 @@ export default {
     },
     getContractById() {
       if (!this.infoData.contractId && this.infoData.contractId !== 0) {
+        this.contrctInfo = {};
         return;
       }
       getContract(this.infoData.contractId).then((response) => {
         this.contrctInfo = response.data;
+        this.$forceUpdate();
       });
     },
   },
diff --git a/src/views/iot/project/profileV2/EPrice/index.vue b/src/views/iot/project/profileV2/EPrice/index.vue
index 27b2130a..9f78f3a5 100644
--- a/src/views/iot/project/profileV2/EPrice/index.vue
+++ b/src/views/iot/project/profileV2/EPrice/index.vue
@@ -188,12 +188,12 @@
 
 <script>
 import {
-  listContract,
-  getContract,
-  delContract,
-  addContract,
-  updateContract,
-  exportContract
+  listUserContract,
+  getUserContract,
+  delUserContract,
+  addUserContract,
+  updateUserContract,
+  exportUserContract
 } from "@/api/iot/contract";
 
 import TimePickerWrap from "./profile/timePicker";
@@ -361,7 +361,7 @@ export default {
     /** 查询电价合同列表 */
     getList() {
       this.loading = true;
-      listContract(Object.assign(this.queryParams, {
+      listUserContract(Object.assign(this.queryParams, {
         projectId: this.sourceId
       })).then(response => {
         this.contractList = response.rows;
@@ -423,7 +423,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const contractId = row.contractId || this.ids;
-      getContract(contractId).then(response => {
+      getUserContract(contractId).then(response => {
         this.form = response.data;
         this.open = true;
         this.tempType = 'update'
@@ -434,7 +434,7 @@ export default {
     handleDestail(row) {
       this.reset();
       const contractId = row.contractId || this.ids;
-      getContract(contractId).then(response => {
+      getUserContract(contractId).then(response => {
         this.form = response.data;
         this.tempType = 'destail'
         this.open = true;
@@ -446,7 +446,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.contractId != null) {
-            updateContract(Object.assign(this.form, {
+            updateUserContract(Object.assign(this.form, {
               projectId: this.sourceId
             })).then(response => {
               this.msgSuccess("修改成功");
@@ -454,7 +454,7 @@ export default {
               this.getList();
             });
           } else {
-            addContract(Object.assign(this.form, {
+            addUserContract(Object.assign(this.form, {
               projectId: this.sourceId
             })).then(response => {
               this.msgSuccess("新增成功");
@@ -474,7 +474,7 @@ export default {
         type: "warning"
       })
         .then(function() {
-          return delContract(contractIds);
+          return delUserContract(contractIds);
         })
         .then(() => {
           this.getList();
@@ -490,7 +490,7 @@ export default {
         type: "warning"
       })
         .then(function() {
-          return exportContract(queryParams);
+          return exportUserContract(queryParams);
         })
         .then(response => {
           this.download(response.msg);