视图端修改

package-lock.json

@@ -1054,6 +1054,17 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@dabh/diagnostics": {
+      "version": "2.0.2",
+      "resolved": "https://registry.nlark.com/@dabh/diagnostics/download/@dabh/diagnostics-2.0.2.tgz",
+      "integrity": "sha1-KQ0I97OBuPlGB9yPRxoSxnX52zE=",
+      "dev": true,
+      "requires": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
     "@hapi/address": {
       "version": "2.1.4",
       "resolved": "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz?cache=0&sync_timestamp=1593993745797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40hapi%2Faddress%2Fdownload%2F%40hapi%2Faddress-2.1.4.tgz",
@@ -3464,6 +3475,34 @@
       "integrity": "sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs=",
       "dev": true
     },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.nlark.com/colors/download/colors-1.4.0.tgz",
+      "integrity": "sha1-xQSRR51MG9rtLJztMs98fcI2D3g=",
+      "dev": true
+    },
+    "colorspace": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/colorspace/download/colorspace-1.1.2.tgz",
+      "integrity": "sha1-4BKJUNCCuGohaFgHlqCqXWxo2MU=",
+      "dev": true,
+      "requires": {
+        "color": "3.0.x",
+        "text-hex": "1.0.x"
+      },
+      "dependencies": {
+        "color": {
+          "version": "3.0.0",
+          "resolved": "https://registry.nlark.com/color/download/color-3.0.0.tgz?cache=0&sync_timestamp=1628104117021&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolor%2Fdownload%2Fcolor-3.0.0.tgz",
+          "integrity": "sha1-2SC0Mo1TSjrIKV1o971LpsQnvpo=",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.1",
+            "color-string": "^1.5.2"
+          }
+        }
+      }
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz",
@@ -4617,6 +4656,12 @@
       "integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
       "dev": true
     },
+    "enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.nlark.com/enabled/download/enabled-2.0.0.tgz",
+      "integrity": "sha1-+d2S7C1vS7wNXR5k4h1hzUZl58I=",
+      "dev": true
+    },
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz",
@@ -4661,6 +4706,12 @@
       "integrity": "sha1-XEh+V0Krk8Fau12iJ1m4WQ7AO38=",
       "dev": true
     },
+    "err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.nlark.com/err-code/download/err-code-2.0.3.tgz",
+      "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz",
@@ -5293,6 +5344,12 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fast-safe-stringify": {
+      "version": "2.0.8",
+      "resolved": "https://registry.nlark.com/fast-safe-stringify/download/fast-safe-stringify-2.0.8.tgz",
+      "integrity": "sha1-3Cr0jEbPcStoPoSbK71EazLek28=",
+      "dev": true
+    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz",
@@ -5302,6 +5359,12 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fecha": {
+      "version": "4.2.1",
+      "resolved": "https://registry.nlark.com/fecha/download/fecha-4.2.1.tgz",
+      "integrity": "sha1-CoOtj4bvYqCR4iu1oDnNA9I+7M4=",
+      "dev": true
+    },
     "figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.2.tgz",
@@ -5462,6 +5525,12 @@
         "readable-stream": "^2.3.6"
       }
     },
+    "fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.nlark.com/fn.name/download/fn.name-1.1.0.tgz",
+      "integrity": "sha1-JsrYAXlnrqhzG8QpYdBKPVmIrMw=",
+      "dev": true
+    },
     "follow-redirects": {
       "version": "1.13.0",
       "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz",
@@ -6338,6 +6407,12 @@
         }
       }
     },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz",
+      "integrity": "sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4=",
+      "dev": true
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finvariant%2Fdownload%2Finvariant-2.2.4.tgz",
@@ -6844,6 +6919,12 @@
       "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=",
       "dev": true
     },
