草图增加备注显示

app/public/js/stage.js

@@ -3251,8 +3251,10 @@ $(document).ready(() => {
                     updateData.imgInfo = itemInfo;
                     self.updateImageData = updateData;
                     $('#calc-img').attr('src', updateData.img);
+                    $('#calc-remark').html(img_remark);
                     $('#view-calc-img').attr('src', updateData.img);
                     $('#show-calc-img').attr('src', updateData.img);
+                    $('#show-calc-remark').html((img_remark ? '<td colspan="2">'+ img_remark +'</td>' : ''));
                     $('#view-calc-remark').text(img_remark);
 
                     $('#edit-img').modal('hide');
@@ -3271,7 +3273,9 @@ $(document).ready(() => {
                 } else if (data.calc_img) {
                     self.updateImageData = {updateType: 'clear', lid: data.lid, pid: data.pid, uuid: data.uuid, calc_img_remark: img_remark};
                     $('#show-calc-img').attr('src', '');
+                    $('#show-calc-remark').html('');
                     $('#calc-img').attr('src', '');
+                    $('#calc-remark').html('');
                     $('#view-calc-img').attr('src', '');
                     $('#view-calc-remark').val('');
                     $('#text-edit').val('');
@@ -3289,7 +3293,9 @@ $(document).ready(() => {
                 } else {
                     self.updateImageData = updateData;
                     $('#show-calc-img').attr('src', '');
+                    $('#show-calc-remark').html('');
                     $('#calc-img').attr('src', '');
+                    $('#calc-remark').html('');
                     $('#view-calc-img').attr('src', '');
                     $('#view-calc-remark').val('');
                     $('#text-edit').val('');
@@ -3400,6 +3406,8 @@ $(document).ready(() => {
 
             const calcImgRemark = data && data.calc_img_remark || '';
             $('#view-calc-remark').val(calcImgRemark);
+            $('#show-calc-remark').html((calcImgRemark ? '<td colspan="2">'+ calcImgRemark +'</td>' : ''));
+            $('#calc-remark').html(calcImgRemark);
             $("#view-calc-remark").attr('readonly', true);
             // 处理 编辑 -> 添加草图中textarea多余的空格
             $('#text-edit').val(calcImgRemark)

app/view/stage/index.ejs

@@ -157,6 +157,7 @@
                                 <tr><td colspan="2" id="show-calc-memo" style="word-wrap:break-word"></td></tr>
                                 <tr><th colspan="2">草图</th></tr>
                                 <tr><td colspan="2"><a href="#imgview" data-toggle="modal" data-target="#imgview"><img src="" id="show-calc-img" class="w-100"></a></td></tr>
+                                <tr id="show-calc-remark"></tr>
                                 </tbody>
                             </table>
                             <div style="display: none;" id="detail-edit">
@@ -234,6 +235,9 @@
                                     </div>
                                     <p><a href="#imgview" data-toggle="modal" data-target="#imgview"><img src="" id="calc-img" class="w-100"></a></p>
                                 </div>
+                                <div class="form-group">
+                                    <div id="calc-remark"></div>
+                                </div>
                             </div>
                             </div>
                         </div>