From 7642223e68ef2f85e89a69233ea56a46eec706ec Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Fri, 12 May 2023 10:10:37 +0800
Subject: [PATCH] peter

---
 .../360View/commonForm/optometryForm-copy.vue | 29 +++++++++++---
 src/components/360View/index1.vue             |  4 +-
 .../optometryManagement/cornea/index.vue      | 38 +++++++++----------
 3 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index 6969a80..8b42012 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -1,9 +1,21 @@
 <template>
   <div id="operation-record" style=" background: #fff; padding: 10px 20px 50px 20px;page-break-after:always">
-    <div v-if="!onlyRead && isPlatform" class="btnBox">
-      <el-button v-print="print" size="small" @click="handleSaveTable">打印</el-button>
-      <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
-      <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
+    <div v-if="!onlyRead && isPlatform" style="display: flex;justify-content: space-between">
+      <div>
+        <el-switch
+          disabled
+          v-model="connectFlag"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          active-text="已连接"
+          inactive-text="已断开"
+        />
+      </div>
+      <div>
+        <el-button v-print="print" size="small" @click="handleSaveTable">打印</el-button>
+        <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
+        <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
+      </div>
     </div>
     <div id="optomeFunc" style="width: 840px;padding-right: 8px" class="printBox">
       <div class="flex j-c" style="padding-bottom: 8px">
@@ -381,6 +393,7 @@ export default {
   },
   data() {
     return {
+      connectFlag: false, // 连接
       ws: null, // 建立的连接
       lockReconnect: false, // 是否真正建立连接
       timeout: 28 * 1000, // 30秒一次心跳
@@ -548,6 +561,7 @@ export default {
   },
   destroyed() {
     if (this.isSearch === '3') {
+      this.connectFlag = false
       clearTimeout(this.timeoutnum)
       clearTimeout(this.timeoutObj)
       clearTimeout(this.serverTimeoutObj)
@@ -721,25 +735,28 @@ export default {
     initWebSoket() {
       // wss://127.0.0.1:8030/data
       // const url = 'ws://47.110.224.240:8036/xiangan-crf/websocket/0071'
-      // const url = 'ws://192.168.0.167:8036/xiangan-crf/websocket/0071'/
+      // const url = 'ws://192.168.0.167:8036/xiangan-crf/websocket/0071'
       try {
         const url = 'ws://127.0.0.1:8030/data'
         const self = this
         this.ws = new WebSocket(url)
         this.ws.onopen = function() {
           console.log('连接成功')
+          self.connectFlag = true
           self.start()
         }
         this.ws.onclose = function() {
+          self.connectFlag = false
+          self.reconnect()
         }
         this.ws.onerror = function() {
+          self.connectFlag = false
           self.reconnect()
         }
         this.ws.onmessage = function(msg) {
           const message = JSON.parse(msg.data)
           // const data = JSON.parse(msg.data)
           // const message = JSON.parse(data.msgTxt)
-          console.log(message)
           self.dataForm.ygjcDsOd = message.RData.DS
           self.dataForm.ygjcDcOd = message.RData.DC
           self.dataForm.ygjcAOd = message.RData.AXIS
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 2bd5ff3..fefd31f 100644
--- a/src/components/360View/index1.vue
+++ b/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({
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
index 5105fab..dfc6483 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
@@ -30,25 +30,25 @@
             </el-form-item>
           </el-form>
         </div>
-        <div style="display: flex;justify-content: space-between;background-color: white;padding: 16px 16px 0">
-          <div>
-<!--            <el-select v-model="dataForm.searchType" placeholder="请选择" style="width:120px;float: left;margin-right: 16px" size="small" @change="getDataListInitial">-->
-<!--              <el-option-->
-<!--                v-for="item in options"-->
-<!--                :key="item.value"-->
-<!--                :label="item.label"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-          </div>-
-          <div>
-            <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>
-            <el-button type="primary" size="small" @click="HISHandle">
-              <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />
-              <span style="padding-left:5px;vertical-align: middle;">HIS引入</span>
-            </el-button>
-          </div>
-        </div>
+<!--        <div style="display: flex;justify-content: space-between;background-color: white;padding: 16px 16px 0">-->
+<!--          <div>-->
+<!--&lt;!&ndash;            <el-select v-model="dataForm.searchType" placeholder="请选择" style="width:120px;float: left;margin-right: 16px" size="small" @change="getDataListInitial">&ndash;&gt;-->
+<!--&lt;!&ndash;              <el-option&ndash;&gt;-->
+<!--&lt;!&ndash;                v-for="item in options"&ndash;&gt;-->
+<!--&lt;!&ndash;                :key="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;                :label="item.label"&ndash;&gt;-->
+<!--&lt;!&ndash;                :value="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;              />&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-select>&ndash;&gt;-->
+<!--          </div>- -->
+<!--          <div>-->
+<!--            <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>-->
+<!--            <el-button type="primary" size="small" @click="HISHandle">-->
+<!--              <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />-->
+<!--              <span style="padding-left:5px;vertical-align: middle;">HIS引入</span>-->
+<!--            </el-button>-->
+<!--          </div>-->
+<!--        </div>-->
         <div class="patient-info-content">
           <el-table
             ref="multipleTable"