sz 首页健康公示,温度记录添加查询条件等

.env.development

@@ -3,4 +3,5 @@ VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://192.168.33.26:8080/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/
-VUE_APP_COMPANY_HEALTH_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html
+VUE_APP_COMPANY_HEALTH_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+VUE_APP_COMPANY_HEALTH_WECHAR_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html

.env.production

@@ -1,4 +1,5 @@
 VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
-VUE_APP_COMPANY_HEALTH_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html
+VUE_APP_COMPANY_HEALTH_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+VUE_APP_COMPANY_HEALTH_WECHAR_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html

src/views/Home.vue

@@ -8,7 +8,10 @@
     </el-breadcrumb>
     <el-divider></el-divider>
     <el-card class="diagram_jkgs" style="padding-left:-10px">
-          <el-button style="font-size:24px" type="success" @click="openView">健康<br>公示</el-button>
+      <el-button style="font-size:24px" type="success" @click="openView">
+        健康
+        <br />公示
+      </el-button>
     </el-card>
     <el-card class="diagram_top">
       <div class="ax_default3 xtsyqk_fyy">
@@ -75,6 +78,10 @@
 <script>
 import Constant from "@/constant";
 import workAttendanceApi from "@/api/business/workAttendance";
+import userApi from "@/api/sys/user";
+
+import "nprogress/nprogress.css"; // progress bar style
+import NProgress from "nprogress"; // progress bar
 // @ is an alias to /src
 export default {
   name: "home",
@@ -89,7 +96,8 @@ export default {
       normalDays: "0",
       abnormalNum: [],
       normalNum: [],
-      day: []
+      day: [],
+      user: {}
     };
   },
   methods: {
@@ -171,8 +179,13 @@ export default {
         ]
       });
     },
-    openView(){
-      window.open("http://wisdomhouseadmin.sudaonline.net/ygjDemo/jkgs.html");
+    openView() {
+      var companyId = this.user.companyId;
+      var qrtext =
+        process.env.VUE_APP_COMPANY_HEALTH_PC_URL +
+        "?companyId=" +
+        companyId;
+      window.open(qrtext);
     }
   },
   async mounted() {
@@ -209,6 +222,13 @@ export default {
       //normalNum
       //day
     });
+
+    userApi.userInfo().then(resp => {
+      if (resp.data.result) {
+        this.user = resp.data.data;
+      }
+    });
+
     this.everyDayMeasuringView();
   }
 };
@@ -262,7 +282,7 @@ export default {
   height: 400px;
   float: left;
 }
