From f12825af5ff3003b9f30d3290b5ca35e8ff0e740 Mon Sep 17 00:00:00 2001
From: sundalingg <1036752192@qq.com>
Date: Fri, 29 Dec 2023 15:23:40 +0800
Subject: [PATCH] feat:fix bugs

---
 script/1.7/schema/2.create_network.sql               |  2 +-
 weapp/package/AIOTOverview/AIOTOverview.wxml         |  2 +-
 weapp/package/advisoryNotice/advisoryNotice.js       |  2 ++
 weapp/package/advisoryNotice/detail/detail.wxml      |  2 +-
 weapp/pages/myInfo/myInfo.js                         |  6 ++++--
 weapp/pages/myInfo/myInfo.wxml                       |  4 +++-
 .../components/addAdvisoryNoticeModal.js             |  6 +++---
 .../advisoryNotice/containers/advisoryNotice.js      | 12 ++++++++++--
 .../src/sections/deviceManage/containers/network.js  |  2 +-
 9 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/script/1.7/schema/2.create_network.sql b/script/1.7/schema/2.create_network.sql
index 510da6c..9e4eff2 100644
--- a/script/1.7/schema/2.create_network.sql
+++ b/script/1.7/schema/2.create_network.sql
@@ -16,7 +16,7 @@ comment on table network is '宽带专网';
 
 comment on column network.name is '专网名称';
 
-comment on column network.type is '专网类型/*1.专网，2.内网*/';
+comment on column network.type is '专网类型/*1.外网，2.内网*/';
 
 comment on column network.account is '账号';
 
diff --git a/weapp/package/AIOTOverview/AIOTOverview.wxml b/weapp/package/AIOTOverview/AIOTOverview.wxml
index 2c2442f..adef815 100644
--- a/weapp/package/AIOTOverview/AIOTOverview.wxml
+++ b/weapp/package/AIOTOverview/AIOTOverview.wxml
@@ -80,7 +80,7 @@
       </view>
       <view class="row flex flex-between detail">
         <view class="content-left">欠费</view>
-        <view class="content-right" style="color:yellow">{{count.abnormal+'个'}}</view>
+        <view class="content-right" style="color:red">{{count.abnormal+'个'}}</view>
       </view>
     </view>
 </view>
diff --git a/weapp/package/advisoryNotice/advisoryNotice.js b/weapp/package/advisoryNotice/advisoryNotice.js
index 33f5456..337d5dd 100644
--- a/weapp/package/advisoryNotice/advisoryNotice.js
+++ b/weapp/package/advisoryNotice/advisoryNotice.js
@@ -41,6 +41,8 @@ Page({
             },()=>{
                 wx.hideLoading()
             })
+        }else{
+            wx.hideLoading()  
         }
     })
   },
diff --git a/weapp/package/advisoryNotice/detail/detail.wxml b/weapp/package/advisoryNotice/detail/detail.wxml
index fe21df3..3ce592f 100644
--- a/weapp/package/advisoryNotice/detail/detail.wxml
+++ b/weapp/package/advisoryNotice/detail/detail.wxml
@@ -1,8 +1,8 @@
 <!--package/advisoryNotice/detail/detail.wxml-->
 <view class="card">
     <view style="text-align: center;margin-bottom:20rpx">{{detailData.title}}</view>
+    <view style=" margin-top: 20rpx; margin-right:20rpx;text-align: center; font-size:12px">{{time}}</view>
     <view>{{detailData.content}}</view>
-    <view style="position: absolute; right: 0; margin-top: 20rpx; margin-right:20rpx ;">发布时间：{{time}}</view>
 
     <view wx:for="{{imgList}}"  wx:for-item="img" wx:key="*this" >
         <image class="img" src="{{imgUrl+img}}" mode="aspectFit" />
