Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -1,15 +1,15 @@
-//var config = {
-//    webapi: 'http://localhost:8088/',
-//    web: "http://localhost:8087/"//web地址，用于配置logo
-//};
+var config = {
+    webapi: 'http://localhost:8088/',
+    web: "http://localhost:8087/"//web地址，用于配置logo
+};
 //var config = {
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
-var config = {
-    webapi: 'http://localhost:31173/',
-    web: "http://localhost:20472/"//web地址，用于配置logo
-}; 
+//var config = {
+//    webapi: 'http://localhost:31173/',
+//    web: "http://localhost:20472/"//web地址，用于配置logo
+//}; 
 
 
 //var config = {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js

@@ -201,7 +201,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js

@@ -72,7 +72,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryList/Ass_InventoryList.js

@@ -82,7 +82,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/BookBorrow/BookBorrow.js

@@ -105,7 +105,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpRegister/EmpRegister.js

@@ -32,7 +32,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessage.js

@@ -98,7 +98,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/SchoolCalendar.js

@@ -103,7 +103,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/SchoolCalendar/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeave.js

@@ -102,7 +102,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuAttendanceLeave/form/form.js

@@ -70,7 +70,7 @@
             //                                } 
             //                            }); 
             //                        } 
-            //                    }, 'Learun敏捷框架提示', ['取消', '确定']); 
+            //                    }, '智慧校园提示', ['取消', '确定']); 
             //                } 
             //            } 
             //        ], 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/StuConsumption.js

@@ -130,7 +130,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuConsumption/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoBasic/form/form.js

@@ -85,7 +85,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js

@@ -126,7 +126,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js

@@ -37,7 +37,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -69,7 +69,7 @@
             //                                }
             //                            });
             //                        }
-            //                    }, 'Learun智慧校园提示', ['取消', '确定']);
+            //                    }, '智慧校园提示', ['取消', '确定']);
             //                }
             //            }
             //        ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html

@@ -40,6 +40,10 @@
             班级
             <span id="ClassNo"></span>
         </div>
+        <div class="welText">
+            默认教室
+            <span id="DefaultClassRoomName"></span>
+        </div>
         <div class="welText">
             班主任编号
             <span id="ClassDiredctorNo"></span>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/StuMail.js

@@ -97,7 +97,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuMail/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js

@@ -124,7 +124,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/TeachPlan.js

@@ -118,7 +118,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun敏捷框架提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/TeachPlan/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun敏捷框架提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun敏捷框架提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.js

@@ -167,7 +167,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                         //                    }
                         //                });
                         //            }
-                        //        }, 'Learun智慧校园提示', ['取消', '确定']);
+                        //        }, '智慧校园提示', ['取消', '确定']);
                         //    }
                         //}
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LR_OAModule/Notice/Notice.js

@@ -94,7 +94,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/ListenClassRecord.js

@@ -113,7 +113,7 @@
                         learun.layer.loading(false); 
                     }); 
                 } 
-            }, 'Learun智慧校园提示', ['取消', '确定']); 
+            }, '智慧校园提示', ['取消', '确定']); 
         }, 
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮 
     }; 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/LogisticsManagement/ListenClassRecord/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent(); 
                         } 
                     } 
-                }, 'learun智慧校园提示', ['取消', '确定']); 
+                }, '智慧校园提示', ['取消', '确定']); 
             }); 
             // 编辑 
             $header.find('.lr-form-header-edit').on('tap', function () { 
@@ -70,7 +70,7 @@
                                             } 
                                         }); 
                                     } 
-                                }, 'Learun智慧校园提示', ['取消', '确定']); 
+                                }, '智慧校园提示', ['取消', '确定']); 
                             } 
                         } 
                     ], 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/ActivitySchedule.js

@@ -100,7 +100,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ActivitySchedule/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/ClassWork.js

@@ -109,7 +109,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ClassWork/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/CommunityInfo.js

@@ -99,7 +99,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         btnJoinClick: function (item, $item, $page) {// 左滑按钮点击事件
             learun.layer.confirm('确定要申请加入该社团吗？', function (_index) {
@@ -112,7 +112,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
         rowBtns: ['<a class="lr-btn-join">申请加入</a>'] // 列表行左滑按钮

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityInfo/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/CommunityMember/CommunityMember.js

@@ -105,7 +105,7 @@
         //                learun.layer.loading(false);
         //            });
         //        }
-        //    }, 'Learun智慧校园提示', ['取消', '确定']);
+        //    }, '智慧校园提示', ['取消', '确定']);
         //},
         //rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/ContactsDetails.js

@@ -119,7 +119,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/ContactsDetails/form/form.js

@@ -39,7 +39,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -71,7 +71,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/EmpRepair.js

@@ -102,7 +102,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EmpRepair/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituation/EpidemicSituation.js

@@ -141,7 +141,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js

@@ -155,7 +155,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/Schedule.js

@@ -105,7 +105,7 @@
                         learun.layer.loading(false);
                     });
                 }
-            }, 'Learun智慧校园提示', ['取消', '确定']);
+            }, '智慧校园提示', ['取消', '确定']);
         },
         rowBtns: ['<a class="lr-btn-danger">删除</a>'] // 列表行左滑按钮
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/Schedule/form/form.js

@@ -38,7 +38,7 @@
                             learun.nav.closeCurrent();
                         }
                     }
-                }, 'learun智慧校园提示', ['取消', '确定']);
+                }, '智慧校园提示', ['取消', '确定']);
             });
             // 编辑
             $header.find('.lr-form-header-edit').on('tap', function () {
@@ -70,7 +70,7 @@
                                             }
                                         });
                                     }
