添加备注字段

dist/static/js/chunk-4de1c2b6.16828111.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4de1c2b6"],{"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._v(" "),t._m(1),t._v(" "),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),t._v(" "),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),t._v(" "),a("a",{staticClass:"bullshit__return-home",attrs:{href:""}},[t._v("Back to home")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved\n        "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("97ef"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"c095f994",null);s["default"]=r.exports},"97ef":function(t,s,a){"use strict";var e=a("d3f45"),c=a.n(e);c.a},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"},d3f45:function(t,s,a){}}]);

dist/static/js/chunk-68697b0f.5a717cc9.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-68697b0f"],{"146e":function(t,s,a){"use strict";var e=a("6d2d"),c=a.n(e);c.a},"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"6d2d":function(t,s,a){},"8cdb":function(t,s,a){"use strict";a.r(s);var e=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),t._v(" "),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("OOPS!")]),t._v(" "),t._m(1),t._v(" "),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),t._v(" "),a("div",{staticClass:"bullshit__info"},[t._v("Please check that the URL you entered is correct, or click the button below to return to the homepage.")]),t._v(" "),a("a",{staticClass:"bullshit__return-home",attrs:{href:""}},[t._v("Back to home")])])])])},c=[function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"pic-404"},[e("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),t._v(" "),e("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])},function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"bullshit__info"},[t._v("All rights reserved\n        "),a("a",{staticStyle:{color:"#20a0ff"},attrs:{href:"https://wallstreetcn.com",target:"_blank"}},[t._v("wallstreetcn")])])}],i={name:"Page404",computed:{message:function(){return"The webmaster said that you can not enter this page..."}}},l=i,n=(a("146e"),a("2877")),r=Object(n["a"])(l,e,c,!1,null,"794a952c",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"}}]);

src/views/dashboard/index.vue

@@ -135,6 +135,13 @@
           <el-table-column prop="patriarchUnit"
                            align="center"
                            label="家长工作单位"></el-table-column>
+            <el-table-column
+                           align="center"
+                           label="备注">
+                <template slot-scope="scope">
+                    <p class="nomargin" v-for="value in splitS(scope.row.remark)" :key="value">{{value}}</p>
+                </template>          
+            </el-table-column>
           <!-- <el-table-column prop="musical" align="center" label="乐器准备方式"></el-table-column> -->
           <!-- status -->
           <el-table-column prop="status"
@@ -243,6 +250,7 @@ import {
   updateClass
 } from "@/api/table";
 import { setTimeout } from "timers";
+import { rename } from 'fs';
 export default {
   name: "dashboard",
   data () {
@@ -611,6 +619,14 @@ export default {
         // }
       })()
     },
+    splitS(remark) {
+        if(!remark) {
+            return ''
+        }
+        let temp = remark.split('\n')
+        console.log(temp)
+        return temp
+    }
   },
   watch: {
     radio (val) {
@@ -727,4 +743,7 @@ export default {
   flex-direction: column;
   align-items: center;
 }
+.nomargin {
+    margin: 0;
+}
 </style>

vue.config.js

@@ -44,20 +44,20 @@ module.exports = {
       // http://192.168.3.28:8005
       // 192.168.3.38:8088
       '/order': {
-        target: 'http://testpay.dayaedu.com',
-        // target: `http://192.168.3.38:9000`,
+        // target: 'http://testpay.dayaedu.com',
+        target: 'http://192.168.3.38:8088',
         changeOrigin: true,
-        pathRewrite: {
-          "^order": ''
-        }
+        ws: true,
+        '^/order': '/order',
+        xfwd: true
       },
       '/user': {
-        target: 'http://testpay.dayaedu.com',
-        // target: `http://192.168.3.38:9000`,
+        // target: 'http://testpay.dayaedu.com',
+        target: 'http://192.168.3.38:8088',
         changeOrigin: true,
-        pathRewrite: {
-          "^user": ''
-        }
+        ws: true,
+        '^/user': '/user',
+        xfwd: true
       }
     },
     // after: require('./mock/mock-server.js')