diff --git a/weapp/pages/myInfo/myInfo.js b/weapp/pages/myInfo/myInfo.js
index f6ae1fa..5bcda7b 100644
--- a/weapp/pages/myInfo/myInfo.js
+++ b/weapp/pages/myInfo/myInfo.js
@@ -8,7 +8,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-
+        vis:false
     },
 
     bindClick () {
@@ -51,8 +51,10 @@ toDetail(){
     onLoad (options) {
         let that = this;
         let userInfo = wx.getStorageSync('userInfo');
+        let userRole = wx.getStorageSync('userRole');
         that.setData({
-            userInfo
+            userInfo,
+            vis:userRole?.includes('管理')|| userInfo.username==='SuperAdmin'
         })
     },
 
diff --git a/weapp/pages/myInfo/myInfo.wxml b/weapp/pages/myInfo/myInfo.wxml
index c850055..c47bc9c 100644
--- a/weapp/pages/myInfo/myInfo.wxml
+++ b/weapp/pages/myInfo/myInfo.wxml
@@ -38,10 +38,12 @@
       </view>
       <image class="right" src="/images/right.svg"></image>
     </view>
-    <view class='body-item' bindtap="toDetail">
+    <view wx:if="{{vis}}">
+        <view class='body-item' bindtap="toDetail">
       <view class='body-info'>资讯公告</view>
       <image class="right" src="/images/right.svg"></image>
     </view>
+    </view>
   </view>
   <view class='foot-container'>
     <view class='foot-item' bindtap='logout'>
diff --git a/web/client/src/sections/advisoryNotice/components/addAdvisoryNoticeModal.js b/web/client/src/sections/advisoryNotice/components/addAdvisoryNoticeModal.js
index ce4de34..fc79dc2 100644
--- a/web/client/src/sections/advisoryNotice/components/addAdvisoryNoticeModal.js
+++ b/web/client/src/sections/advisoryNotice/components/addAdvisoryNoticeModal.js
@@ -58,10 +58,10 @@ function AddAdvisoryNoticeModal(props) {
         disabled={disabled ? true : false}
       />
       <ProFormTextArea
-        rules={[{ required: true, message: '咨询内容' }]}
-        placeholder='请输入咨询内容'
+        rules={[{ required: true, message: '咨讯内容' }]}
+        placeholder='请输入咨讯内容'
         name='content'
-        label='咨询内容'
+        label='咨讯内容'
         disabled={disabled ? true : false}
       />
     <div className='ant-col ant-col-xs-24'>
diff --git a/web/client/src/sections/advisoryNotice/containers/advisoryNotice.js b/web/client/src/sections/advisoryNotice/containers/advisoryNotice.js
index 2544173..d14da7a 100644
--- a/web/client/src/sections/advisoryNotice/containers/advisoryNotice.js
+++ b/web/client/src/sections/advisoryNotice/containers/advisoryNotice.js
@@ -51,7 +51,7 @@ function AdvisorNotice(props) {
   const tableDatas = useMemo(() => {
     const { title } = tableParams
     let rslt = dataSource
-    rslt = rslt.filter(s => (title ? (s.title ? s.title === title : false) : true))
+    rslt = rslt.filter(s => (title ? (s.title ? s.title.includes(title)  : false) : true))
     return rslt
   })
   //上架下架处理
@@ -117,7 +117,15 @@ function AdvisorNotice(props) {
           />
         )
         options.push(
-          <a onClick={()=>{publishHandler(record)}}>{record?.state===2?'下架':'发布'}</a>
+          <Popconfirm
+            key='del'
+            placement='top'
+            title={record?.state===2?'确定下架吗？':'确定发布吗？'}
+            onConfirm={() => publishHandler(record)}
+            okText='是'
+            cancelText='否'>
+            <a>{record?.state===2?'下架':'发布'}</a>
+          </Popconfirm>
         )
         record.state ===1||record.state ===3? options.push(
           <AddAdvisoryNoticeModal
diff --git a/web/client/src/sections/deviceManage/containers/network.js b/web/client/src/sections/deviceManage/containers/network.js
index 84879fa..38c43c5 100644
--- a/web/client/src/sections/deviceManage/containers/network.js
+++ b/web/client/src/sections/deviceManage/containers/network.js
@@ -7,7 +7,7 @@ import AddNetworkModal from '../components/addNetworkModal';
 
 
 
-const type=[{id:1,label:'专网'},{id:2,label:'公网'}]
+const type=[{id:1,label:'外网'},{id:2,label:'内网'}]
 function Network(props) {
   const { loading, clientHeight, actions, dispatch, } = props
   const { deviceManage,projectRegime} = actions