+    "kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.nlark.com/kuler/download/kuler-2.0.0.tgz",
+      "integrity": "sha1-4sVwo4ADiPtEQH6FFTHB1nCwYbM=",
+      "dev": true
+    },
     "launch-editor": {
       "version": "2.2.1",
       "resolved": "https://registry.npm.taobao.org/launch-editor/download/launch-editor-2.2.1.tgz",
@@ -7085,6 +7166,19 @@
         "chalk": "^2.0.1"
       }
     },
+    "logform": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npm.taobao.org/logform/download/logform-2.2.0.tgz",
+      "integrity": "sha1-QPA20ZFh/Ha2irUP3H/klVREkvI=",
+      "dev": true,
+      "requires": {
+        "colors": "^1.2.1",
+        "fast-safe-stringify": "^2.0.4",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "triple-beam": "^1.3.0"
+      }
+    },
     "loglevel": {
       "version": "1.7.0",
       "resolved": "https://registry.npm.taobao.org/loglevel/download/loglevel-1.7.0.tgz",
@@ -7887,6 +7981,15 @@
         "wrappy": "1"
       }
     },
+    "one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.nlark.com/one-time/download/one-time-1.0.0.tgz",
+      "integrity": "sha1-4GvBdK7SFO1Y7e3lc7Qzu/gny0U=",
+      "dev": true,
+      "requires": {
+        "fn.name": "1.x.x"
+      }
+    },
     "onetime": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz",
@@ -8924,6 +9027,16 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npm.taobao.org/promise-retry/download/promise-retry-2.0.1.tgz",
+      "integrity": "sha1-/3R6E2IKtXumiPX8Z4VUEMNw2iI=",
+      "dev": true,
+      "requires": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.6",
       "resolved": "https://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.6.tgz",
@@ -9127,6 +9240,15 @@
         "picomatch": "^2.2.1"
       }
     },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101677944&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
     "regenerate": {
       "version": "1.4.1",
       "resolved": "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.1.tgz",
@@ -9736,6 +9858,17 @@
       "integrity": "sha1-Z6fQLHbJ2iT5nSCAj8re0ODgS+I=",
       "dev": true
     },
+    "shelljs": {
+      "version": "0.8.4",
+      "resolved": "https://registry.nlark.com/shelljs/download/shelljs-0.8.4.tgz",
+      "integrity": "sha1-3naE/ut2f4cWsyYHiooAh1iQ48I=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.3.tgz",
@@ -10096,6 +10229,63 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssh2": {
+      "version": "0.8.9",
+      "resolved": "https://registry.nlark.com/ssh2/download/ssh2-0.8.9.tgz",
+      "integrity": "sha1-VNo6bEuj2vDYR3pTikgTJgkYFfM=",
+      "dev": true,
+      "requires": {
+        "ssh2-streams": "~0.4.10"
+      }
+    },
+    "ssh2-sftp-client": {
+      "version": "6.0.1",
+      "resolved": "https://registry.nlark.com/ssh2-sftp-client/download/ssh2-sftp-client-6.0.1.tgz",
+      "integrity": "sha1-zZAaz9UwPsXaDhBDbV3EhPNORkw=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^2.0.0",
+        "promise-retry": "^2.0.1",
+        "ssh2": "^0.8.9",
+        "winston": "^3.3.3"
+      },
+      "dependencies": {
+        "concat-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.nlark.com/concat-stream/download/concat-stream-2.0.0.tgz",
+          "integrity": "sha1-QUz1r3kKSMYKub5FJ9VtXkETPLE=",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.0.2",
+            "typedarray": "^0.0.6"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.nlark.com/readable-stream/download/readable-stream-3.6.0.tgz",
+          "integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "ssh2-streams": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npm.taobao.org/ssh2-streams/download/ssh2-streams-0.4.10.tgz",
+      "integrity": "sha1-SO9+ig452PKSHDBSHVbayzHSOjQ=",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.0",
+        "bcrypt-pbkdf": "^1.0.2",
+        "streamsearch": "~0.1.2"
+      }
+    },
     "sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz",
