websocket弹窗提示问题

src/components/360View/commonForm/optometryForm.vue

@@ -789,8 +789,6 @@ export default {
             this.$confirm('是否确定更新数据？').then(() => {
               this.setYgData(msg)
             }).catch()
-          } else {
-            this.setYgData(msg)
           }
           self.resetHeart()
         }

src/page-subspecialty/views/modules/formList/screenReport.vue

@@ -117,8 +117,32 @@
                 </el-select>
               </td>
             </tr>
+            <tr>
+              <td>备注</td>
+              <td colspan="2">
+                <el-input v-model="confirmData.remark" type="textarea" :autosize="{ minRows: 1, maxRows: 3}" placeholder="" />
+              </td>
+            </tr>
           </tbody>
         </table>
+        <div style="display: flex;justify-content: space-between">
+          <div class="width-180" style="text-align: left">
+            <span style="display: inline-block;margin-top: 12px">检查者:</span>
+            <img v-if="confirmData.operator" :src="confirmData.operator" alt="" style="width: 80px;height: 50px;border-style:none;">
+          </div>
+          <div class="width-180" style="text-align: left">
+            <el-input v-model="confirmData.ysSign" placeholder="" style="margin-top: 12px">
+              <template slot="prepend">医师:</template>
+            </el-input>
+          </div>
+          <div class="width-180" style="text-align: left;margin-top: 12px">
+            日期：<el-date-picker
+              v-model="confirmData.operateDate"
+              type="date"
+              placeholder="选择日期"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -185,6 +209,9 @@ export default {
       ],
       jgSelect: [],
       confirmData: {
+        operator: '',
+        operateDate: '',
+        remark: '',
         tk: '正常',
         jg: '',
         jgOther: '',
@@ -293,7 +320,7 @@ export default {
     },
     setData(res) {
       this.confirmData = res
-      this.jgSelect = this.confirmData.jg.split('/')
+      this.jgSelect = this.confirmData.jg ? this.confirmData.jg.split('/') : []
       if (!res.jzNumber) {
         this.getPatientData()
         const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
@@ -344,6 +371,23 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-input-group__append, ::v-deep .el-input-group__prepend{
+  background-color: transparent;
+  color: #606266;
+  border: none;
+  font-size: 16px;
+}
+::v-deep .el-textarea__inner{
+  border: none;
+}
+.j-c{
+  justify-content: center;
+}
+.width-180 {
+  .el-input {
+    width: 180px;
+  }
+}
 #operation-record{
   background: #fff;
   padding: 10px 20px 50px 20px;
@@ -379,7 +423,7 @@ export default {
   margin-top: 10px;
   tr td,tr th{
     border: 1px solid #ccc;
-    padding: 5px;
+    padding: 3px;
   }
   td{
     width: 25%;