浏览代码

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

see999 4 年前
父节点
当前提交
0a1b95ad20
共有 6 个文件被更改,包括 11 次插入7 次删除
  1. 1 0
      build/webpack.base.conf.js
  2. 3 3
      package-lock.json
  3. 2 2
      package.json
  4. 2 0
      src/api/patient.js
  5. 2 1
      src/xt_pages/user/courseOfDisease.vue
  6. 1 1
      static/neditor/neditor.all.js

+ 1 - 0
build/webpack.base.conf.js 查看文件

36
     alias: {
36
     alias: {
37
       'vue$': 'vue/dist/vue.esm.js',
37
       'vue$': 'vue/dist/vue.esm.js',
38
       '@': resolve('src'),
38
       '@': resolve('src'),
39
+      'vendor': path.resolve(__dirname, '../src/vendor'),
39
     }
40
     }
40
   },
41
   },
41
   module: {
42
   module: {

+ 3 - 3
package-lock.json 查看文件

4407
       }
4407
       }
4408
     },
4408
     },
4409
     "file-saver": {
4409
     "file-saver": {
4410
-      "version": "1.3.3",
4411
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
4412
-      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
4410
+      "version": "1.3.8",
4411
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz",
4412
+      "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
4413
     },
4413
     },
4414
     "filename-regex": {
4414
     "filename-regex": {
4415
       "version": "2.0.1",
4415
       "version": "2.0.1",

+ 2 - 2
package.json 查看文件

48
     "dropzone": "5.2.0",
48
     "dropzone": "5.2.0",
49
     "echarts": "3.8.5",
49
     "echarts": "3.8.5",
50
     "element-ui": "^2.13.2",
50
     "element-ui": "^2.13.2",
51
-    "file-saver": "^1.3.3",
51
+    "file-saver": "^1.3.8",
52
     "font-awesome": "4.7.0",
52
     "font-awesome": "4.7.0",
53
     "js-cookie": "2.2.0",
53
     "js-cookie": "2.2.0",
54
     "jsonlint": "1.6.3",
54
     "jsonlint": "1.6.3",
113
     "rimraf": "2.6.2",
113
     "rimraf": "2.6.2",
114
     "sass-loader": "^6.0.7",
114
     "sass-loader": "^6.0.7",
115
     "sass-resources-loader": "^1.3.4",
115
     "sass-resources-loader": "^1.3.4",
116
-    "script-loader": "0.7.2",
116
+    "script-loader": "^0.7.2",
117
     "semver": "5.4.1",
117
     "semver": "5.4.1",
118
     "shelljs": "0.7.8",
118
     "shelljs": "0.7.8",
119
     "svg-sprite-loader": "3.5.2",
119
     "svg-sprite-loader": "3.5.2",

+ 2 - 0
src/api/patient.js 查看文件

158
 }
158
 }
159
 
159
 
160
 export function createCourseOfDiseaseRecord(patient_id, content, record_time, title) {
160
 export function createCourseOfDiseaseRecord(patient_id, content, record_time, title) {
161
+  
161
   var params = {
162
   var params = {
162
     patient_id: patient_id,
163
     patient_id: patient_id,
163
     content: content,
164
     content: content,
164
     record_time: record_time,
165
     record_time: record_time,
165
     title: title
166
     title: title
166
   }
167
   }
168
+  console.log("params222222",params)
167
   return request({
169
   return request({
168
     url: '/api/patient/course/create',
170
     url: '/api/patient/course/create',
169
     method: 'post',
171
     method: 'post',

+ 2 - 1
src/xt_pages/user/courseOfDisease.vue 查看文件

107
                 <editor ref="editor"
107
                 <editor ref="editor"
108
                         id="editors"
108
                         id="editors"
109
                         style="width: 600px"
109
                         style="width: 600px"
110
-                        v-bind:r_content="new_content">
110
+                        v-bind:r_content="new_content"
111
+                        >
111
                 </editor>
112
                 </editor>
112
               </keep-alive>
113
               </keep-alive>
113
             </div>
114
             </div>

+ 1 - 1
static/neditor/neditor.all.js 查看文件

32134
       function setCount(editor, ui) {
32134
       function setCount(editor, ui) {
32135
         editor.setOpt({
32135
         editor.setOpt({
32136
           wordCount: true,
32136
           wordCount: true,
32137
-          maximumWords: 10000,
32137
+          maximumWords: 100000,
32138
           wordCountMsg:
32138
           wordCountMsg:
32139
             editor.options.wordCountMsg || editor.getLang("wordCountMsg"),
32139
             editor.options.wordCountMsg || editor.getLang("wordCountMsg"),
32140
           wordOverFlowMsg:
32140
           wordOverFlowMsg: