From cca66d26c339c5c850754905f6052f1569c23600 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Sat, 15 May 2021 20:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=B0=E5=BD=95=E5=8F=AF?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=8F=90=E4=BA=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/index.html     |  3 ++-
 safesite/templates/noticeadd.html | 16 +++++++++++++---
 safesite/views.py                 |  5 ++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/safesite/templates/index.html b/safesite/templates/index.html
index 309b077f..d5cd6c08 100644
--- a/safesite/templates/index.html
+++ b/safesite/templates/index.html
@@ -22,7 +22,8 @@
     <script type="text/javascript" src="/static/safesite/mystatic/layer/layer.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/datagrid-export.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/jquery-qrcode-0.17.0.min.js"></script>
-    <script type="text/javascript" src="/static/safesite/mystatic/js/ckeditor.js"></script>
+    <!-- <script type="text/javascript" src="/static/safesite/mystatic/js/ckeditor.js"></script> -->
+    <!-- <script src="https://cdn.ckeditor.com/ckeditor5/27.1.0/classic/ckeditor.js"></script> -->
     <script type="text/javascript" src="/static/safesite/mystatic/openlayer/ol.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/jquery.form.min.js"></script>
     <script type="text/javascript" src="/static/safesite/mystatic/js/jquery.cookie.js"></script>
diff --git a/safesite/templates/noticeadd.html b/safesite/templates/noticeadd.html
index 284fc728..bc3213a5 100644
--- a/safesite/templates/noticeadd.html
+++ b/safesite/templates/noticeadd.html
@@ -39,11 +39,16 @@
                 <ol id="fileol"></ol>
             </div>
             <div style="margin-top:10px;margin-bottom:5px">
-            <textarea id="ckeditor" ></textarea>
+            <textarea id="ckeditor" style="height: 600;"></textarea>
             </div>
         </form>
     </div>
 </div>
+<style>
+    .ck-editor__editable { min-height: 600px; }
+    </style>
+<script src="https://cdn.ckeditor.com/ckeditor5/27.1.0/classic/ckeditor.js"></script>
+<!-- <script type="text/javascript" src="/static/safesite/mystatic/js/ckeditor.js"></script> -->
 <script>
         $('#isgg').switchbutton({
             checked: true,
@@ -58,7 +63,12 @@
                 }
             }
         })
-    CKEDITOR.replace( 'ckeditor',{'height':600});
+    // CKEDITOR.replace( 'ckeditor',{'height':600});
+    var editor = ClassicEditor
+        .create( document.querySelector( '#ckeditor' ) )
+        .catch( error => {
+            console.error( error );
+        } );
     function tzsubmitForm() {
         var tzfile = new Array();
         $(".filea").each(function () {
@@ -71,7 +81,7 @@
             ffqd.push($(this).val());
             });
         tzdata['ffqd']=ffqd
-        tzdata['content']=CKEDITOR.instances.ckeditor.getData();
+        tzdata['content']= editor.getData();
         $.ajax({
             type: "POST",
             url: 'api/notice?a=add',
diff --git a/safesite/views.py b/safesite/views.py
index bace21c4..76813f5d 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -7209,7 +7209,10 @@ def apiinspectitem(req):
                 if 'state' in i:
                     obj.state = i['state']
                     if i['state'] == '异常待处理':
-                        obj.todouser = getpgr2(userid, User.objects.get(userid=userid).ubelongpart)
+                        if 'todouser' in data and data['todouser']:
+                            obj.todouser = User.objects.get(userid=data['todouser'])
+                        else:
+                            obj.todouser = getpgr2(userid, User.objects.get(userid=userid).ubelongpart)
                 obj.checkitem = EquipmentCheckItem.objects.get(pk=i['id']) 
                 obj.inspect = Inspect.objects.get(pk=data['inspect']) 
                 if 'desc' in i: