Merge branch 'develop' of...

Merge branch 'develop' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into feature/fs

package-lock.json

@@ -22,6 +22,11 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@types/component-emitter": {
+      "version": "1.2.10",
+      "resolved": "http://192.168.110.93:4873/@types%2fcomponent-emitter/-/component-emitter-1.2.10.tgz",
+      "integrity": "sha1-71sVibnxZURkLkc9tepWORB+8+o="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "http://192.168.110.93:4873/abbrev/-/abbrev-1.1.1.tgz",
@@ -1102,6 +1107,11 @@
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "http://192.168.110.93:4873/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "http://192.168.110.93:4873/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1175,6 +1185,11 @@
         }
       }
     },
+    "base64-arraybuffer": {
+      "version": "0.1.4",
+      "resolved": "http://192.168.110.93:4873/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
+      "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI="
+    },
     "base64-js": {
       "version": "1.5.1",
       "resolved": "http://192.168.110.93:4873/base64-js/-/base64-js-1.5.1.tgz",
@@ -1270,6 +1285,7 @@
       "resolved": "http://192.168.110.93:4873/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -1716,8 +1732,7 @@
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "http://192.168.110.93:4873/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=",
-      "dev": true
+      "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A="
     },
     "compressible": {
       "version": "2.0.18",
@@ -2313,6 +2328,45 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
       "dev": true
     },
+    "engine.io-client": {
+      "version": "5.1.2",
+      "resolved": "http://192.168.110.93:4873/engine.io-client/-/engine.io-client-5.1.2.tgz",
+      "integrity": "sha1-JxCNqbOa4DJiRD2UXK8sqjZVxMs=",
+      "requires": {
+        "base64-arraybuffer": "0.1.4",
+        "component-emitter": "~1.3.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~4.0.1",
+        "has-cors": "1.1.0",
+        "parseqs": "0.0.6",
+        "parseuri": "0.0.6",
+        "ws": "~7.4.2",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "4.0.2",
+      "resolved": "http://192.168.110.93:4873/engine.io-parser/-/engine.io-parser-4.0.2.tgz",
+      "integrity": "sha1-5B0LP7Zve/SjZx0gOKFUAk7bUB4=",
+      "requires": {
+        "base64-arraybuffer": "0.1.4"
+      }
+    },
     "enhanced-resolve": {
       "version": "0.9.1",
       "resolved": "http://192.168.110.93:4873/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
@@ -3520,6 +3574,11 @@
         }
       }
     },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "http://192.168.110.93:4873/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+    },
     "has-flag": {
       "version": "1.0.0",
       "resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-1.0.0.tgz",
@@ -3621,7 +3680,8 @@
       "version": "2.16.3",
       "resolved": "http://192.168.110.93:4873/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -5637,6 +5697,16 @@
         "error-ex": "^1.2.0"
       }
     },
+    "parseqs": {
+      "version": "0.0.6",
+      "resolved": "http://192.168.110.93:4873/parseqs/-/parseqs-0.0.6.tgz",
+      "integrity": "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU="
+    },
+    "parseuri": {
+      "version": "0.0.6",
+      "resolved": "http://192.168.110.93:4873/parseuri/-/parseuri-0.0.6.tgz",
+      "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "http://192.168.110.93:4873/parseurl/-/parseurl-1.3.3.tgz",
@@ -7605,6 +7675,60 @@
         "hoek": "2.x.x"
       }
     },
+    "socket.io-client": {
+      "version": "4.1.3",
+      "resolved": "http://192.168.110.93:4873/socket.io-client/-/socket.io-client-4.1.3.tgz",
+      "integrity": "sha1-I22qZCqfIpky4AtyIehDv3QjKmI=",
+      "requires": {
+        "@types/component-emitter": "^1.2.10",
+        "backo2": "~1.0.2",
+        "component-emitter": "~1.3.0",
+        "debug": "~4.3.1",
+        "engine.io-client": "~5.1.2",
+        "parseuri": "0.0.6",
+        "socket.io-parser": "~4.0.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "4.0.4",
+      "resolved": "http://192.168.110.93:4873/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
+      "integrity": "sha1-nqIbDWFQjRgZbvBKLGuatjD0wrA=",
+      "requires": {
+        "@types/component-emitter": "^1.2.10",
+        "component-emitter": "~1.3.0",
+        "debug": "~4.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.2",
+          "resolved": "http://192.168.110.93:4873/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk="
+        }
+      }
+    },
     "sockjs": {
       "version": "0.3.21",
       "resolved": "http://192.168.110.93:4873/sockjs/-/sockjs-0.3.21.tgz",
@@ -9045,6 +9169,11 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
+    "ws": {
+      "version": "7.4.6",
+      "resolved": "http://192.168.110.93:4873/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha1-VlTKjs3u5HwzqaS/bSjivimAN3w="
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "http://192.168.110.93:4873/xtend/-/xtend-4.0.2.tgz",
@@ -9089,6 +9218,11 @@
         "decamelize": "^1.2.0"
       }
     },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "http://192.168.110.93:4873/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
+    },
     "zrender": {
       "version": "4.3.2",
       "resolved": "http://192.168.110.93:4873/zrender/-/zrender-4.3.2.tgz",

package.json

@@ -26,6 +26,7 @@
     "js-cookie": "^2.2.0",
     "qiniu-js": "^3.1.2",
     "showdown": "^1.6.4",
+    "socket.io-client": "^4.1.3",
     "vue": "^2.1.0",
     "vue-router": "^2.1.1",
     "vuex": "^2.0.0"

src/main.js

@@ -49,6 +49,8 @@ const router = new VueRouter({
 	}
 })
 
+
+
 Vue.use(TRTC)
 window.TRTC = TRTC
 Vue.use(TIM)

src/router/router.js

@@ -10,6 +10,8 @@ const diagnosisEditor = r => require.ensure([], () => r(require('../views/IM/dia
 const diagnosisListNew = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-list-new.vue')), 'diagnosisListNew')
 const downList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/down-list.vue')), 'downList')
 const operation= r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/operation.vue')), 'downList')
+const workbench= r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/workbench.vue')), 'workbench')
+
 export default [{
     path: '/',
     component: App,
@@ -48,6 +50,10 @@ export default [{
         },{
           path: '/operation',
           component: operation
-        }
+        },
+        {
+            path: '/workbench',
+            component: workbench
+          }
     ]
 }]

src/store/modules/loginUser.js

+import { io } from "socket.io-client";
+
+export default {
+  namespaced: true,
+  state: {
+    socketClient: null
+  },
+  actions: {
+    initSocket ({ commit, rootState }, payload) {
+      const socket = io("https://example.com", {
+        reconnectionDelayMax: 10000,
+        reconnectionAttempts:'Infinity',
+        reconnection: true,
+        transports: ["websocket"], // use WebSocket first, if available
+        extraHeaders: {"my-custom-header": "1234"},
+        query: {
+          x: 42
+        }
+      });
+      commit('SET_SOCKET', socket);
+    },
+  },
+  mutations: {
+    SET_SOCKET: (state, payload) => {
+      state.socketClient = payload;
+    },
+    SET_IOLISTION: (state, payload) => {
+      if(!state.socketClient){
+        return false;
+      }
+      state.socketClient.on("connection", (socket) => {
+        console.log(socket);
+      });
+      state.socketClient.on("connect_error", (err) => {
+        if (err.message === "invalid credentials") {
+        }
+      });
+      state.socketClient.on("disconnect", (socket) => {
+        console.log(socket);
+      });
+      state.socketClient.on("data", (socket) => {
+        console.log(socket);
+      });
+    },
+  },
+};

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

+<template>
+  <div class="diagnosis-list-content">
+    <div class="select-content screenSet">
+      <div class="title">我的工作台</div> 
+    </div>
+      <div class="select-content screenSet">
+        <!-- 时间 -->
+        <el-row type="flex" justify="center" >
+         <div id="picker">
+             <div class="block">
+            <el-date-picker
+            v-model="value1"
+            type="date"
+            :clearable='false'
+            ref="picker"
+            placeholder="选择日期">
+            </el-date-picker>
+            <i class="el-icon-arrow-down" @click="onfn"></i>
+         </div>
+         </div>
+        </el-row>
+        <!-- tab栏 -->
+      <div class="box" v-if="isdon ==='1'">
+      <el-radio-group v-model="tabPosition" style="margin-bottom: 30px;" >
+      <el-radio-button label="all">全部(0)</el-radio-button>
+      <el-radio-button label="abnormal">异常(0)</el-radio-button>
+      <el-radio-button label="consultation">问诊中(0)</el-radio-button>
+      <el-radio-button label="Notstarted">未开始(0)</el-radio-button>
+      <el-radio-button label="Hasended">已结束(0)</el-radio-button>
+      <el-radio-button label="Cancelled">已取消(0)</el-radio-button>
+      </el-radio-group>
+      </div>
+  
+      <div class="lfet" v-else >
+        <el-row :gutter="20">
+        <el-col :span="6"><div class="grid-content bg-purple">
+            <span>总问诊数</span>
+            <span>0单</span>
+          </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <span>已问诊数</span>
+          <span>0单</span>
+          </div></el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+          <span>问诊中</span>
+          <span>0单</span>
+        </div>
+        </el-col>
+        <el-col :span="6"><div class="grid-content bg-purple">
+        <span>未问诊</span>
+        <span>0单</span>
+        </div>
+        </el-col>
+      </el-row>
+      <div ><i class="el-icon-s-custom"> 运营A成员(6单)</i></div>
+      <div ><i class="el-icon-s-custom"> 运营B成员(2单)</i></div>
+      </div>
+      <!-- <el-empty description="描述文字"></el-empty> -->
+      <!-- 分页 -->
+      <el-row type="flex" justify="end">
+        <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage4"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="100"
+        layout="prev, pager, next, sizes, jumper"
+        :total="400">
+      </el-pagination>
+      </el-row>
+    </div>
+ </div>
+</template>
+
+<script>
+export default {
+   data(){
+     return {
+       tabPosition:"all",
+       value1:Date.now(),
+       currentPage4:0,
+      // 判断是否是管理员
+      isdon:'1',
+      name:''
+     }
+   },
+   methods:{
+     handleSizeChange(){
+
+     },
+     handleCurrentChange(){
+
+     },
+     onfn(){
+      this.$refs.picker.focus();
+      console.log('123')
+     }
+   },
+}
+</script>
+<style lang='scss' scoped>
+#picker{
+    ::v-deep{
+        .el-date-editor{
+             padding-left: 0px;
+            .el-input__inner{
+              background: turquoise !important;
+            }
+        }
+    }
+}
+
+
+</style>
+<style lang="scss" scoped>
+.diagnosis-list-content {
+  .select-content {
+    margin-bottom: 10px;
+    padding: 10px;
+    background: #fff;
+    overflow: hidden !important;
+    .title {
+      height: 50px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+    }
+    .box{
+        border-bottom: 1px solid #ccc;
+        .el-radio-group {
+            margin-bottom: -1px !important;
+        }
+    }
+  }
+}
+  
+  .el-row {
+    margin-bottom: 20px;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .el-col {
+    border-radius: 4px;
+  }
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+  .bg-purple {
+    background: #d3dce6;
+  }
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+  .grid-content {
+    border-radius: 4px;
+    min-height: 45px;
+    display: flex;
+    justify-content: space-evenly;
+    align-items: center;
+    font-size: 16px;
+    }
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+ 
+
+</style>node
\ No newline at end of file