Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/stage.js

@@ -3512,10 +3512,10 @@ $(document).ready(() => {
                     $('#show-calc-img').attr('src', '');
                     $('#show-calc-remark').html('');
                     $('#calc-img').attr('src', '');
-                    $('#calc-remark').html('');
+                    $('#calc-remark').html(img_remark);
                     $('#view-calc-img').attr('src', '');
-                    $('#view-calc-remark').val('');
-                    $('#text-edit').val('');
+                    $('#view-calc-remark').val(img_remark);
+                    $('#text-edit').val(img_remark);
                     $('#edit-img').modal('hide');
                     // postData(window.location.pathname + '/detail/merge-img', {updateType: 'clear', lid: data.lid, pid: data.pid, uuid: data.uuid}, function (result) {
                     //     stageIm.loadUpdateDetailData(result);
@@ -3532,10 +3532,10 @@ $(document).ready(() => {
                     $('#show-calc-img').attr('src', '');
                     $('#show-calc-remark').html('');
                     $('#calc-img').attr('src', '');
-                    $('#calc-remark').html('');
+                    $('#calc-remark').html(img_remark);
                     $('#view-calc-img').attr('src', '');
-                    $('#view-calc-remark').val('');
-                    $('#text-edit').val('');
+                    $('#view-calc-remark').val(img_remark);
+                    $('#text-edit').val(img_remark);
                     $('#edit-img').modal('hide');
                 }
             });

app/service/change_project.js

@@ -168,7 +168,6 @@ module.exports = app => {
                 const limitString = offset >= 0 ? offset + ',' + limit : limit;
                 sql += ' LIMIT ' + limitString;
             }
-            console.log(sql, sqlParam);
             const list = await this.db.query(sql, sqlParam);
             return list;
         }