bug修复

renren-admin/src/main/resources/statics/js/modules/qmgj/codeDetail.js

@@ -1,12 +1,12 @@
 var i = getUrlParam("id");
 $(function () {
     $("#jqGrid").jqGrid({
-        url: baseURL + 'qyh/pointsRecord/pointsRecordPage',
-        postData: {memberId: i},
+        url: baseURL + 'qmjz/scoreStu/page',
+        postData: { stuId: i},
         datatype: "json",
         colModel: [
             { label: 'id', name: 'id', index: 'id', width: 50, key: true, hidden: true },
-            { label: '积分事件', name: 'taskName', index: 'taskName', width: 80, sortable: false},
+            { label: '积分事件', name: 'scoreEvent', index: 'scoreEvent', width: 80, sortable: false},
             { label: '积分数', name: 'scoreValue', index: 'scoreValue', width: 80 },
             { label: '创建时间', name: 'createTime', index: 'createTime', width: 100 },
         ],
@@ -20,14 +20,14 @@ $(function () {
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader : {
-            root: "page.list",
-            page: "page.currPage",
-            total: "page.totalPage",
-            records: "page.totalCount"
+            root: "list",
+            page: "currPage",
+            total: "totalPage",
+            records: "totalCount"
         },
         prmNames : {
-            page:"page",
-            rows:"limit",
+            page:"pageNum",
+            rows:"pageSize",
             order: "order"
         },
         gridComplete:function(){

renren-admin/src/main/resources/statics/js/modules/qyh/chuangsai.js

@@ -287,7 +287,10 @@ var vm = new Vue({
             vm.queryParam.status = '';
         },
         reset: function () {
-            vm.queryParam = {};
+            vm.queryParam.title = null;
+            vm.queryParam.status = null;
+            vm.queryParam.publishStartTime = null;
+            vm.queryParam.publishEndTime = null;
             vm.init();
             vm.reload(1);
         },

renren-admin/src/main/resources/statics/js/modules/sys/role.js

@@ -215,7 +215,11 @@ var vm = new Vue({
         },
         getMenuTree: function(roleId) {
             //加载菜单树
-            $.get(baseURL + "sys/menu/list", function(r){
+            $.get(baseURL + "sys/menu/list", function (r) {
+                if (r.code == 500) {
+                    return
+                }
+                // console.log('==============', r);
                 menu_ztree = $.fn.zTree.init($("#menuTree"), menu_setting, r);
                 //展开所有节点
                 menu_ztree.expandAll(true);

renren-admin/src/main/resources/templates/index.html

@@ -122,12 +122,12 @@
     </div>
     <!-- /.content-wrapper -->
 
-    <footer class="main-footer">
+    <!-- <footer class="main-footer">
         <div class="pull-right hidden-xs">
             Version 4.0.0
         </div>
         Copyright &copy; 2022 青雲慧. All rights reserved.
-    </footer>
+    </footer> -->
 
     <!-- Add the sidebar's background. This div must be placed
          immediately after the control sidebar -->

renren-generator/src/main/resources/views/index.html

@@ -88,12 +88,12 @@
   </div>
   <!-- /.content-wrapper -->
 
-  <footer class="main-footer">
+  <!-- <footer class="main-footer">
     <div class="pull-right hidden-xs">
       Version 1.0.0
     </div>
     Copyright &copy; 2019 <a href="https://www.renren.io" target="_blank">renren.io</a> All Rights Reserved
-  </footer>
+  </footer> -->
 
   <!-- Add the sidebar's background. This div must be placed
        immediately after the control sidebar -->