Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

ems-ui/package.json

@@ -50,6 +50,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "js-base64": "^3.7.7",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",

ems-ui/src/views/task/report/ReportForm.vue

@@ -38,6 +38,7 @@
 
 <script>
 import { addInspectionReport, getInspectionReport, updateInspectionReport } from '@/api/task/inspectionReport';
+import { Base64 } from 'js-base64';
 
 export default {
   name: 'ReportForm',
@@ -132,7 +133,12 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate(valid => {
+
         if (valid) {
+
+          if (this.form.resultMsg) {
+            this.form.resultMsg = Base64.encode(this.form.resultMsg);
+          }
           if (this.form.id != null) {
             updateInspectionReport(this.form).then(response => {
               this.$modal.msgSuccess('修改成功');

ems-ui/src/views/task/report/index.vue

@@ -183,8 +183,9 @@
 
 <script>
 import {
-  listInspectionReport, getInspectionReport, delInspectionReport, addInspectionReport, updateInspectionReport,
+  addInspectionReport, delInspectionReport, getInspectionReport, listInspectionReport, updateInspectionReport,
 } from '@/api/task/inspectionReport';
+import { Base64 } from 'js-base64';
 
 export default {
   name: 'InspectionReport',
@@ -305,6 +306,9 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          if (this.form.resultMsg) {
+            this.form.resultMsg = Base64.encode(this.form.resultMsg);
+          }
           if (this.form.id != null) {
             updateInspectionReport(this.form).then(response => {
               this.$modal.msgSuccess('修改成功');