From cbe9be56166a4154c05e853f18f0f92867322dce Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 15 Jan 2024 10:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/project/question/index.html | 9 ++++-----
 .../main/resources/templates/project/question/view.html  | 5 ++++-
 .../zdxt/knowledge/controller/CustomImageController.java | 1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/index.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/index.html
index 9f6adf1d..0e533c41 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/index.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/index.html
@@ -73,7 +73,7 @@
 
         <div class="btn-export" onclick="Swal.fire({ title: 'Export',
         html: '<pre><code>'+JSON.stringify(editor.export(), null,4)+'</code></pre>'
-        })">Export</div>
+        })" hidden>Export</div>
         <!--<div class="btn-clear" onclick="editor.clearModuleSelected()">Clear</div>
         <div class="btn-lock">
           <i id="lock" class="fas fa-lock" onclick="editor.editor_mode='fixed'; changeMode('lock');"></i>
@@ -291,7 +291,7 @@
         case 'facebook':
         var facebook = `
         <div>
-          <div class="title-box"><i class="fab fa-facebook"></i> Facebook Message</div>
+          <div class="title-box"><i class="fab fa-facebook"></i> 文本</div>
         </div>
         `;
           editor.addNode('facebook', 0,  1, pos_x, pos_y, 'facebook', {}, facebook );
@@ -319,10 +319,9 @@
         case 'telegram':
           var telegrambot = `
           <div>
-            <div class="title-box"><i class="fab fa-telegram-plane"></i> Telegram bot</div>
+            <div class="title-box"><i class="fab fa-telegram-plane"></i> 下一题</div>
             <div class="box">
-              <p>Send to telegram</p>
-              <p>select channel</p>
+              <p>请选择你要绑定的下一个问题</p>
               <select df-channel>
                 <option value="channel_1">Channel 1</option>
                 <option value="channel_2">Channel 2</option>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html
index 44ddd656..86a58c33 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/view.html
@@ -103,7 +103,7 @@
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
                         actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\',800,450)"><i class="fa fa-eye"></i>查看</a> ');
                         // actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bind(\'' + row.guid + '\',800,450)"><i class="fa fa-eject"></i>绑定</a>');
-                        actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bindNew(\'' + row.guid + '\',800,450)"><i class="fa fa-eject"></i>绑定</a>');
+                        actions.push('<a class="btn btn-danger btn-xs ' + bindFlag + '" href="javascript:void(0)" onclick="bindNew(\'' + row.guid + '\',900,500)"><i class="fa fa-eject"></i>绑定</a>');
                         return actions.join('');
                     }
                 }]
@@ -125,6 +125,9 @@
 
     function bindNew(id, width, height) {
         $.modal.open("", ctx + "project/question/bindNew/" + id, width, height);
+        // $.get(ctx + "project/question/bindNew/" + id,
+        //     function(){}
+        // );
     }
 
     function reset() {
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
index 8ceb588c..842d37f1 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/CustomImageController.java
@@ -50,7 +50,6 @@ public class CustomImageController extends BaseController {
     /**
      * 查询自定义图片列表
      */
-    @RequiresPermissions("custom:image:view")
     @PostMapping("/listAll")
     @ResponseBody
     public ZDResponse listAll(CustomImage customImage) {