Merge branch 'feature/fs' into 'develop'

Feature/fs

See merge request !51

src/components/common/consultation.vue

  <template>
-  <div class="consultationlist">
+  <div class="consultationlist" style=" user-select:none; ">
     <div class="list">
       <div class="name">刘思妙</div>
-      <div class="details">
+      <div class="details" @click="goworkBench">
         <div class="handle">待处理 <span>128</span></div>
         <div class="see">
           <a href="#">查看详情</a>
@@ -32,7 +32,46 @@
 </template>
 
 <script>
-export default {};
+export default {
+  data() {
+    return {
+      userId:"",
+      searchParam :{
+        dateTime: '',
+        operateUserId: '',
+        returnStatus: 1,
+        pageSize: 6,
+        pageNo: 1,
+      }
+    }
+  },
+  props:{
+    valuenow:{
+      type:String,
+      default:''
+    }
+  },
+  created() {
+  },
+  methods: {
+    goworkBench() {
+      this.searchParam.dateTime = this.valuenow
+      this.searchParam.operateUserId = '11'
+      this.POST('/diagnose/socket/condition/update',this.searchParam).then(res=>{
+         if(res.code == '000000'){
+          this.$store.commit('updateSoketQuest', this.searchParam)
+          this.$router.push({path:'/workbench'})
+         }else{
+           this.$message({
+              message: '跳转失败，请再试一次',
+              type: "warning",
+              duration:1000
+            });
+         }
+       })
+    }
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/components/common/diagnoseAdvice.vue

 <template>
-  <div class="diagnoseAdvice" v-drag  v-if="showAdvice">
+  <div class="diagnoseAdvice" v-drag v-if="showAdvice">
     <div class="header"> <span class="headernum"> 问诊单{{currentAdvice.diagnoseId}} 诊断建议</span> <el-button @click="closeadvice">退出</el-button></div>
-    <div class="center">
-     <span>诊断建议</span> <el-input rows="10" type="textarea" v-model="formData.advice" placeholder="请输入内容"></el-input>
+    <div class="center" v-stopdrag>
+     <span>诊断建议</span> <el-input rows="10" type="textarea" v-model="diagnoseAdvice" placeholder="请输入内容"></el-input>
     </div>
     <div class="record">
       <span>录音/录像</span>
       <div v-if="currentAdvice.adviceAudioUrls!=undefined &&currentAdvice.adviceAudioUrls.length > 0">
-        <div v-for="adlist in currentAdvice.adviceAudioUrls" :key="adlist.diagnoseId">
-          <el-link :href="adlist" target="_blank">{{adlist}}</el-link>
+        <div v-for="itemAudio in currentAdvice.adviceAudioUrls" :key="itemAudio.diagnoseId">
+          <el-link :href="itemAudio" target="_blank">{{itemAudio}}</el-link>
         </div>
       </div>
       <span style="color:#0D9078" v-else>无音频</span>
@@ -24,10 +24,7 @@ import {mapState} from "vuex";
 export default {
   data() {
     return{
-      formData:{
-        diagnoseAdvice:'',
-        advice:"",
-      },
+
     }
   },
   props:{
@@ -38,21 +35,32 @@ export default {
   },
   created() {
      
+  },
+  mounted() {
+
   },
   computed:{
     ...mapState({
       currentAdvice: 'currentAdvice',
-    })
+    }),
+    diagnoseAdvice:{
+      get: function () {
+       return this.currentAdvice.content
+      },
+      set(val){
+       this.currentAdvice.content = val
+     }
+    }
   },
   methods:{
     SaveAdvice() {
       let params = {
-        // adviceAudioUrls: this.Adviceslist.adviceAudioUrls,
-        // content: this.formData.advice,
-        // diagnoseId: 11,
-        // illnessAudioUrls: this.Adviceslist.illnessAudioUrls
+        adviceAudioUrls: this.currentAdvice.adviceAudioUrls,
+        content: this.diagnoseAdvice,
+        diagnoseId: 11,//id需要获取
+        illnessAudioUrls: this.currentAdvice.illnessAudioUrls
       }
-      if(!this.formData.advice) return
+      // if(!this.formData.advice) return
       this.POST('/diagnose/admin/diagnose/doctorAdvice/create',params).then(res=>{
         if(res.code == "000000"){
           this.$message({
@@ -95,7 +103,15 @@ export default {
                 };
             };
         }
-    }
+    },
+    stopdrag: {
+          inserted:function(el, binding, vnode) {
+              let element = el;
+              element.onmousedown =function(e) {
+                  e.stopPropagation()
+              }
+          }
+      }
   }
 }
 </script>

src/components/common/diagnosis.vue

@@ -110,7 +110,7 @@ export default {
 }
 </script>
 
-
+                                         
 <style lang="scss" scoped>
 
 </style>

src/components/common/inquirylist.vue

 <template>
-  <div class="inquirylist">
+  <div class="inquirylist" style=" user-select:none; ">
     <el-row>
       <el-col :span="8" >
           <el-card shadow="always" :body-style="{ padding: '0px' }">
@@ -83,7 +83,8 @@ export default {
   computed:{
     ...mapState({
       showChat: 'showChat',
-      showAdvice:'showAdvice'
+      showAdvice:'showAdvice',
+      currentuserId:'currentuserId'
     }),
     diagnoseType() {
       switch(this.item.diagnoseType) {
@@ -183,8 +184,9 @@ export default {
         });
         return false;
       }
-      this.GET(`/diagnose/admin/diagnose/doctorAdvice/list/${this.item.diagnoseLogId}`).then(res=>{
+      this.GET(`/diagnose/admin/diagnose/doctorAdvice/list/11`).then(res=>{
         if(res.code == '000000'){
+          console.log(res.data);
           this.$store.commit('updateCurrentAdvice', res.data);
         }
       }).catch(err=>{
@@ -200,7 +202,7 @@ export default {
  .inquirylist{
   display: flex;
   margin-bottom: 10px;
-  padding: 10px 5px;
+  padding: 10px 10px;
   overflow: hidden !important;
   .el-row{
     width: 100%;
@@ -397,7 +399,7 @@ export default {
       display: flex;
       margin-bottom: 10px;
       // margin: 20px 30px 0px;
-      padding: 10px 5px;
+      padding: 10px 14px;
       // background: #fff;
       overflow: hidden !important;
       .el-row{

src/store/mutations/index.js

@@ -11,12 +11,22 @@ export default {
   updateCurrentAdvice(state, obj) {
     state.currentAdvice = obj;
   },
+  updateSoketQuest(state, obj) {
+    state.soketQuest = obj;
+    localStorage.setItem('soketQuest',obj)
+  },
+  updateSoketseach(state,obj) {
+    state.soketQuest = Object.assign({},state.soketQuest, obj);
+  },
   updateShowChat(state, obj) {
     state.showChat = obj;
   },
   updateShowAdvice(state, obj) {
     state.showAdvice = obj;
   },
+  updateCurrentuserId(state, obj) {
+    state.currentuserId = obj;
+  },
   updateNoticeList(state, obj) {
     state.noticeList = obj;
   },

src/store/state.js

@@ -5,7 +5,10 @@ export default {
   currentCalList:{},
   currentChat: {},
   currentAdvice: {},
+  websoketList: {},
+  soketQuest: {},
   noticeList: [],
+  currentuserId:null,
   showChat:false,
   showAdvice:false
 };

src/views/IM/diagnosis-admin/administrators.vue

@@ -14,7 +14,7 @@
               <el-col :span="12">
                 <el-date-picker
                   style="margin-top: 10px"
-                  v-model="value1"
+                  v-model="valuenow"
                   type="date"
                   placeholder="选择日期"
                 >
@@ -70,7 +70,7 @@
     <!-- 问诊列表 -->
     <div class="box">
       <div class="row" v-for="item in 4" :key="item">
-        <consultationlist></consultationlist>
+        <consultationlist :valuenow="valuenow"></consultationlist>
       </div>
     </div>
     <!-- 底部 -->
@@ -98,13 +98,23 @@ import consultationlist from "../../../components/common/consultation";
 export default {
   data() {
     return {
-      value1: Date.now(),
+      valuenow: new Date().toLocaleDateString().split('/').join('-'),
       currentPage4: 0,
     };
   },
   components: {
     consultationlist,
   },
+  created() {
+  },
+  watch:{
+    valuenow(n,o){
+      if(n){
+    console.log(this.valuenow);
+
+      }
+    }
+  },
   methods: {
     handleSizeChange() {},
     handleCurrentChange() {},

src/views/IM/diagnosis-admin/workbench.vue

@@ -59,13 +59,14 @@ export default {
   computed:{
     ...mapState({
       currentDiagList: 'currentDiagList',
-      currentCalList: 'currentCalList'
+      currentCalList: 'currentCalList',
+      soketQuest:'soketQuest'
     }),
   },
    data(){
      return {
        tabPosition:"1",
-       Datevalue:new Date().toLocaleDateString().split('/').join('-'),
+       Datevalue: new Date(JSON.parse(localStorage.getItem( "administrator")).dateTime) || new Date(),
        currentPage4:0,
        showChat: true,
        totalRows:40,
@@ -108,20 +109,36 @@ export default {
      }
    },
    created(){
+    this.inquirySearch()
    },
    methods:{
      handleSizeChange(val){
-       this.searchParam.pageSize = val
-       this.search()
+        if(JSON.stringify(this.soketQuest)=="{}"){
+          let condition = {pageSize:val}
+          this.$store.commit('updateSoketseach',condition) 
+        }else{
+          this.searchParam.pageSize = val
+        }
+       this.inquirySearch()
      },
      handleCurrentChange(val){
-       this.searchParam.pageNo = val
-       this.search()
+        if(JSON.stringify(this.soketQuest)=="{}"){
+          let condition = {pageNo:val}
+          this.$store.commit('updateSoketseach',condition) 
+        }else{
+           this.searchParam.pageNo = val
+        }
+       this.inquirySearch()
      },
      changestatus(val){
-       this.searchParam.returnStatus = val
-       this.searchParam.pageNo = 1
-       this.search()
+        if(JSON.stringify(this.soketQuest)=="{}"){
+          let condition = {returnStatus:val,pageNo:1}
+          this.$store.commit('updateSoketseach',condition) 
+        }else{
+          this.searchParam.returnStatus = val
+          this.searchParam.pageNo = 1
+        }
+       this.inquirySearch()
 
        // 测试代码
        const l = this.currentDiagList;
@@ -131,19 +148,30 @@ export default {
        this.$store.commit('updateCurrentDiagList', l);
      },
      changeDatetime(val) {
-       this.searchParam.dateTime = val.toLocaleDateString().split('/').join('-')
-       this.searchParam.pageNo = 1
-       this.search()
+        if(JSON.stringify(this.soketQuest)=="{}"){
+          let condition = {dateTime:val.toLocaleDateString().split('/').join('-'),pageNo:1}
+          this.$store.commit('updateSoketseach',condition) 
+        }else{
+          this.searchParam.dateTime = val.toLocaleDateString().split('/').join('-')
+          this.searchParam.pageNo = 1
+        }
+       this.inquirySearch()
      },
-     search() {
-      let params = this.searchParam
-      this.loading = true
-       this.POST('/diagnose/admin/diagnose/operator/list',params).then(res=>{
-         if(res.code == '000000'){
-           this.loading = false
-           console.log(res);
-         }
-       })
+     inquirySearch() {
+       let params = null;
+       if(JSON.stringify(this.soketQuest)=="{}"){
+          params = this.searchParam
+          this.loading = true
+       }else{
+         params = this.soketQuest
+         this.loading = true
+       }
+      this.POST('/diagnose/socket/condition/update',params).then(res=>{
+            if(res.code == '000000'){
+              this.loading = false
+              console.log(res);
+            }
+          })
      }
    },
 }
@@ -161,7 +189,7 @@ export default {
 .forbox{
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-between;
+  // justify-content: space-between;
   .for{
     display: flex;
   }

src/views/layout/slidebar.vue

@@ -68,6 +68,7 @@ export default {
       this.POST("/basic-data/menu/list", { systemType: this.systemType }).then(res => {
         if (res.code == "000000") {
           let { vueMenuDtos } = res.data;
+          this.$store.commit('CurrentuserId',res.data.userId)
           localStorage.setItem('userID', res.data.userId)
           // let vueMenuDtos = [];