@@ -10128,6 +10318,12 @@
       "integrity": "sha1-g26zyDgv4pNv6vVEYxAXzn1Ho88=",
       "dev": true
     },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.nlark.com/stack-trace/download/stack-trace-0.0.10.tgz?cache=0&sync_timestamp=1620387770510&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstack-trace%2Fdownload%2Fstack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
     "stackframe": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/stackframe/download/stackframe-1.2.0.tgz?cache=0&sync_timestamp=1590854148142&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstackframe%2Fdownload%2Fstackframe-1.2.0.tgz",
@@ -10200,6 +10396,12 @@
       "integrity": "sha1-1wiCgVWasneEJCebCHfaPDktWj0=",
       "dev": true
     },
+    "streamsearch": {
+      "version": "0.1.2",
+      "resolved": "https://registry.nlark.com/streamsearch/download/streamsearch-0.1.2.tgz",
+      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=",
+      "dev": true
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz",
@@ -10496,6 +10698,12 @@
         }
       }
     },
+    "text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/text-hex/download/text-hex-1.0.0.tgz",
+      "integrity": "sha1-adycGxdEbueakr9biEu0uRJ1BvU=",
+      "dev": true
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
@@ -10653,6 +10861,12 @@
         "punycode": "^2.1.1"
       }
     },
+    "triple-beam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.nlark.com/triple-beam/download/triple-beam-1.3.0.tgz",
+      "integrity": "sha1-pZUhTHKY24M57u7gg+TRC9jLjdk=",
+      "dev": true
+    },
     "tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz",
@@ -11885,6 +12099,58 @@
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
+    "winston": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npm.taobao.org/winston/download/winston-3.3.3.tgz",
+      "integrity": "sha1-rmFyBCyvspeGr6PQnI/4M6t8kXA=",
+      "dev": true,
+      "requires": {
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.1.0",
+        "is-stream": "^2.0.0",
+        "logform": "^2.2.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "3.2.1",
+          "resolved": "https://registry.nlark.com/async/download/async-3.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fasync%2Fdownload%2Fasync-3.2.1.tgz",
+          "integrity": "sha1-0ydOxm0QekdHakxJE2qs2wBmX8g=",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "2.0.1",
+          "resolved": "https://registry.nlark.com/is-stream/download/is-stream-2.0.1.tgz?cache=0&sync_timestamp=1628592752355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-stream%2Fdownload%2Fis-stream-2.0.1.tgz",
+          "integrity": "sha1-+sHj1TuXrVqdCunO8jifWBClwHc=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.nlark.com/readable-stream/download/readable-stream-3.6.0.tgz",
+          "integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "winston-transport": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npm.taobao.org/winston-transport/download/winston-transport-4.4.0.tgz",
+      "integrity": "sha1-F69RjappDVsuzMqnrPeyDKeSXlk=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^2.3.7",
+        "triple-beam": "^1.2.0"
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz",

package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "start": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "upload": "node ./upload/index.js"
   },
   "dependencies": {
     "axios": "^0.20.0",
@@ -24,6 +25,8 @@
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.0.4",
     "less-loader": "^5.0.0",
+    "shelljs": "^0.8.4",
+    "ssh2-sftp-client": "^6.0.1",
     "vue-template-compiler": "^2.6.11"
   }
 }

src/views/AppIndex.vue

@@ -78,10 +78,10 @@
         style="position: relative"
         v-show="
           (!loading1 && !loading5 && currentNavIndex == 1) ||
-          (!loading2 && !loading5 && !loading10 && currentNavIndex == 2) ||
-          (!loading4 && !loading5 && !loading10 && currentNavIndex == 3) ||
-          (!loading5 && !loading6 && currentNavIndex == 4) ||
-          (!loading5 && !loading9 && currentNavIndex == 5)
+            (!loading2 && !loading5 && !loading10 && currentNavIndex == 2) ||
+            (!loading4 && !loading5 && !loading10 && currentNavIndex == 3) ||
+            (!loading5 && !loading6 && currentNavIndex == 4) ||
+            (!loading5 && !loading9 && currentNavIndex == 5)
         "
       >
         <!-- 科室标本视图 -->
