From 8f3a8a02e37201f214c0a4676538b763de15a057 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 1 Apr 2024 19:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E7=9B=91=E6=B5=8B=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=9B=B4=E6=8D=A2?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AE=89=E5=85=A8=E6=89=BF=E8=AF=BA?=
=?UTF-8?q?=E4=B9=A6=E5=88=97=E8=A1=A8=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../meteorologicalMonitoringDisplay/index.vue | 6 +++---
.../promise_book_issued/components/list.vue | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
index 3fef542..efcee40 100644
--- a/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
+++ b/src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="iframe-container">
<iframe
- :src="'https://mp.usr.cn/usr-draw/show.html?lightbox=1&highlight=0000ff&layers=1&nav=1&title=%E6%99%BA%E8%83%BD%E6%B0%94%E8%B1%A1%E7%AB%99&usr_id=207946&usr_link=Wt2OfbLeouZN&usr_model=0&share=48731e90a0f82a912c7b63b9fa5e34f8c2c8639d6146b9bde2e91b42fce5c7e74684b277c157c298bfbca1da5b94667e12a65a91d94f70a0bb875763f73320854738c931dd1c1e87d15c65936e9217568bf33e33130b990a8a6d0434d0395eea2b9cd07ff34b52293eccc74a12aae785c364f78b050532881ee42818d883025f0a72d8056995c0485f48dcd48e8d0479a6989a818775df7cea20238731742b3cee699873b4fc46a1dd3ed15484b849bd5f65c4df7f9810e803c1e96a69cb6aea633f22ba2f4b0d1c025cd49f046bfbb15a1d14a974297fe1aab4675a08d8c37f6af2fffaa4af012ca7683ecd80f98e5527c7fabac9c0914b04e049451d33ad0b37bc0d9602e37033f32bdc9c540dccc011e43e79f2800015bb16916701a1ab0f#A'"
+ :src="'http://192.168.42.57:8080/QinHuangDao'"
width="100%"
height="100%"
allowfullscreen
@@ -25,8 +25,8 @@ export default {
.iframe-container {
position: fixed;
top: 10;
- left: 0;
- width: 100%;
+ left: 10;
+ width: 90%;
height: 90%;
}
</style>
diff --git a/src/views/security_commitment/promise_book_issued/components/list.vue b/src/views/security_commitment/promise_book_issued/components/list.vue
index 11cc357..60ce412 100644
--- a/src/views/security_commitment/promise_book_issued/components/list.vue
+++ b/src/views/security_commitment/promise_book_issued/components/list.vue
@@ -100,7 +100,7 @@
<el-button type="success" icon="el-icon-view" size="mini" @click="goSee(row.PROMISE_ID)">查看</el-button>
<el-button v-if="row.STATE === '1'" type="success" icon="el-icon-check" size="mini" @click="goEnableOrDisable('0',row.PROMISE_ID)">启用</el-button>
<el-button v-if="row.STATE === '0'" type="danger" icon="el-icon-close" size="mini" @click="goEnableOrDisable('1',row.PROMISE_ID)">禁用</el-button>
- <el-button :disabled="row.ISSIGN !== 0" type="primary" icon="el-icon-edit" size="mini" @click="goAddOrEdit(row.PROMISE_ID)">编辑</el-button>
+ <el-button :disabled="(row.TYPE == '1' && row.ISSIGN != 1 && row.ISSIGN != 0) || (row.TYPE == '0' && row.ISSIGN != 0)" type="primary" icon="el-icon-edit" size="mini" @click="goAddOrEdit(row.PROMISE_ID)">编辑</el-button>
<el-button icon="el-icon-view" size="mini" @click="goDetails(row.PROMISE_ID)">详情</el-button>
</template>
</el-table-column>