Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

WebRoot/integration.html

@@ -142,8 +142,8 @@
 
     <script>
         $(function () {
-            $('#kcyy').click(function () {
+            $('#kcyy').click(function () {                
-                window.location.href = 'http://10.10.14.203/#/de-link/qvnN2lJM';
+                window.open('http://10.10.14.203/#/de-link/qvnN2lJM', '_blank');
             });
         });
     </script>

WebRoot/view/yunxiao/match_lesson.html

@@ -87,7 +87,7 @@
                         title: '匹配学校名称',
                         shade: 0.1,
                         area: ['650px', '450px'],
-                        content: './update_lesson.html?o_name=' + Base64.encode(obj.data.original_school_name) + '&lesson_name=' + Base64.encode(obj.data.lesson_name) + '&lesson_id=' + obj.data.lesson_id
+                        content: './update_lesson.html?lesson_name=' + Base64.encode(obj.data.lesson_name) + '&lesson_id=' + obj.data.lesson_id
 
                     });
                 }

WebRoot/view/yunxiao/update_lesson.html

@@ -78,12 +78,10 @@
             var form = layui.form;
             var $ = layui.jquery;
             var laytpl = layui.laytpl;
-
+            
-            var original_school_name = Base64.decode(GetQueryString("o_name"));
             var lesson_name = Base64.decode(GetQueryString("lesson_name"));
             var lessonId = GetQueryString("lesson_id");
-
+            
-            $("#original_school_name").val(original_school_name);
             $("#lesson_name").val(lesson_name);
 
             $.ajax({

src/main/java/Tools/ZhengZhou103/AddWenNum.java

@@ -93,7 +93,7 @@ public class AddWenNum {
         Db103Util.Init();
 
         //想要添加的文号
-        String wenHao = "郑动联";
+        String wenHao = "郑政办";
 
         //1、form下的json数据
         Kv kv = addForm(wenHao);