@@ -132,9 +132,9 @@
           class="cot_img"
           v-show="
             currentNavIndex == 1 &&
-            swiperList.length == 0 &&
-            !loading1 &&
-            !loading5
+              swiperList.length == 0 &&
+              !loading1 &&
+              !loading5
           "
         >
           <span>暂无数据</span>
@@ -163,7 +163,12 @@
             <div class="cot_all" v-for="(worke, i) in workerMessage" :key="i">
               <div class="cot sevenCol" v-for="data in worke" :key="data.id">
                 <div class="first">
-                  <span>{{ data.name }}</span>
+                  <div class="first_first">
+                    <span>{{ data.name }}</span>
+                    <span v-if="data.phone" class="first_firstPhone"
+                      >({{ data.phone }})</span
+                    >
+                  </div>
                   <span>累计{{ data.totalCount }}单</span>
                   <span
                     class="times imptime"
@@ -196,10 +201,10 @@
           class="cot_img"
           v-show="
             currentNavIndex == 2 &&
-            workerMessage.length == 0 &&
-            !loading2 &&
-            !loading5 &&
-            !loading10
+              workerMessage.length == 0 &&
+              !loading2 &&
+              !loading5 &&
+              !loading10
           "
         >
           <span>暂无数据</span>
@@ -259,10 +264,10 @@
           class="cot_img"
           v-show="
             currentNavIndex == 3 &&
-            onlines.length == 0 &&
-            !loading4 &&
-            !loading5 &&
-            !loading10
+              onlines.length == 0 &&
+              !loading4 &&
+              !loading5 &&
+              !loading10
           "
         >
           <span>暂无数据</span>
@@ -293,7 +298,10 @@
               <div class="main-box-item-header pp">
                 <h2 :title="item.name">{{ item.name }}</h2>
                 <div>{{ item.gdjczs }}</div>
-                <strong>{{ item.userName ? item.userName : "" }}</strong>
+                <strong
+                  >{{ item.userName ? item.userName : ""
+                  }}<span>{{ item.phone ? item.phone : "" }}</span></strong
+                >
               </div>
               <div class="main-box-item-content">
                 <div
@@ -309,7 +317,7 @@
                 </div>
                 <div class="main-box-item-contentBox green">
                   <h3>{{ item.gdnum }}</h3>
-                  <p>转运总数</p>
+                  <p>转科总数</p>
                 </div>
               </div>
             </div>
@@ -319,9 +327,9 @@
           class="cot_img"
           v-show="
             currentNavIndex == 4 &&
-            parentList.length == 0 &&
-            !loading5 &&
-            !loading6
+              parentList.length == 0 &&
+              !loading5 &&
+              !loading6
           "
         >
           <span>暂无数据</span>
@@ -361,9 +369,9 @@
           class="cot_img"
           v-show="
             currentNavIndex == 5 &&
-            drugList.length == 0 &&
-            !loading5 &&
-            !loading9
+              drugList.length == 0 &&
+              !loading5 &&
+              !loading9
           "
         >
           <span>暂无数据</span>
@@ -374,10 +382,10 @@
         class="main loading"
         v-show="
           ((loading1 || loading5) && currentNavIndex == 1) ||
-          ((loading2 || loading5 || loading10) && currentNavIndex == 2) ||
-          ((loading4 || loading5 || loading10) && currentNavIndex == 3) ||
-          ((loading5 || loading6) && currentNavIndex == 4) ||
-          ((loading5 || loading9) && currentNavIndex == 5)
+            ((loading2 || loading5 || loading10) && currentNavIndex == 2) ||
+            ((loading4 || loading5 || loading10) && currentNavIndex == 3) ||
+            ((loading5 || loading6) && currentNavIndex == 4) ||
+            ((loading5 || loading9) && currentNavIndex == 5)
         "
       >
         <img src="./../assets/images/loading.gif" alt="" />
