From c58986cd2d732194fd68a901b9ad5fceebc8d904 Mon Sep 17 00:00:00 2001
From: nieli <329261568@qq.com>
Date: Thu, 24 Nov 2022 18:02:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=E5=8E=BB=E6=8E=89=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E4=B8=8B=20=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=82=E5=90=88=E5=90=8C=E7=A7=BB=E8=87=B3?=
 =?UTF-8?q?=20=E8=83=BD=E6=BA=90=E7=AE=A1=E7=90=86=20=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/project/profileV2/EObjectInfo.vue     | 90 +------------------
 1 file changed, 2 insertions(+), 88 deletions(-)

diff --git a/src/views/iot/project/profileV2/EObjectInfo.vue b/src/views/iot/project/profileV2/EObjectInfo.vue
index 5ac88eee..2ca2aa50 100644
--- a/src/views/iot/project/profileV2/EObjectInfo.vue
+++ b/src/views/iot/project/profileV2/EObjectInfo.vue
@@ -90,92 +90,6 @@
 
     <!-- ---- -->
 
-    <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 >
@@ -201,7 +115,7 @@ export default {
   watch: {
     infoData(val) {
       if (val) {
-        this.getContractById();
+        //this.getContractById();
       }
     },
   },
@@ -212,7 +126,7 @@ export default {
     };
   },
   created() {
-    this.getContractById()
+    // this.getContractById()
   },
   methods: {
     // 菜单状态字典翻译

From 4d4b9bf91ae3a7ba15d9cdd7cf4b4b0fe4047829 Mon Sep 17 00:00:00 2001
From: nieli <329261568@qq.com>
Date: Fri, 25 Nov 2022 10:14:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(api)!:=20=20=E5=AF=86=E9=92=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/apiSecret.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/system/apiSecret.js b/src/api/system/apiSecret.js
index 01822b6f..b94959e2 100644
--- a/src/api/system/apiSecret.js
+++ b/src/api/system/apiSecret.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询api密钥列表
 export function listSecret(query) {
     return request({
-        url: '/system/secret/list',
+        url: '/iot/secret/list',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function listSecret(query) {
 // 查询api密钥详细
 export function getSecret(recordId) {
     return request({
-        url: '/system/secret/' + recordId,
+        url: '/iot/secret/' + recordId,
         method: 'get'
     })
 }
@@ -20,7 +20,7 @@ export function getSecret(recordId) {
 // 新增api密钥
 export function addSecret(data) {
     return request({
-        url: '/system/secret',
+        url: '/iot/secret',
         method: 'post',
         data: data
     })
@@ -29,7 +29,7 @@ export function addSecret(data) {
 // 修改api密钥
 export function updateSecret(data) {
     return request({
-        url: '/system/secret',
+        url: '/iot/secret',
         method: 'put',
         data: data
     })
@@ -38,7 +38,7 @@ export function updateSecret(data) {
 // 删除api密钥
 export function delSecret(recordId) {
     return request({
-        url: '/system/secret/' + recordId,
+        url: '/iot/secret/' + recordId,
         method: 'delete'
     })
 }
@@ -46,7 +46,7 @@ export function delSecret(recordId) {
 // 导出api密钥
 export function exportSecret(query) {
     return request({
-        url: '/system/secret/export',
+        url: '/iot/secret/export',
         method: 'get',
         params: query
     })