-                                }, 'Learun智慧校园提示', ['取消', '确定']);
+                                }, '智慧校园提示', ['取消', '确定']);
                             }
                         }
                     ],

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js

@@ -71,7 +71,7 @@
             //                                } 
             //                            }); 
             //                        } 
-            //                    }, 'Learun敏捷框架提示', ['取消', '确定']); 
+            //                    }, '智慧校园提示', ['取消', '确定']); 
             //                } 
             //            } 
             //        ], 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml

@@ -9,6 +9,7 @@
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="考生号/准考证号/姓名/身份证号" />
+                        <input id="Grade" type="text" class="form-control" placeholder="年级" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js

@@ -17,7 +17,8 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#btn_Search').on('click', function () {
                 var keyword = $('#txt_Keyword').val();
-                page.search({ keyword: keyword });
+                var Grade = $('#Grade').val();
+                page.search({ keyword: keyword, Grade: Grade });
             });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -172,6 +173,7 @@ var bootstrap = function ($, learun) {
                     { label: '考生号', name: 'ksh', width: 150, align: "left" },
                     { label: '准考证号', name: 'zkzh', width: 150, align: "left" },
                     { label: '学号', name: 'StuNo', width: 100, align: "left" },
+                    { label: '年级', name: 'Grade', width: 100, align: "left" },
                     { label: '姓名', name: 'StuName', width: 100, align: "left" },
                     {
                         label: '是否完善信息', name: 'ID', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs

@@ -37,6 +37,7 @@ namespace Learun.Application.WebApi.Modules
         private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL();
         private AccommodationIBLL accdormitoryIBLL = new AccommodationBLL();
         private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL();
+        private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL();
 
         /// <summary>
         /// 获取个人信息
@@ -60,19 +61,34 @@ namespace Learun.Application.WebApi.Modules
                 if (classInfoEntity != null)
                 {
                     StuInfoFreshEntity.ClassNo = classInfoEntity.ClassName;
-                    StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
-                    StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
-                    var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
-                    if (empInfoEntity != null)
+                    if (classInfoEntity.ClassTutorNo != null)
                     {
-                        StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
-                        StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
+                        StuInfoFreshEntity.ClassTutorNo = classInfoEntity.ClassTutorNo;
+                        var empInfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
+                        if (empInfoEntity != null)
+                        {
+                            StuInfoFreshEntity.ClassTutorName = empInfoEntity.EmpName;
+                            StuInfoFreshEntity.ClassTutorMobile = empInfoEntity.mobile;
+                        }
                     }
-                    var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassTutorNo);
-                    if (empInfoEntity2 != null)
+                    if (classInfoEntity.ClassDiredctorNo != null)
                     {
-                        StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
-                        StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
+                        StuInfoFreshEntity.ClassDiredctorNo = classInfoEntity.ClassDiredctorNo;
+                        var empInfoEntity2 = empInfoIBLL.GetEmpInfoEntityByEmpNo(classInfoEntity.ClassDiredctorNo);
+                        if (empInfoEntity2 != null)
+                        {
+                            StuInfoFreshEntity.ClassDiredctorName = empInfoEntity2.EmpName;
+                            StuInfoFreshEntity.ClassDiredctorMobile = empInfoEntity2.mobile;
+                        }
+                    }
+                    if (classInfoEntity.SerialNum != null)
+                    {
+                        StuInfoFreshEntity.DefaultClassRoomNo = classInfoEntity.SerialNum;
+                        var classroomEntity = classroomInfoIBLL.GetClassroomInfoEntityByNo(classInfoEntity.SerialNum);
+                        if (classroomEntity != null)
+                        {
+                            StuInfoFreshEntity.DefaultClassRoomName = classroomEntity.ClassroomName;
+                        }
                     }
                 }
 
@@ -142,7 +158,7 @@ namespace Learun.Application.WebApi.Modules
 
             return Success(result);
         }
-        
+
         /// <summary>
         /// 保存完善个人信息
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config

@@ -97,7 +97,7 @@
   <add key="ACIp" value="192.168.90.2"/>
   <add key="ACIp2" value="192.168.200.252"/>
   <!-- 是否强制验证强密码 -->
-  <add key="verifypwd" value="true"/>
+  <add key="verifypwd" value="false"/>
   <!--疫情防控组角色Id-->
   <add key="EpidemicControlTeamRoleId" value="87f38e4e-b0a6-472c-b01a-2620b8f1ec46" />
 </appSettings>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs

@@ -663,6 +663,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string ClassDiredctorMobile { get; set; }
         /// <summary>
+        /// 默认教室
+        /// </summary>
+        [NotMapped]
+        public string DefaultClassRoomNo { get; set; }
+        /// <summary>
+        /// 默认教室
+        /// </summary>
+        [NotMapped]
+        public string DefaultClassRoomName { get; set; }
+        /// <summary>
         /// 是否完善信息
         /// </summary>
         [NotMapped]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

@@ -224,6 +224,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(" and t.StuName like @StuName ");
                     dp.Add("StuName", '%' + queryParam["StuName"].ToString() + '%', DbType.String);
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    strSql.Append(" and t.Grade like @Grade ");
+                    dp.Add("Grade", '%' + queryParam["Grade"].ToString() + '%', DbType.String);
+                }
                 //分配班级
                 if (!queryParam["MajorNo"].IsEmpty())
                 {