Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/device/device-client/config/inno.iss

@@ -0,0 +1,45 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "device-client"
+#define MyAppVersion "1.0.0.0"
+#define MyAppPublisher "usoftchina.com"
+#define MyAppURL "https://www.usoftchina.com/"
+#define MyAppExeName "device-client.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{B53F1479-C51D-4EC5-9E67-C6A0D6705E75}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DisableProgramGroupPage=yes
+OutputBaseFilename=setup
+SetupIconFile=F:\workspace\smartschool-platform\applications\device\device-client\src\main\resources\icon.ico
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "F:\workspace\smartschool-platform\applications\device\device-client\target\device-client.exe"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/AccessControlServiceImpl.java

@@ -94,7 +94,7 @@ public class AccessControlServiceImpl implements AccessControlService{
         record.setRecord_type(type);
         record.setStu_id(studentInfo.getStuId());
         record.setStu_number(studentInfo.getStuNumber());
-        record.setRecord_name(studentInfo.getStuName() + (type == 1 ? "进人" : "出去"));
+        record.setRecord_name(studentInfo.getStuName() + (type == 1 ? "进入" : "出去"));
         accessControlRecordMapper.insertRecordSelective(record);
         /**
          * 3、推送消息到消息服务器（微信服务监听此消息发送微信消息）
@@ -104,10 +104,10 @@ public class AccessControlServiceImpl implements AccessControlService{
         msg.setSecret(studentInfo.getSecret());
         msg.setTouser(studentInfo.getOpenId());
         msg.setTemplateId(accessControlTemplateId);
-        msg.setTitle("出入校提醒");
+        msg.setTitle((type == 1 ? "入" : "出") + "校提醒");
         msg.setKeyword1(studentInfo.getStuName());
         msg.setKeyword2(DateUtils.format());
-        msg.setRemark("您好! 你的孩子: " + studentInfo.getStuName() + (type == 1 ? " 进人" : " 出去") + "学校");
+        msg.setRemark("您好! 你的孩子: " + studentInfo.getStuName() + (type == 1 ? " 进入" : " 离开") + "学校");
         wechatApi.sendMsg(msg);
     }
 

frontend/wechat-web/src/modules/hiPages/approvel-detail/ItemApprovel.js

@@ -21,7 +21,7 @@ export default class ItemApprovel extends Component{
                     <div style={{width:10,height:10,background:'#BDBDBD',borderRadius:'30px'}}></div>
                     <div style={{marginLeft:10,width:"62%"}}>
                         <div ><span style={{color:'#000000',fontSize:15}}>{this.props.itemdata.value }</span><span style={{color:'#666666',fontSize:12,marginLeft:10}}>{this.props.approveDate}</span></div>
-                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{this.props.suggest.value==null?"":"(审批语:"+this.props.suggest.value+")"}</span></div>
+                        <div style={{color:"#666666",fontSize:12,marginTop:5,wordWrap:'break-word'}}><span>{(this.props.suggest.value==null || this.props.suggest.value==undefined)?"":"(审批语:"+this.props.suggest.value+")"}</span></div>
                     </div>
                     <div style={{fontSize:12,textAlign:'right'}} className={this.props.approveStatus == 1?'doing':'done'}>
                         {this.props.approveStatus == 1 ? '等待审批' : (this.props.approveStatus == 2 ? '已同意' : '已拒绝')}</div>

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.css

@@ -13,4 +13,9 @@
 }
 .done{
     color: #666666;
+}
+.no_data{
+    background: #F4F4F4;
+    background-size: 100% 100%;
+    height: 100vh;
 }

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js

@@ -20,7 +20,7 @@ import RefreshLayout from "../../../components/RefreshLayout";
 import {Skeleton, List} from 'antd';
 import {getIntValue, getStrValue, isObjEmpty} from "../../../utils/common";
 import {saveListState} from "../../../redux/actions/listState";
-
+import nodata_img from '../../../style/imgs/no_data.png';
 let myApplypageIndex = 0;
 let myApprovepageIndex = 0;
 const mPageSize = 10
@@ -169,10 +169,19 @@ class Approvel extends Component {
                      }}>
                     <div className="swiper-wrapper">
                         <div className="swiper-slide" >
-                            {isMyapplyItems}
+                            {
+                                this.state.applyList.length > 0 ? isMyapplyItems
+                                    :
+                                    <div className="no_data"><img src={nodata_img} alt="" style={{width:'100%',height:'auto'}}/></div>
+                            }
                         </div>
                         <div className="swiper-slide">
-                            {isMyapproveItems}
+                            {
+                                this.state.approvelList.length > 0 ? isMyapproveItems
+                                    :
+                                    <div className="no_data"><img src={nodata_img} alt=""
+                                                                  style={{width: '100%', height: 'auto'}}/></div>
+                            }
                         </div>
                     </div>
                 </div>

frontend/wechat-web/src/modules/home/HomePage.jsx

@@ -74,7 +74,8 @@ class HomePage extends Component {
             this.props.userInfo.parent.students.forEach((item, index) => {
                 if (this.props.userInfo.parent.student.stuId == item.stuId) {
                     this.setState({
-                        studentIndex: index
+                        studentIndex: index,
+                        selectStuName:this.props.userInfo.parent.student.stuName
                     })
                 }
             })
@@ -320,7 +321,7 @@ class HomePage extends Component {
                 {
                     userInfo.userRole === 1 ?
                         <div className='home-student-layout-root' style={{display:'flex',flexDirection:'column'}}>
-                            <div  className='home-top-msg-text'>{userName +' | ' + schoolName}</div>
+                            <div  className='home-top-msg-text'>{this.state.selectStuName +' | ' + schoolName}</div>
                         </div>
                         :
                         <div className='home-top-msg-root' style={{paddingBottom:10}}>

frontend/wechat-web/src/style/css/consume-re.css

@@ -154,8 +154,8 @@
 }
 
 .notify-item-caption {
-    width: 70px;
-    margin: 0 10px;
+    width:80px;
+    margin: 0 0 0 10px;
     font-family: PingFangSC-Regular;
     font-size: 14px;
     color: #999999;