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

src/components/360View/index1.vue

@@ -272,6 +272,7 @@ export default {
       sharkFlag: true,
       patientBaseData: {},
       timeAxisNodeInfo: [], // 点击左侧时间轴获取到的中间区域详细信息
+      doctorId: '', //
       date: '', // 点击时间轴的时间
       source: '', // 数据集数据来源
       collectList: '', // 数据集数据
@@ -396,8 +397,10 @@ export default {
       this.drawerWidth = (this.drawerWidth === '500px') ? '800px' : '500px'
     },
     backList() {
-      if (this.$route.query.patientId) {
+      if (this.$route.query.patientId && !this.$route.query.doctorId) {
         this.$router.go(-1)
+      } else if (this.$route.query.doctorId) {
+        this.$router.push('/outpatientManagement-call')
       } else {
         this.$parent.detailViewVisible = false
         this.$parent.getDataListInitial()

src/components/patient-search/data-list.vue

@@ -39,7 +39,6 @@
               </el-form-item>
             </template>
           </el-form>
-
         </template>
       </el-table-column>
       <!-- 姓名 -->
@@ -75,46 +74,22 @@
       <!-- 操作 -->
       <el-table-column label="操作" header-align="center" align="center" width="120">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="showDetail(scope.row)">查看详情
-          </el-button>
+          <el-button type="text" size="small" @click="showDetail(scope.row)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
-
-    <!-- 详情页 -->
-    <!-- <detail-view v-if="dialogVisible" ref="detailView" :project-id="projectId" /> -->
-    <!-- <el-dialog
-      class="dialog"
-      :visible.sync="dialogVisible"
-      :title="'患者360'"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :fullscreen="true"
-      append-to-body
-    >
-      <patient-view
-        v-if="dialogVisible"
-        ref="detailView"
-        :patient-id-number="patient.patientIdNumber"
-        :project-id="patient.projectId"
-      />
-    </el-dialog> -->
   </div>
 </template>
 
 <script>
 import echartsLineKpi from '@/components/echarts/line-kpi'
 import echartsLineKpiVa from '@/components/echarts/line-kpi-va'
-// import checked from '@/mixins/checked'
-// import patientView from '@/components/patient-view'
-
 import { findItem } from '@/utils/tree'
 
 export default {
   components: {
     echartsLineKpi,
     echartsLineKpiVa
-    // patientView
   },
   props: {
     dataListLoading: { type: Boolean, default: false },
@@ -125,15 +100,14 @@ export default {
   },
   data() {
     return {
-      dialogVisible: false,
       selectIdList: [],
       selectList: [],
-      patient: {
-        patientIdNumber: '',
-        projectId: ''
-      }
+      patientId: ''
     }
   },
+  mounted() {
+    console.log(this.dataList)
+  },
   methods: {
     getExamItem(obj) {
       const result = []
@@ -165,14 +139,13 @@ export default {
       return this.selectDisableIdList.indexOf(row.id) < 0
     },
     // 查看详情
-    showDetail(scope) {
-      this.dialogVisible = true
-      this.patient.patientIdNumber = scope.id
-      this.patient.projectId = this.projectId
-      // this.$nextTick(() => {
-      //   this.$refs.detailView.patientIdNumber = scope.id
-      //   this.$refs.detailView.init()
-      // })
+    showDetail(scopeRow) {
+      this.$emit('viewDetail', scopeRow.esPatientInfo.patientId)
+      // this.patientId = scopeRow.patientId
+      const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : ''
+      const jzNumber = scopeRow.jzNumber ? scopeRow.jzNumber : ''
+      window.localStorage.setItem('mzDoctorName', mzName)
+      window.localStorage.setItem('jzNumber', jzNumber)
     }
   }
 }

src/components/patient-search/index.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="project-main">
+    <div v-if="!detailViewVisible">
       <el-card shadow="never" class="aui-card--fill">
         <el-form
           :inline="true"
           :model="dataForm"
           class="search-wrapper"
           @submit.native.prevent
-        @keyup.enter.native="search"
+          @keyup.enter.native="getDataListInitial"
         >
           <div class="search-wrapper-top">
             <el-form-item class="search-item-input-wrapper">
@@ -21,13 +22,11 @@
                 <i v-else class="el-icon-arrow-down el-icon--right" />
               </el-button>
             </el-form-item>
-
             <!-- slot -->
             <el-form-item>
               <slot name="btn" />
             </el-form-item>
           </div>
-
           <transition name="slide-fade">
             <div v-show="queryItemVisible" class="find-">
               <!-- 查询条件 -->
@@ -43,7 +42,6 @@
             </div>
           </transition>
         </el-form>
-
         <!-- 查询结果 -->
         <div class="result-wrapper">
           <data-list
@@ -51,6 +49,7 @@
             :data-list-loading="dataListLoading"
             :data-list="dataList"
             :project-id="projectId"
+            @viewDetail="viewDetail"
             v-bind="$attrs"
             v-on="$listeners"
           />
@@ -77,10 +76,12 @@
         </div>
       </checked-footer>
     </div>
-
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'1'" :patient-id="patientId" @detailViewVisible="detailViewVisible=false" />
+  </div>
 </template>
 
 <script>
+import detailView from '@/components/360View/index1' // 360试图
 import checked from '@/mixins/checked'
 import checkedFooter from '@/components/checked-footer'
 import dataList from './data-list.vue'
@@ -90,6 +91,7 @@ import Cookies from 'js-cookie'
 export default {
   components: {
     itemSelect,
+    detailView,
     dataList,
     checkedFooter
   },
@@ -107,16 +109,23 @@ export default {
       },
       dataForm: {},
       keyWord: '',
+      patientId: '',
       limit: 10,
       page: 1,
       total: 0,
+      onlyRead: true,
       dataListLoading: false, // 数据列表，loading状态
       queryItemVisible: false,
       isExpandAll: false,
+      detailViewVisible: false,
       queryItemData_must: [],
       queryItemData_should: [],
       queryItemData_must_not: [],
-      dataList: [],
+      dataList: [
+        {
+          name: 1
+        }
+      ],
       currentTableList: []
     }
   },
@@ -125,12 +134,11 @@ export default {
       deep: true,
       handler(val) {
         if (val.must.length > 0 || val.should.length > 0 || val.must_not.length > 0) {
-          console.log(val)
           this.queryItemVisible = true
           this.queryItemData_must = val.must
           this.queryItemData_should = val.should
           this.queryItemData_must_not = val.must_not
-          this.getDataList()
+          // this.getDataList()
         }
       }
     }
@@ -145,6 +153,11 @@ export default {
       this.page = 1
       this.retrieval()
     },
+    viewDetail(val) {
+      console.log(val)
+      this.patientId = val
+      this.detailViewVisible = true
+    },
     // 检索
     retrieval() {
       this.getDataList()
@@ -211,6 +224,9 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.project-main{
+  height: 100%;
+}
 .search-wrapper-top {
   display: flex;
   align-items: center;
@@ -238,7 +254,7 @@ export default {
 }
 </style>
 
-<style lang='scss'>
+<style lang="scss">
 .project-main {
   .search-wrapper-top {
     .el-form-item__content {

src/page-subspecialty/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import http from '../utils/request'
 import { isURL } from '@/utils/validate'
+import Cookies from 'js-cookie'
 
 Vue.use(Router)
 
@@ -146,6 +147,9 @@ router.beforeEach((to, from, next) => {
   }
   if (to.name === 'login' || to.path === '/login' || to.path === 'satusScreen' || to.name === 'satusScreen') {
     next()
+  } else if (to.name === '360view' && to.query.doctorId) {
+    loginByDocId(to.query.doctorId, next, to.fullPath)
+
   } else {
     // 获取字典列表, 添加并全局变量保存
     // http.get('/sys/dict/type/all').then(({ data: res }) => {
@@ -154,7 +158,6 @@ router.beforeEach((to, from, next) => {
     //   }
     //   window.SITE_CONFIG['dictList'] = res.data
     // }).catch(() => {})
-
     // 获取左侧菜单列表，添加并全局变量保存
     http.get('/sys/menu/nav').then(({ data: res }) => {
       if (res.code !== 0) {
@@ -178,7 +181,6 @@ router.beforeEach((to, from, next) => {
       }
       // window.SITE_CONFIG['menuList'] = res.data
       const menuListChild = res.data.filter(item => item.children.length > 0)
-      // this.$store.commit('activeIndexFun', menuListChild[0].children[0].id)
       fnAddDynamicMenuRoutes(JSON.parse(JSON.stringify(res.data)), menuListChild.length)
 
       next({ ...to, replace: true })
@@ -186,69 +188,62 @@ router.beforeEach((to, from, next) => {
       // console.log(123)
       return next({ name: 'login' })
     })
-    // 获取【字段字典表】, 添加并全局变量保存
-    // http.get('/sys/table/dict/getList', { params: { type: 1 }}).then(({ data: res }) => {
-    //   window.SITE_CONFIG['dict_colSearch'] = res.data
-    // })
-    getInitData()
   }
 })
-function getInitData() {
-  // 获取字典列表, 添加并全局变量保存
-  // http.get('/sys/dict/type/all').then(({ data: res }) => {
-  //   if (res.code !== 0) { return }
-  //   window.SITE_CONFIG['dictList'] = res.data
-  // })
-
-  // 获取【字段字典表】, 添加并全局变量保存
-  // http.get('/table/dict/optionsColumn').then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_colAll'] = res.data
-  // })
-  //
-  // // 获取【字段字典表】, 添加并全局变量保存
-  // http.get('/table/dict/optionsColumn', { params: { type: 1 }}).then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_colSearch'] = res.data
-  // })
-  //
-  // // 获取【字段字典表】, 添加并全局变量保存
-  // http.get('/table/dict/optionsColumn', { params: { type: 2 }}).then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_colChart'] = res.data
-  // })
-  //
-  // // 获取【字段字典表】, 添加并全局变量保存
-  // http.get('/table/dict/optionsColumn', { params: { type: 3 }}).then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_colCrf'] = res.data
-  // })
-  //
-  // // 获取【字段字典表】, 添加并全局变量保存
-  // http.get('/table/dict/optionsColumn', { params: { type: 4 }}).then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_colExport'] = res.data
-  // })
-
-  // 获取【检查项目字典】, 添加并全局变量保存
-  // http.get('/table/dict/examItem').then(({ data: res }) => {
-  //   sortChinese(res.data, 'itemName')
-  //   window.SITE_CONFIG['dict_examItem'] = res.data
-  // })
-
-  // 获取【设备信息字典】, 添加并全局变量保存
-  // http.get('/device/getData2RelDeviceList').then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_device'] = res.data
-  // })
+function getNavList(next) {
+  http.get('/sys/menu/nav').then(({ data: res }) => {
+    if (res.code !== 0) {
+      Vue.prototype.$message.error(res.msg)
+      return next()
+    }
+    window.SITE_CONFIG['menuList'] = res.data
+  }).catch(() => {
+    return next({ name: 'login' })
+  })
+}
+function muneList(next) {
+  http.get('/sys/menu/list', {
+    params: {
+      type: 0
+    }
+  }).then(({ data: res }) => {
+    if (res.code !== 0) {
+      Vue.prototype.$message.error(res.msg)
+      return next({ name: 'login' })
+    }
+    // window.SITE_CONFIG['menuList'] = res.data
+    const menuListChild = res.data.filter(item => item.children.length > 0)
+    fnAddDynamicMenuRoutes(JSON.parse(JSON.stringify(res.data)), menuListChild.length)
+  }).catch(() => {
+    return next({ name: 'login' })
+  })
+}
+function loginByDocId(doctorId, next) {
+  const params = {
+    doctorId: doctorId
+  }
+  http.post('/loginByDid', params).then(({ data: res }) => {
+    if (res.code !== 0) {
+      return this.$message.error(res.msg)
+    }
+    console.log(res)
+    Cookies.set('xa-token', res.data.token)
+    window.localStorage.setItem('qg-userData', JSON.stringify(res.data.currentUser))
+    getNavList(next)
+    muneList(next)
 
-  // 获取【设备与检查项目字典】, 添加并全局变量保存
-  // http.get('/device/getData2RelDeviceItemList').then(({ data: res }) => {
-  //   window.SITE_CONFIG['dict_device_item'] = res.data
-  // })
+    return next()
+  }).catch(() => { })
 }
+
 /**
  * 判断当前路由是否为页面路由
  * @param {*} route 当前路由
  * @param {*} pageRoutes 页面路由
  */
 function fnCurrentRouteIsPageRoute(route, pageRoutes = []) {
-  var temp = []
-  for (var i = 0; i < pageRoutes.length; i++) {
+  let temp = []
+  for (let i = 0; i < pageRoutes.length; i++) {
     if (route.path === pageRoutes[i].path) {
       return true
     }

src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue

@@ -120,7 +120,7 @@
     <!-- HIS引入弹框 -->
     <his-add v-if="HisAddVisible" ref="HisAddRef" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'3'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'3'" :patient-id="patientId" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -314,12 +314,6 @@ export default {
       window.localStorage.setItem('mzDoctorName', mzName)
       window.localStorage.setItem('jzNumber', jzNumber)
       window.localStorage.setItem('projectItem', list.length ? JSON.stringify(list) : '')
-      this.$nextTick(() => {
-        // // 根据id获取患者信息--中间上侧患者信息
-        this.$refs.viewRef.getPatientData()
-        // // 获取时间轴数据--左侧时间轴
-        this.$refs.viewRef.getTimeAxisData()
-      })
     },
     // His引入
     HISHandle() {

src/page-subspecialty/views/modules/outpatientManagement/call/index.vue

@@ -118,7 +118,7 @@
     <!-- HIS引入弹框 -->
     <his-add v-if="HisAddVisible" ref="HisAddRef" @openAdd="getHisData" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'1'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'1'" :patient-id="patientId" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -223,8 +223,7 @@ export default {
         patientStatus: '',
         patientIdNumber: ''
       },
-      patientId: '',
-      patientIdNumber: ''
+      patientId: ''
     }
   },
   created() {
@@ -260,17 +259,10 @@ export default {
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId
-      this.patientIdNumber = scopeRow.patientIdNumber
       const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : ''
       const jzNumber = scopeRow.jzNumber ? scopeRow.jzNumber : ''
       window.localStorage.setItem('mzDoctorName', mzName)
       window.localStorage.setItem('jzNumber', jzNumber)
-      this.$nextTick(() => {
-        // // 根据id获取患者信息--中间上侧患者信息
-        this.$refs.viewRef.getPatientData()
-        // // 获取时间轴数据--左侧时间轴
-        this.$refs.viewRef.getTimeAxisData()
-      })
     },
     // His引入
     HISHandle() {

src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue

@@ -152,7 +152,7 @@
     <!-- HIS引入弹框 -->
     <his-add v-if="HisAddVisible" ref="HisAddRef" @openAdd="getHisData" />
     <!-- 详情页 -->
-    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'2'" :patient-id="patientId" :patient-id-number="patientIdNumber" @detailViewVisible="detailViewVisible=false" />
+    <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'2'" :patient-id="patientId" @detailViewVisible="detailViewVisible=false" />
   </div>
 </template>
 <script>
@@ -269,8 +269,7 @@ export default {
         patientIdNumber: ''
       },
       projectList: [],
-      patientId: '',
-      patientIdNumber: ''
+      patientId: ''
     }
   },
   watch: {
@@ -372,17 +371,10 @@ export default {
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId
-      this.patientIdNumber = scopeRow.patientIdNumber
       const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : ''
       const jzNumber = scopeRow.jzNumber ? scopeRow.jzNumber : ''
       window.localStorage.setItem('mzDoctorName', mzName)
       window.localStorage.setItem('jzNumber', jzNumber)
-      this.$nextTick(() => {
-        // // 根据id获取患者信息--中间上侧患者信息
-        this.$refs.viewRef.getPatientData()
-        // // 获取时间轴数据--左侧时间轴
-        this.$refs.viewRef.getTimeAxisData()
-      })
     },
     // His引入
     HISHandle() {

src/page-subspecialty/views/modules/scientificManagement/search/index.vue

@@ -13,7 +13,6 @@
     <dialog-add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :query-item="queryItem" />
   </div>
 </template>
-
 <script>
 import patientSearch from '@/components/patient-search'
 import dialogAddOrUpdate from '../pretest/add-or-update.vue'
@@ -32,9 +31,6 @@ export default {
     }
   },
   methods: {
-    // getQueryItem(queryItem) {
-    //   this.queryItem = queryItem
-    // },
     btnPretestClick() {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
@@ -44,3 +40,10 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.search{
+  width: 100%;
+  height: 100%;
+}
+</style>
+

src/page-subspecialty/views/pages/login.vue

@@ -17,15 +17,14 @@
         :model="dataForm"
         :rules="dataRule"
         status-icon
-        @keyup.enter.native="dataFormSubmitHandle()"
       >
         <!-- 用户名 -->
         <el-form-item prop="account">
-          <el-input v-model="dataForm.account" placeholder="请输入工号" />
+          <el-input v-model="dataForm.account" placeholder="请输入工号" @keyup.enter.native="submitNext"/>
         </el-form-item>
         <!-- 密码 -->
         <el-form-item prop="password">
-          <el-input v-model="dataForm.password" type="password" placeholder="请输入密码" />
+          <el-input ref="passWord" v-model="dataForm.password" type="password" placeholder="请输入密码" @keyup.enter.native="dataFormSubmitHandle()"/>
         </el-form-item>
         <!--        <el-form-item prop="captcha">-->
         <!--          <el-row :gutter="10">-->
@@ -86,6 +85,9 @@ export default {
     // this.getCaptcha()
   },
   methods: {
+    submitNext() {
+      this.$refs.passWord.focus()
+    },
     // 获取验证码
     async getCaptcha() {
       this.dataForm.uuid = getUUID()