Browse Source

新分支

28169 2 years ago
parent
commit
c55a91a879
3 changed files with 33 additions and 33 deletions
  1. 2 2
      config/dev.env.js
  2. 18 18
      src/xt_pages/user/firstDisease.vue
  3. 13 13
      src/xt_permission.js

+ 2 - 2
config/dev.env.js View File

@@ -6,8 +6,8 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
9
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
+  //  BASE_API: '"https://api.xt.test.sgjyun.com"',
11 11
   BASE_API: '"http://localhost:9531"',
12 12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13 13
   SRCM_HOST: '"http://test1.sgjyun.com"',

+ 18 - 18
src/xt_pages/user/firstDisease.vue View File

@@ -270,8 +270,8 @@
270 270
                 
271 271
                  <div class="textarea_panel">
272 272
                     <keep-alive>
273
-                      <editor ref="editor"
274
-                              id="editor"
273
+                      <editor ref="editorTen"
274
+                              id="editorTen"
275 275
                               style="width: 800px"
276 276
                               v-bind:r_content="form.main_content">
277 277
                       </editor>
@@ -286,8 +286,8 @@
286 286
                 
287 287
                  <div class="textarea_panel">
288 288
                     <keep-alive>
289
-                      <editor ref="editorOne"
290
-                              id="editorOne"
289
+                      <editor ref="editorTenOne"
290
+                              id="editorTenOne"
291 291
                               style="width: 800px"
292 292
                               v-bind:r_content="form.patient_case">
293 293
                       </editor>
@@ -302,8 +302,8 @@
302 302
                 
303 303
                  <div class="textarea_panel">
304 304
                     <keep-alive>
305
-                      <editor ref="editorTwo"
306
-                              id="editorTwo"
305
+                      <editor ref="editorTenTwo"
306
+                              id="editorTenTwo"
307 307
                               style="width: 800px"
308 308
                               v-bind:r_content="form.tentative_diagnosis">
309 309
                       </editor>
@@ -318,8 +318,8 @@
318 318
                 
319 319
                  <div class="textarea_panel">
320 320
                     <keep-alive>
321
-                      <editor ref="editorThree"
322
-                              id="editorThree"
321
+                      <editor ref="editorTenThree"
322
+                              id="editorTenThree"
323 323
                               style="width: 800px"
324 324
                               v-bind:r_content="form.diagnostic_basis">
325 325
                       </editor>
@@ -334,8 +334,8 @@
334 334
                 
335 335
                  <div class="textarea_panel">
336 336
                     <keep-alive>
337
-                      <editor ref="editorFour"
338
-                              id="editorFour"
337
+                      <editor ref="editorTenFour"
338
+                              id="editorTenFour"
339 339
                               style="width: 800px"
340 340
                               v-bind:r_content="form.differential_diagnosis">
341 341
                       </editor>
@@ -350,8 +350,8 @@
350 350
                 
351 351
                  <div class="textarea_panel">
352 352
                     <keep-alive>
353
-                      <editor ref="editorFive"
354
-                              id="editorFive"
353
+                      <editor ref="editorTenFive"
354
+                              id="editorTenFive"
355 355
                               style="width: 800px"
356 356
                               v-bind:r_content="form.treatment_plan">
357 357
                       </editor>
@@ -672,12 +672,12 @@
672 672
           title:this.form.title,
673 673
           doctor:this.form.doctor,
674 674
           record_date:this.form.record_date,
675
-          main_content:this.$refs.editor.content,
676
-          patient_case:this.$refs.editorOne.content,
677
-          tentative_diagnosis:this.$refs.editorTwo.content,
678
-          diagnostic_basis:this.$refs.editorThree.content,
679
-          differential_diagnosis:this.$refs.editorFour.content,
680
-          treatment_plan:this.$refs.editorFive.content,
675
+          main_content:this.$refs.editorTen.content,
676
+          patient_case:this.$refs.editorTenOne.content,
677
+          tentative_diagnosis:this.$refs.editorTenTwo.content,
678
+          diagnostic_basis:this.$refs.editorTenThree.content,
679
+          differential_diagnosis:this.$refs.editorTenFour.content,
680
+          treatment_plan:this.$refs.editorTenFive.content,
681 681
          }
682 682
          console.log("poarams2323322323",params)
683 683
         updateFirstDisease(params).then(response=>{

+ 13 - 13
src/xt_permission.js View File

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
   // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))