Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/components/360View/afterPart/index-copy.vue

@@ -556,8 +556,7 @@ export default {
         name: this.form.name,
         flag: this.treeFlag, // 1公共树,2个人树
         type: this.type,
-        parentId: this.parentId,
-        platform: this.isSearch
+        parentId: this.parentId
       }
       const { data: res } = await this.$http.post('/treetag/addTree', params)
       if (res.code === 0) {
@@ -616,8 +615,7 @@ export default {
         axios.get(baseUrl, {
           params: {
             doctorId: this.doctorId,
-            type: type,
-            platform: this.isSearch
+            type: type
           }
         }).then(res => {
           if (res.data.code === 0) {
@@ -690,11 +688,11 @@ export default {
     // 左侧描述项树新增
     async handleSaveCase() {
       const params = {
+        type: 3,
         doctorId: this.doctorId,
         name: this.form.name,
         weight: this.weight,
-        parentId: this.parentId,
-        platform: this.isSearch
+        parentId: this.parentId
       }
       const { data: res } = await this.$http.post('/treetemplate/addTree', params)
       if (res.code === 0) {
@@ -744,7 +742,7 @@ export default {
     async queryTemplate() {
       const { data: res } = await this.$http.get('/treetemplate/findTree', {
         params: {
-          platform: this.isSearch,
+          type: 3,
           doctorId: this.doctorId
         }
       })
@@ -772,7 +770,6 @@ export default {
       const { data: res } = await this.$http.get('/treetemplate/findTreeCase', {
         params: {
           type: 3, // 2前段检查 3后段检查
-          platform: this.isSearch,
           doctorId: this.doctorId
         }
       })

src/components/360View/forePart/index-copy.vue

@@ -951,8 +951,7 @@ export default {
         name: this.form.name,
         flag: this.treeFlag, // // 1公共树,2个人树
         type: this.type,
-        parentId: this.parentId,
-        platform: this.isSearch
+        parentId: this.parentId
       }
       const { data: res } = await this.$http.post('/treetag/addTree', params)
       if (res.code === 0) {
@@ -1013,8 +1012,7 @@ export default {
         axios.get(baseUrl, {
           params: {
             doctorId: this.doctorId,
-            type: type,
-            platform: this.isSearch
+            type: type
           }
         }).then(res => {
           if (res.data.code === 0) {
@@ -1046,6 +1044,7 @@ export default {
     // 点击保存模板后弹框
     handleTemplate() {
       this.form.name = ''
+      this.treeId = ''
       this.queryTemplate()
       this.templateFlag = true
     },
@@ -1088,11 +1087,11 @@ export default {
     // 新增左侧描述项树
     async handleSaveCase() {
       const params = {
+        type: 2,
         doctorId: this.doctorId,
         name: this.form.name,
         weight: this.weight,
-        parentId: this.parentId,
-        platform: this.isSearch
+        parentId: this.parentId
       }
       const { data: res } = await this.$http.post('/treetemplate/addTree', params)
       if (res.code === 0) {
@@ -1142,7 +1141,7 @@ export default {
     async queryTemplate() {
       const { data: res } = await this.$http.get('/treetemplate/findTree', {
         params: {
-          platform: this.isSearch,
+          type: 2,
           doctorId: this.doctorId
         }
       })
@@ -1170,7 +1169,6 @@ export default {
       const { data: res } = await this.$http.get('/treetemplate/findTreeCase', {
         params: {
           type: 2,
-          platform: this.isSearch,
           doctorId: this.doctorId
         }
       })

src/components/360View/img-reccrd.vue

@@ -626,7 +626,6 @@ export default {
                     row.time = row.seriesDate && row.seriesDate.length > 10 ? row.seriesDate.substring(0, 10) : row.seriesDate
                     row.instanceList.forEach(e => {
                       const type = e.imageId.substring(e.imageId.length - 3)
-                      e.imageId = 'http://z1.huimucloud.com:8001/' + e.imageId
                       e.imageType = type.toLocaleUpperCase()
                     })
                   })

src/components/360View/index1.vue

@@ -406,8 +406,8 @@ export default {
     // 360浏览器
     handlePacs() {
       // const baseUrl = 'http://z1.huimucloud.com:8085'
-      const baseUrl = 'http://10.80.5.32:8026'
-      // const baseUrl = 'http://192.168.0.85:8001'
+      // const baseUrl = 'http://10.80.5.32:8026'
+      const baseUrl = 'http://192.168.0.85:8001'
       const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
       window.open(href, '_blank')
       // const { href } = this.$router.resolve({

src/components/360View/medicalRecord/outPatientRecord/afterForm.vue

@@ -211,8 +211,7 @@ export default {
         axios.get(baseUrl, {
           params: {
             doctorId: this.doctorId,
-            type: type,
-            platform: this.isSearch
+            type: type
           }
         }).then(res => {
           if (res.data.code === 0) {

src/components/360View/medicalRecord/outPatientRecord/foreForm.vue

@@ -573,8 +573,7 @@ export default {
         axios.get(baseUrl, {
           params: {
             doctorId: this.doctorId,
-            type: type,
-            platform: this.isSearch
+            type: type
           }
         }).then(res => {
           if (res.data.code === 0) {

src/page-subspecialty/views/pages/pacs/img-record.vue

@@ -602,7 +602,6 @@ export default {
                     row.time = row.seriesDate && row.seriesDate.length > 10 ? row.seriesDate.substring(0, 10) : row.seriesDate
                     row.instanceList.forEach(e => {
                       const type = e.imageId.substring(e.imageId.length - 3)
-                      e.imageId = 'http://z1.huimucloud.com:8001/' + e.imageId
                       e.imageType = type.toLocaleUpperCase()
                     })
                   })