Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

build/webpack.base.conf.js

@@ -36,6 +36,7 @@ module.exports = {
     alias: {
       'vue$': 'vue/dist/vue.esm.js',
       '@': resolve('src'),
+      'vendor': path.resolve(__dirname, '../src/vendor'),
     }
   },
   module: {

package-lock.json

@@ -4407,9 +4407,9 @@
       }
     },
     "file-saver": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
-      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
+      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
     },
     "filename-regex": {
       "version": "2.0.1",

package.json

@@ -48,7 +48,7 @@
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
     "element-ui": "^2.13.2",
-    "file-saver": "^1.3.3",
+    "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
@@ -113,7 +113,7 @@
     "rimraf": "2.6.2",
     "sass-loader": "^6.0.7",
     "sass-resources-loader": "^1.3.4",
-    "script-loader": "0.7.2",
+    "script-loader": "^0.7.2",
     "semver": "5.4.1",
     "shelljs": "0.7.8",
     "svg-sprite-loader": "3.5.2",

src/api/patient.js

@@ -158,12 +158,14 @@ export function getCourseOfDiseaseRecords(patient_id, start_time_ymd, end_time_y
 }
 
 export function createCourseOfDiseaseRecord(patient_id, content, record_time, title) {
+  
   var params = {
     patient_id: patient_id,
     content: content,
     record_time: record_time,
     title: title
   }
+  console.log("params222222",params)
   return request({
     url: '/api/patient/course/create',
     method: 'post',

src/xt_pages/user/courseOfDisease.vue

@@ -107,7 +107,8 @@
                 <editor ref="editor"
                         id="editors"
                         style="width: 600px"
-                        v-bind:r_content="new_content">
+                        v-bind:r_content="new_content"
+                        >
                 </editor>
               </keep-alive>
             </div>

static/neditor/neditor.all.js

@@ -32134,7 +32134,7 @@ UE.ui = baidu.editor.ui = {};
       function setCount(editor, ui) {
         editor.setOpt({
           wordCount: true,
-          maximumWords: 10000,
+          maximumWords: 100000,
           wordCountMsg:
             editor.options.wordCountMsg || editor.getLang("wordCountMsg"),
           wordOverFlowMsg: