.env.development

@@ -3,5 +3,9 @@ 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_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+#手机版
+VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+#企业版
+VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+#校园版
+VUE_APP_COMPANY_HEALTH_XXD_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

.env.production

@@ -1,5 +1,9 @@
 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_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html
+#手机版
+VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+#企业版
+VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+#校园版
+VUE_APP_COMPANY_HEALTH_XXD_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

src/views/Home.vue

@@ -182,7 +182,7 @@ export default {
     openView() {
       var companyId = this.user.companyId;
       var qrtext =
-        process.env.VUE_APP_COMPANY_HEALTH_PC_URL +
+        process.env.VUE_APP_COMPANY_HEALTH_QY_URL +
         "?companyId=" +
         companyId;
       window.open(qrtext);

src/views/base/companyDeviceRelation-list.vue

@@ -13,6 +13,29 @@
       <!--
       要resetFields起作用，必须配置:model和prop
       -->
+      <el-form
+        ref="queryForm"
+        :model="queryModel"
+        inline
+        class="demo-form-inline"
+        label-width="100px"
+      >
+        <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="deviceName">
+          <el-input type="text" size="mini" v-model="queryModel.deviceName" ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="ios-search"
+            @click="changePage(1)"
+            :loading="loading"
+          >查询</el-button>&nbsp;
+        </el-form-item>
+      </el-form>
       <el-divider></el-divider>
       <el-row class="button-group">
         <el-button
@@ -33,18 +56,18 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" :selectable="disableSelect" width="55"></el-table-column>
-        <el-table-column prop="device.deviceNo" label="设备编号" width="220"></el-table-column>
-        <el-table-column prop="device.aliasName" label="设备名称" width="180"></el-table-column>
-        <el-table-column prop="device.typeN" label="类型" width="120"></el-table-column>
-        <el-table-column prop="bound" label="绑定状态" width="120">
-          <template slot-scope="{row}">{{row.bound ? "已绑定" : "未绑定"}}</template>
+        <el-table-column prop="deviceNo" label="设备编号" width="220"></el-table-column>
+        <el-table-column prop="aliasName" label="设备名称" width="180"></el-table-column>
+        <el-table-column prop="isBind" label="类型" width="120"></el-table-column>
+        <el-table-column prop="isBind" label="绑定状态" width="120">
+          <template slot-scope="{row}">{{row.isBind == 0? "未绑定" : "已绑定"}}</template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="{row}">
-            <span v-if="!row.bound">
+            <span v-if="row.isBind == 0">
               <el-button size="mini" type="success" @click="handleBound(row)">绑定设备</el-button>
             </span>
-            <span v-if="row.bound">
+            <span v-else>
               <el-button size="mini" type="danger" @click="handleUnBound(row)">解除绑定</el-button>
             </span>
           </template>
@@ -83,6 +106,11 @@ export default {
 
     return {
       formModel: {},
+      queryModel: {
+        deviceNo: "",
+        deviceName: "",
+        personId: ""
+      },
       tableData: [],
       pageIndex: 1,
       pageSize: 10,
@@ -123,6 +151,9 @@ export default {
 
       formData.append("companyId", self.companyId);
 
+      formData.append("deviceNo", self.queryModel.deviceNo);
+      formData.append("deviceName", self.queryModel.deviceName);
+
       if (this.field != null) {
         formData.append("field", this.field);
       }
@@ -167,7 +198,7 @@ export default {
       var self = this;
 
       var idList = this.multipleSelection.map(record => {
-        return record.device.id;
+        return record.id;
       });
 
       this.$confirm("是否绑定?", "提示", "warning").then(result => {
@@ -210,7 +241,7 @@ export default {
           self.loading = true;
           var formData = new FormData();
           formData.append("companyId", self.companyId);
-          formData.append("deviceIds", record.device.id);
+          formData.append("deviceIds", record.id);
           return companyInfoApi.bindDevice(formData).then(function(response) {
             self.loading = false;
 
@@ -244,7 +275,7 @@ export default {
         self.loading = true;
         var formData = new FormData();
         formData.append("companyId", self.companyId);
-        formData.append("deviceIds", record.device.id);
+        formData.append("deviceIds", record.id);
         return companyInfoApi.unbindDevice(formData).then(function(response) {
           self.loading = false;
           var jsonData = response.data;

src/views/base/companyInfo-detail.vue

@@ -45,6 +45,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位性质" prop="type">
+              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:280px">
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -120,6 +132,7 @@
 <script>
 import Constant from "@/constant";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import { getToken } from "@/utils/auth"; // get token from cookie
 
 export default {
@@ -128,7 +141,10 @@ export default {
     return {
       formModel: {},
       ruleValidate: {
-        name: [{ required: true, message: "单位名称不能为空", trigger: "blur" }]
+        name: [
+          { required: true, message: "单位名称不能为空", trigger: "blur" }
+        ],
+        type: [{ required: true, message: "性质不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,
@@ -142,7 +158,8 @@ export default {
       headers: {
         Authorization: getToken()
       },
-      companyResult: ""
+      companyResult: "",
+      typeData: []
     };
   },
   created() {
@@ -153,6 +170,13 @@ export default {
         self.companyResult = jsonData.data;
       }
     });
+
+    var formData = new FormData();
+    formData.append("catalogName", "单位性质");
+    return dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.typeData = jsonData.data;
+    });
   },
   methods: {
     closeDialog() {

src/views/base/companyInfo-list.vue

@@ -69,13 +69,14 @@
       </el-table-column>-->
       <el-table-column prop="parentName" label="上级单位" width="230"></el-table-column>
       <el-table-column prop="name" label="单位名称" width="230"></el-table-column>
+      <el-table-column prop="typeN" label="性质" width="80"></el-table-column>
       <!-- <el-table-column prop="position1Name" label="一级位置" width="180"></el-table-column>
       <el-table-column prop="position2Name" label="二级位置" width="180"></el-table-column>
       <el-table-column prop="position3Name" label="三级位置" width="180"></el-table-column>
       <el-table-column prop="position4Name" label="四级位置" width="180"></el-table-column>
       <el-table-column prop="position5Name" label="五级位置" width="180"></el-table-column>-->
       <el-table-column prop="remark" sort-by="remark_" width="350" label="备注"></el-table-column>
-      <el-table-column label="操作" width="290">
+      <el-table-column label="操作" width="350">
         <template slot-scope="{row}">
           <el-row>
             <el-col>
@@ -91,7 +92,10 @@
               >
                 <div :id="row.id" ref="qrCodeDiv"></div>
                 <el-link type="primary" :underline="false" slot="reference">健康公示二维码</el-link>
-              </el-popover>
+              </el-popover>-
+              <span v-if="row.type != null && row.type != ''">
+                <el-link type="primary" :underline="false" @click="openDP(row)">大屏网址</el-link>
+              </span>
             </el-col>
           </el-row>
         </template>
@@ -289,7 +293,10 @@ export default {
     openQRCode(record) {
       document.getElementById(record.id).innerHTML = "";
       var self = this;
-      var qrtext = process.env.VUE_APP_COMPANY_HEALTH_WECHAT_URL + "?companyId=" + record.id;
+      var qrtext =
+        process.env.VUE_APP_COMPANY_HEALTH_WECHAT_URL +
+        "?companyId=" +
+        record.id;
       var qr = new QRCode(record.id, {
         text: qrtext,
         width: 300,
@@ -301,6 +308,27 @@ export default {
     },
     closeQRCode(record) {
       document.getElementById(record.id).innerHTML = "";
+    },
+    openDP(record) {
+      var companyId = record.id;
+      var type = record.type;
+      var dpUrl = "";
+      if ("1" == type) {
+        //企业版
+        dpUrl =
+          process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+      } else if ("2" == type) {
+        //校园版
+        dpUrl =
+          process.env.VUE_APP_COMPANY_HEALTH_XXD_URL +
+          "?companyId=" +
+          companyId;
+      } else {
+        //企业版
+        dpUrl =
+          process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+      }
+      window.open(dpUrl);
     }
   },
   mounted: function() {

src/views/base/personDeviceRelation-BoundList.vue

@@ -35,14 +35,30 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="deviceInfo.aliasName" label="设备名称" width="220"></el-table-column>
         <el-table-column prop="personInfo.name" label="人员名称" width="120"></el-table-column>
+        <el-table-column prop="deviceInfo.isOnline" label="运行状态" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.deviceInfo.isOnline"
+              style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
+            ></div>
+            <div
+              v-if="!row.deviceInfo.isOnline"
+              style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
+            ></div>
+          </template>
+        </el-table-column>
         <el-table-column prop="isWrite" label="照片是否存在" width="120">
           <template slot-scope="{row}">
             <div
-              v-if="row.isWrite"
+              v-if="!row.deviceInfo.isOnline"
+              style="border-radius: 30px;background-color:#767676;width:20px;height:20px;"
+            ></div>
+            <div
+              v-if="row.deviceInfo.isOnline && row.isWrite"
               style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
             ></div>
             <div
-              v-if="!row.isWrite"
+              v-if="row.deviceInfo.isOnline &&!row.isWrite"
               style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
             ></div>
           </template>
@@ -135,6 +151,7 @@ export default {
           self.loading = false;
 
           var jsonData = response.data.data;
+          console.log(jsonData.data);
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;

src/views/base/personDeviceRelation-list.vue

@@ -22,10 +22,10 @@
         label-width="100px"
       >
         <el-form-item label="设备编号" prop="deviceNo">
-          <el-input type="text" size="mini" v-model="queryModel.deviceNo" style="width:120px;"></el-input>
+          <el-input type="text" size="mini" v-model="queryModel.deviceNo"></el-input>
         </el-form-item>
         <el-form-item label="设备名称" prop="deviceName">
-          <el-input type="text" size="mini" v-model="queryModel.deviceName" style="width:120px;"></el-input>
+          <el-input type="text" size="mini" v-model="queryModel.deviceName" ></el-input>
         </el-form-item>
         <el-form-item>
           <el-button
@@ -79,11 +79,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="isBindPerson" label="绑定状态" width="120">
-          <template slot-scope="{row}">{{row.isBindPerson ? "已绑定" : "未绑定"}}</template>
+          <template slot-scope="{row}">{{row.isBind == 0? "未绑定" : "已绑定"}}</template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="{row}">
-            <span v-if="!row.isBindPerson">
+            <span v-if="row.isBind == 0">
               <el-button size="mini" type="success" @click="handleBound(row)">绑定设备</el-button>
             </span>
             <!-- <span v-else>