-.diagram_extraWide{
+.diagram_extraWide {
   margin: 20px 20px;
   width: 220px;
   height: 120px;
@@ -279,8 +299,7 @@ export default {
   height: 120px;
   float: left;
 }
-.ax_default3{
+.ax_default3 {
   width: 170px;
 }
-
 </style>

src/views/base/companyDeviceRelation-list.vue

@@ -95,7 +95,7 @@ export default {
       showModal: false,
       modalTitle: "",
       showDialog: true,
-      loading:false
+      loading: false
     };
   },
   methods: {
@@ -170,7 +170,7 @@ export default {
         return record.device.id;
       });
 
-      this.$confirm("是否绑定?","提示","warning").then((result)=>{        
+      this.$confirm("是否绑定?", "提示", "warning").then(result => {
         if (result) {
           self.loading = true;
           var formData = new FormData();
@@ -200,20 +200,58 @@ export default {
       //绑定设备
       var self = this;
 
-      this.$confirm("是否绑定?","提示",{type:"success"}).then((result)=>{
+      this.$confirm("是否绑定?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
+      }).then(result => {
         if (result) {
+          self.loading = true;
+          var formData = new FormData();
+          formData.append("companyId", self.companyId);
+          formData.append("deviceIds", record.device.id);
+          return companyInfoApi.bindDevice(formData).then(function(response) {
+            self.loading = false;
+
+            var jsonData = response.data;
+            self.changePage(self.pageIndex);
+            if (jsonData.result) {
+              self.$message({
+                message: "绑定成功!",
+                type: "success"
+              });
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+            }
+          });
+        }
+      });
+    },
+    handleUnBound(record) {
+      //取消绑定
+      var self = this;
+
+      this.$confirm("是否解除绑定？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
+      }).then(() => {
         self.loading = true;
         var formData = new FormData();
         formData.append("companyId", self.companyId);
         formData.append("deviceIds", record.device.id);
-        return companyInfoApi.bindDevice(formData).then(function(response) {
+        return companyInfoApi.unbindDevice(formData).then(function(response) {
           self.loading = false;
-
           var jsonData = response.data;
           self.changePage(self.pageIndex);
           if (jsonData.result) {
             self.$message({
-              message: "绑定成功!",
+              message: "解绑成功!",
               type: "success"
             });
           } else {
@@ -223,32 +261,6 @@ export default {
             });
           }
         });
-      }
-      });
-    },
-    handleUnBound(record) {
-      //取消绑定
-      var self = this;
-      self.loading = true;
-
-      var formData = new FormData();
-      formData.append("companyId", self.companyId);
-      formData.append("deviceIds", record.device.id);
-      return companyInfoApi.unbindDevice(formData).then(function(response) {
-        self.loading = false;
-        var jsonData = response.data;
-        self.changePage(self.pageIndex);
-        if (jsonData.result) {
-          self.$message({
-            message: "绑定成功!",
-            type: "success"
-          });
-        } else {
-          self.$message({
-            message: jsonData.message + "",
-            type: "warning"
-          });
-        }
       });
     },
     onDetailModalClose(refreshed) {

src/views/base/companyInfo-list.vue

@@ -289,7 +289,7 @@ export default {
     openQRCode(record) {
       document.getElementById(record.id).innerHTML = "";
       var self = this;
-      var qrtext = process.env.VUE_APP_COMPANY_HEALTH_URL + "?companyId=" + record.id;
+      var qrtext = process.env.VUE_APP_COMPANY_HEALTH_WECHAR_URL + "?companyId=" + record.id;
       var qr = new QRCode(record.id, {
         text: qrtext,
         width: 300,

src/views/base/personDeviceLog-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/personDeviceLog">考勤记录</a>
+        <a href="/personDeviceLog">测温记录</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -35,10 +35,35 @@
             :default-time="['12:00:00', '08:00:00']"
           ></el-date-picker>-->
         </el-form-item>
+        <el-form-item label="设备编号" prop="deviceNo">
+          <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
+        </el-form-item>
+        <el-form-item label="设备别称" prop="aliasName">
+          <el-input type="text" size="mini" v-model="queryModel.aliasName"></el-input>
+        </el-form-item>
+      </div>
+      <div>
+        <el-form-item label="单位" prop="companyId">
+          <el-select
+            v-model="queryModel.companyId"
+            size="mini"
+            filterable
+            placeholder="请选择"
+            style="width:220px"
+          >
+            <el-option
+              v-for="company in companyResult"
+              :key="company.id"
+              :label="company.name"
+              :value="company.id"
+            ></el-option>
+          </el-select>&nbsp;
+          <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
+          <el-checkbox v-model="queryModel.distinct">是否去重</el-checkbox>
+        </el-form-item>
         <el-form-item label="人员姓名" prop="personName">
           <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
         </el-form-item>
-
         <el-form-item label="温度区间" prop="temperatureBegin">
           <el-input
             type="text"
@@ -48,16 +73,8 @@
           ></el-input>-
           <el-input type="text" size="mini" style="width:50px;" v-model="queryModel.temperatureEnd"></el-input>
         </el-form-item>
-      </div>
-      <div>
-        <el-form-item label="设备编号" prop="deviceNo">
-          <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
-        </el-form-item>
-        <el-form-item label="设备别称" prop="aliasName">
-          <el-input type="text" size="mini" v-model="queryModel.aliasName"></el-input>
-        </el-form-item>
         <el-form-item label="匹配状态" prop="matchMsg">
-          <el-input type="text" size="mini" v-model="queryModel.matchMsg"></el-input>
+          <el-input type="text" size="mini" style="width:80px;" v-model="queryModel.matchMsg"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -139,6 +156,8 @@
 <script>
 import Constant from "@/constant";
 import personDeviceLogApi from "@/api/base/personDeviceLog";
+import companyInfoApi from "@/api/base/companyInfo";
+
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -148,7 +167,6 @@ export default {
 
     return {
       queryModel: {
-        companyId: "",
         deviceNo: "",
         aliasName: "",
         personName: "",
@@ -159,7 +177,10 @@ export default {
         temperatureBegin: "",
         temperatureEnd: "",
         temperatureRanges: "",
-        matchMsg: ""
+        matchMsg: "",
+        companyId: "",
+        subordinate:false,
+        distinct: false
       },
       loading: false,
       tableData: [],
@@ -176,12 +197,22 @@ export default {
       businessKey: "",
       downloadLoading: false,
       tableHeight: "",
-      timeRangesDefaultTime: []
+      timeRangesDefaultTime: [],
+      companyResult: ""
     };
   },
   created() {
     var self = this;
     this.getCurrentMonthFirst();
+
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
   },
   methods: {
     changePage(pageIndex) {
@@ -201,10 +232,13 @@ export default {
       formData.append("personName", self.queryModel.personName);
       formData.append("deviceNo", self.queryModel.deviceNo);
       formData.append("aliasName", self.queryModel.aliasName);
-      formData.append("companyId", self.queryModel.companyId);
       formData.append("position", self.queryModel.position);
       formData.append("matchMsg", self.queryModel.matchMsg);
 
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("subordinate", self.queryModel.subordinate);
+      formData.append("distinct", self.queryModel.distinct);
+
       formData.append(
         "temperatureRanges",
         self.queryModel.temperatureBegin + "," + self.queryModel.temperatureEnd
@@ -275,6 +309,9 @@ export default {
       formData.append("companyId", self.queryModel.companyId);
       formData.append("position", self.queryModel.position);
 
+      formData.append("subordinate", self.queryModel.subordinate);
+      formData.append("distinct", self.queryModel.distinct);
+
       personDeviceLogApi.exportXls(formData).then(function(response) {
         var jsonData = response.data;
         self.downloadLoading = false;
@@ -300,7 +337,7 @@ export default {
 
       //获取三天前时间
       var startMonth = month;
-      if(startDate.getDate() < 7){
+      if (startDate.getDate() < 7) {
         startMonth = startDate.getMonth();
         startDate.setDate(0);
       }
@@ -310,12 +347,7 @@ export default {
         date.getFullYear() + "-" + startMonth + "-" + startDate + " 00:00:00";
 
       var endTime =
-        date.getFullYear() +
-        "-" +
-        month +
-        "-" +
-        date.getDate() +
-        " 23:59:59";
+        date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59";
 
       self.queryModel.timeRanges = [startTime, endTime];
     }

src/views/base/personDeviceRelation-BoundList.vue

@@ -150,7 +150,7 @@ export default {
     },
     handleDelete(record) {
       var self = this;
-      this.$confirm("是否绑定？", "提示", {
+      this.$confirm("是否解除绑定？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -182,7 +182,7 @@ export default {
     handleRemoveAll() {
       var self = this;
 
-      this.$confirm("是否绑定？", "提示", {
+      this.$confirm("是否解除绑定？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",