Ver Fonte

测温记录查询增加人员编号。

tomatozq há 5 anos atrás
pai
commit
cf6e039071

+ 1 - 1
src/views/base/companyInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/companyInfo">单位管理</a>

+ 1 - 1
src/views/base/devicePerson-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="#">设备人员管理</a>

+ 6 - 1
src/views/base/personDeviceLog-list.vue

@@ -67,8 +67,11 @@
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
           <el-checkbox v-model="queryModel.distinct">是否去重</el-checkbox>
         </el-form-item>
+        <el-form-item label="人员编号" prop="personId">
+          <el-input type="text" size="mini" v-model="queryModel.personId" style="width:100px;"></el-input>
+        </el-form-item>
         <el-form-item label="人员姓名" prop="personName">
-          <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+          <el-input type="text" size="mini" v-model="queryModel.personName" style="width:100px;"></el-input>
         </el-form-item>
         <el-form-item label="温度区间" prop="temperatureBegin">
           <el-input
@@ -192,6 +195,7 @@ export default {
       queryModel: {
         deviceNo: "",
         aliasName: "",
+        personId: "",
         personName: "",
         matchStatus: "",
         timeRanges: "",
@@ -298,6 +302,7 @@ export default {
       }
       formData.append("timeRanges", self.queryModel.timeRanges);
       formData.append("matchStatus", self.queryModel.matchStatus);
+      formData.append("personId", self.queryModel.personId);
       formData.append("personName", self.queryModel.personName);
       formData.append("deviceNo", self.queryModel.deviceNo);
       formData.append("aliasName", self.queryModel.aliasName);

+ 1 - 1
src/views/base/personInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/personInfo">人员管理</a>

+ 1 - 1
src/views/base/personRoleInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">基础信息管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/personRoleInfo">用户身份管理</a>

+ 23 - 0
yarn.lock

@@ -2431,6 +2431,11 @@ core-js@^3.3.2:
   resolved "https://registry.npm.taobao.org/core-js/download/core-js-3.4.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-3.4.2.tgz#ee2b1a60b50388d8ddcda8cdb44a92c7a9ea76df"
   integrity sha1-7isaYLUDiNjdzajNtEqSx6nqdt8=
 
+core-js@^3.6.5:
+  version "3.7.0"
+  resolved "https://registry.npm.taobao.org/core-js/download/core-js-3.7.0.tgz#b0a761a02488577afbf97179e4681bf49568520f"
+  integrity sha1-sKdhoCSIV3r7+XF55Ggb9JVoUg8=
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -3328,6 +3333,11 @@ eventemitter3@^4.0.0:
   resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
   integrity sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs=
 
+eventemitter3@^4.0.3:
+  version "4.0.7"
+  resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8=
+
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/events/download/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@@ -4079,6 +4089,14 @@ highlight.js@^9.6.0:
   resolved "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
   integrity sha1-aDaNA5/+HGIRvMB+SD2vld4+QD4=
 
+hls.js@^0.14.15:
+  version "0.14.16"
+  resolved "https://registry.npm.taobao.org/hls.js/download/hls.js-0.14.16.tgz#4ff68a1fa7260a43d316270e9bc7f7bdf93c5731"
+  integrity sha1-T/aKH6cmCkPTFicOm8f3vfk8VzE=
+  dependencies:
+    eventemitter3 "^4.0.3"
+    url-toolkit "^2.1.6"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -8360,6 +8378,11 @@ url-parse@^1.4.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-toolkit@^2.1.6:
+  version "2.2.1"
+  resolved "https://registry.npm.taobao.org/url-toolkit/download/url-toolkit-2.2.1.tgz#89009ed3d62a3574de079532a7266c14d2cc1c4f"
+  integrity sha1-iQCe09YqNXTeB5UypyZsFNLMHE8=
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"