feat:fix bugs

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 '账号';
 

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>

weapp/package/advisoryNotice/advisoryNotice.js

@@ -41,6 +41,8 @@ Page({
             },()=>{
                 wx.hideLoading()
             })
+        }else{
+            wx.hideLoading()  
         }
     })
   },

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" />

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'
         })
     },
 

weapp/pages/myInfo/myInfo.wxml

@@ -38,11 +38,13 @@
       </view>
       <image class="right" src="/images/right.svg"></image>
     </view>
+    <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'>
       退出登录

web/client/src/sections/advisoryNotice/components/addAdvisoryNoticeModal.js

@@ -58,10 +58,10 @@ function AddAdvisoryNoticeModal(props) {
         disabled={disabled ? true : false}
       />
       <ProFormTextArea
-        rules={[{ required: true, message: '咨询内容' }]}
+        rules={[{ required: true, message: '咨讯内容' }]}
-        placeholder='请输入咨询内容'
+        placeholder='请输入咨讯内容'
         name='content'
-        label='咨询内容'
+        label='咨讯内容'
         disabled={disabled ? true : false}
       />
     <div className='ant-col ant-col-xs-24'>

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

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