@@ -447,7 +455,23 @@
       <!-- 标本科室视图弹层 -->
       <div v-if="detailModel" :class="{ detailModel }">
         <div class="box">
-          <h2 class="title">未取标本详情</h2>
+          <h2 class="title">
+            <div class="operateTitle">
+              标本详情
+              <div class="operate">
+                <label>
+                  <input type="checkbox" value="332" v-model="speState" /><span
+                    >未收取</span
+                  >
+                </label>
+                <label>
+                  <input type="checkbox" value="333" v-model="speState" /><span
+                    >已收取</span
+                  >
+                </label>
+              </div>
+            </div>
+          </h2>
           <div class="table">
             <div class="table-content">
               <table>
@@ -460,6 +484,7 @@
                     <th>床号</th>
                     <th>采集时间</th>
                     <th>目标科室</th>
+                    <th>收取人</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -489,8 +514,10 @@
                           }"
                         ></div>
                       </td>
+                      <td>{{ detail.receiver || "-" }}</td>
                     </tr>
                   </vueCustomScrollbar>
+
                   <div
                     style="font-size: 18px"
                     v-if="!detailList.length && !loading3"
@@ -547,6 +574,7 @@
                       </td>
                     </tr>
                   </vueCustomScrollbar>
+
                   <div
                     style="font-size: 18px"
                     v-if="!detailParentList.length && !loading7"
@@ -578,24 +606,39 @@
         class="detailModelParent"
       >
         <div class="box" style="width: 1274px">
-          <h2 class="title">患者检查详情</h2>
+          <h2 class="title">
+            <div class="operateTitle">
+              患者检查详情
+              <div class="operate">
+                <label>
+                  <input type="radio" value="666" v-model="inspectState" /><span
+                    >所有检查</span
+                  >
+                </label>
+                <label>
+                  <input type="radio" value="307" v-model="inspectState" /><span
+                    >待检查</span
+                  >
+                </label>
+              </div>
+            </div>
+          </h2>
           <div class="table" style="width: 1234px">
             <div class="table-content" style="width: 1170px">
               <table>
                 <thead>
                   <tr>
                     <th>序号</th>
-                    <th style="width: 100px !important">患者姓名</th>
-                    <th>患者编码</th>
-                    <th style="width: 50px !important">床号</th>
+                    <th style="width: 150px !important">患者姓名(床号)</th>
                     <th>检查项目</th>
                     <th>预约时间</th>
                     <th>叫号信息</th>
-                    <th>到达时间</th>
                     <th>检查科室</th>
+                    <th style="width: 70px !important">是否建单</th>
                     <th style="width: 70px !important">是否送达</th>
+                    <th>送达时间</th>
                     <th style="width: 70px !important">检查状态</th>
-                    <th style="width: 70px !important">是否建单</th>
+                    <th>陪检人</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -610,37 +653,36 @@
                     >
                       <td>{{ i + 1 }}</td>
                       <td
-                        style="width: 100px !important"
+                        style="width: 150px !important"
                         :style="{
                           color: detail.focusPatient == 1 ? 'red' : '',
                         }"
                       >
                         {{ detail.patientName || "-" }}
-                      </td>
-                      <td>{{ detail.patientCode || "-" }}</td>
-                      <td style="width: 50px !important">
-                        {{ detail.bedNum || "-" }}
+                        <span v-if="detail.bedNum">({{ detail.bedNum }})</span>
                       </td>
                       <td>{{ detail.inspectName || "-" }}</td>
                       <td>{{ detail.yyTime || "-" }}</td>
                       <td>{{ detail.reservationNumber || "-" }}</td>
-                      <td>{{ detail.arriveTime || "-" }}</td>
                       <td>
                         {{ detail.execDept ? detail.execDept.dept : "-" }}
                       </td>
                       <td style="width: 70px !important">
+                        {{ detail.gdId ? "是" : "否" }}
+                      </td>
+                      <td style="width: 70px !important">
                         {{ detail.arriveTime ? "是" : "否" }}
                       </td>
