diff --git a/ruoyi-ui/src/assets/iconfont/demo_index.html b/ruoyi-ui/src/assets/iconfont/demo_index.html
index d9124f98..28fc1e31 100644
--- a/ruoyi-ui/src/assets/iconfont/demo_index.html
+++ b/ruoyi-ui/src/assets/iconfont/demo_index.html
@@ -54,6 +54,12 @@
+ -
+
+
关闭
+ 
+
+
-
卡片未激活
@@ -102,9 +108,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1710497244093') format('woff2'),
- url('iconfont.woff?t=1710497244093') format('woff'),
- url('iconfont.ttf?t=1710497244093') format('truetype');
+ src: url('iconfont.woff2?t=1710745723035') format('woff2'),
+ url('iconfont.woff?t=1710745723035') format('woff'),
+ url('iconfont.ttf?t=1710745723035') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -130,6 +136,15 @@
+ -
+
+
+ 关闭
+
+ .icon-guanbi
+
+
+
-
@@ -202,6 +217,14 @@
+ -
+
+
关闭
+ #icon-guanbi
+
+
-
@@ -118,7 +116,9 @@ export default{
this.moveByLeft();
},
onRight(){
- this.moveByRight();
+ if (this.widthTotal > this.widthBox) {
+ this.moveByRight();
+ }
},
moveByLeft(targetIndex){
// console.log("左侧动", this.startIndex, targetIndex);
@@ -205,12 +205,12 @@ export default{
.list_box{ flex: 1; position: relative; width: 0; overflow: hidden; margin:0;
.list{ position: absolute; left: 0; top:0; display: flex; flex-direction: row; transition: all ease-in-out 0.5s;
.unit {
- cursor: default;
position: relative;
height: 30px;
padding: 0 3px;
.btn_main {
+ cursor: pointer;
background-image: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
border:1px solid #009bcc;
border-radius: 4px;
@@ -229,8 +229,8 @@ export default{
.btn_close {
position: absolute;
right: 6px;
- top: 7px;
- img{ width: 14px; height: 14px;}
+ top:8px;
+ font-size: 12px; color: #3de8ff;
}
}
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index bcd95fe0..e2d68721 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -139,7 +139,7 @@
class="btnInfoBoard"
type="publish"
@click="____onPublish"
- :disabled="selectedBdMsg.length <= 0"
+ :disabled="selectedBdMsg.length <= 0 || selectedDevices.length <=0"
>发布信息
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
index 30d4e810..6022d668 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue
@@ -19,7 +19,7 @@
导出
-
+
@@ -34,6 +34,7 @@
:disable="true"
placeholder="请输入敏感词,回车搜索"
@handleSearch="handleSearch"
+ ref="form"
/>
@@ -201,6 +202,12 @@ export default {
this.searchData = data;
this.getData();
},
+ onReset(){
+ this.searchData.word = undefined;
+ // console.log(this.$refs["form"] , "__-=========");
+ this.$refs["form"].handleResetForm();
+ this.getData();
+ },
async getData() {
// const closeLoading = setLoading();
this.isLoading = true;