0017
/
smart-power-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.4.125:32792/04787/smart-power-ui

This commit is contained in:
0000792 2022-11-28 08:39:55 +08:00
parent 6a1d58db49 4d4b9bf91a
commit 6c9a1f83c2
2 changed files with 8 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/system/apiSecret.js
View File

@ -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
})

90
src/views/iot/project/profileV2/EObjectInfo.vue
View File

@ -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: {
// 菜单状态字典翻译