+                      <td>{{ detail.arriveTime || "-" }}</td>
                       <td style="width: 70px !important">
                         {{
                           detail.inspectState ? detail.inspectState.name : "-"
                         }}
                       </td>
-                      <td style="width: 70px !important">
-                        {{ detail.gdId ? "是" : "否" }}
-                      </td>
+                      <td></td>
                     </tr>
                   </vueCustomScrollbar>
+
                   <div
                     style="font-size: 18px"
                     v-if="!detailSpeList.length && !loading8"
@@ -692,7 +734,7 @@ export default {
     showModel,
   },
   filters: {
-    length6: function (value) {
+    length6: function(value) {
       return value.slice(0, 6);
     },
   },
@@ -782,8 +824,26 @@ export default {
       groupId3: 0,
       // 1是综合排班，2是自选排班
       workType: 0,
+      //科室标本的标本详情 332是未收取 333是已收取
+      speState: [],
+      //科室标本,当前选中的科室
+      currentSpecimenDept: null,
+      //病房患者的标本详情 307是待检查
+      inspectState: "",
+      //病房患者,当前选中的科室
+      currentInspectDept: null,
     };
   },
+  watch: {
+    //科室标本的标本详情，已收取，未收取
+    speState() {
+      this.getDetailBySpecimen(this.currentSpecimenDept);
+    },
+    //病房患者的检查详情
+    inspectState() {
+      this.getDetailByInspect(this.currentInspectDept);
+    },
+  },
   methods: {
     // 搜索分组
     selectGroup() {
@@ -902,12 +962,23 @@ export default {
       console.log(item);
       clearTimeout(this.timer);
       clearTimeout(this.timer1);
+      this.speState = ["333", "332"];
+      this.currentSpecimenDept = item;
       this.detailModel = true;
+    },
+    // 获取标本详情(标本科室视图)
+    getDetailBySpecimen(item) {
       let postData = {
         hosIds: this.$route.params.hosIds,
         deptId: item.deptId,
         urgent: -1,
       };
+      if (this.speState.length > 0) {
+        postData.speState = this.speState.toString();
+      } else if (this.speState.length === 0) {
+        this.detailList = [];
+        return;
+      }
       this.loading3 = true;
       post("/nurse/getListSpecimenDetails", postData).then((result) => {
         this.loading3 = false;
@@ -942,16 +1013,29 @@ export default {
       this.polling();
       this.scrollInfinite();
     },
-    // 点击详情(病房患者视图->重点关注患者人数)
+    // 点击详情(病房患者视图->患者检查详情)
     detailSpe(item) {
       console.log(item);
       clearTimeout(this.timer5);
       clearTimeout(this.timer55);
+      this.inspectState = "666";
+      this.currentInspectDept = item;
       this.detailSpeModel = true;
+    },
+    // 获取检查详情(病房患者视图)
+    getDetailByInspect(item) {
       let postData = {
         hosIds: this.$route.params.hosIds,
-        deptid: item.id,
+        deptId: item.id,
       };
+      if (this.inspectState) {
+        if (this.inspectState === "307") {
+          postData.inspectState = this.inspectState;
+        }
+      } else {
+        this.detailSpeList = [];
+        return;
+      }
       this.loading8 = true;
       post("/nurse/getViewData/getInspect", postData).then((result) => {
         this.loading8 = false;
@@ -1441,7 +1525,7 @@ export default {
     }
   }
   .box {
-    width: 1000px;
+    width: 1167px;
     height: 580px;
     border-radius: 8px;
     background-color: #fff;
@@ -1464,9 +1548,55 @@ export default {
       font-size: 18px;
       color: #333;
       font-weight: bold;
+      .operateTitle {
+        position: relative;
+        .operate {
+          font-weight: normal;
+          font-size: 14px;
+          width: 200px;
+          position: absolute;
+          top: 0;
+          left: 100%;
+          label {
+            cursor: pointer;
+            margin-left: 8px;
+            display: inline-flex;
+            align-items: center;
+            span {
+              margin-left: 4px;
+            }
+            input[type="checkbox"] {
+              cursor: pointer;
+              position: relative;
+              width: 15px;
+              height: 15px;
+              font-size: 15px;
+            }
+
+            input[type="checkbox"]:checked::after {
+              position: absolute;
+              overflow: hidden;
+              background-color: #49b856;
+              border: 1px solid #767676;
+              color: #fff;
+              width: 15px;
+              height: 15px;
+              border-radius: 4px;
+              line-height: 0.8;
+              display: inline-block;
+              content: "\e618;";
+              font-size: 15px;
+              font-family: "icon_transport" !important;
+              font-style: normal;
+              -webkit-font-smoothing: antialiased;
+              -moz-osx-font-smoothing: grayscale;
+            }
+          }
+        }
+      }
     }
     .table {
-      width: 960px;
+      width: 1127px;
       height: 474px;
       background-color: #f9fafb;
       border: 1px solid #e5e9ed;
@@ -1475,7 +1605,7 @@ export default {
       justify-content: center;
       align-items: center;
       .table-content {
-        width: 896px;
+        width: 1063px;
         height: 420px;
         background-color: #fff;
         border-radius: 8px;
@@ -1942,6 +2072,14 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    .first_first {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      .first_firstPhone {
+        font-size: 12px;
+      }
+    }
   }
   .message_cot .cot .first span {
     display: inline-block;
@@ -1964,7 +2102,7 @@ export default {
   }
 
   .message_cot .cot .second {
-    margin-top: 16px;
+    margin-top: 8px;
     width: 100%;
     height: 20px;
   }
@@ -2003,4 +2141,4 @@ export default {
     font-size: 13px;
   }
 }
-</style>
+</style>

upload/config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  ip: "192.168.3.108", // ssh地址
+  username: "root", // ssh 用户名
+  port: 22,      //端口
+  password: "123456", // ssh 密码
+  path: '/home/itsm/project/itsm-web/specimenView', // 上传地址
+  rmpath: '/home/itsm/project/itsm-web/specimenView' // 删除地址
+}

upload/index.js

@@ -0,0 +1,36 @@
+const config = require('./config.js')
+const shell = require('shelljs')
+const path = require('path');
+let Client = require('ssh2-sftp-client');
+
+function connectSSh() {
+  let sftp = new Client();
+  sftp.connect({
+    host: config.ip,
+    port: config.port,
+    username: config.username,
+    password: config.password
+  }).then(() => {
+    console.log("-----先执行删除服务器文件-----")
+    return sftp.rmdir(config.rmpath, true);
+  }).then(() => {
+    // 上传文件
+    console.log("-----开始上传-----")
+    return sftp.uploadDir(path.resolve(__dirname, '../dist/specimenView'), config.path);
+  }).then((data) => {
+    console.log("-----上传完成-----");
+    sftp.end();
+  }).catch((err) => {
+    console.log(err, '-----失败-----');
+    sftp.end();
+  });
+}
+function runTask() {
+  //打包完成
+  if (shell.exec(`npm run build`).code == 0) {
+    console.log("-----打包成功-----");
+    //提交上传
+    connectSSh();
+  }
+}
+runTask()

vue.config.js

@@ -4,13 +4,13 @@ module.exports = {
   productionSourceMap: false,
   devServer: {
     open: false, // 是否自动弹出浏览器页面
-    host: 'localhost',
+    host: '0.0.0.0',
     port: '8888',
     https: false, // 是否使用https协议
     hotOnly: true, // 是否开启热更新
     proxy: {
       '/service': {
-        target: 'http://zzzx.xyszxyy.com:8087', // API服务器的地址
+        target: 'http://192.168.3.96', // API服务器的地址
         ws: true, // 代理websockets
         changeOrigin: true, // 虚拟的站点需要更管origin
         pathRewrite: {