Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

src/views/base/warningPusher-detail.vue

@@ -32,17 +32,31 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>          
           <el-col :span="12">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="formModel.name" placeholder="请输入姓名"></el-input>
+            <el-form-item label="现有人员查询">
+              <el-select
+                  v-model="selectedPerson"
+                  filterable
+                  remote
+                  placeholder="请输入人员姓名"
+                  :remote-method="queryPersonList"
+                  @change="selectPerson"
+                  :loading="loading">
+                <el-option
+                  v-for="person in personList"
+                  :key="person.id"
+                  :label="person.name + '-' + person.phone"
+                  :value="person">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="openid" prop="name">
-              <el-input v-model="formModel.openId" placeholder="请输入openid"></el-input>
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="formModel.name" placeholder="请输入姓名"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -51,6 +65,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="openid" prop="name">
+              <el-input v-model="formModel.openId" placeholder="请输入openid"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -75,6 +96,14 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">            
+            <el-form-item label="未测温提醒" prop="missingNoticeEnabled">
+              <el-radio v-model="formModel.missingNoticeEnabled" :label="true">开</el-radio>
+              <el-radio v-model="formModel.missingNoticeEnabled" :label="false">关</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -86,6 +115,7 @@
 <script>
 import Constant from "@/constant";
 import warningPusherApi from "@/api/base/warningPusher";
+import personInfoApi from "@/api/base/personInfo";
 
 export default {
   props: ["businessKey", "title", "companyResult"],
@@ -136,7 +166,9 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      canQuery: true
+      canQuery: true,
+      personList:[],
+      selectedPerson: {}
     };
   },
   methods: {
@@ -177,6 +209,29 @@ export default {
           });
         }
       });
+    },
+    queryPersonList(query){
+      var formData = new FormData();
+      formData.append("companyId", this.formModel.companyId);
+      formData.append("name", query);
+
+      formData.append("pageIndex", 1);
+      formData.append("pageSize", 20);
+
+      personInfoApi
+        .pageList(formData)
+        .then(response=>{
+           var jsonData = response.data;
+
+           if(jsonData.result){
+             this.personList = jsonData.data.data;
+           }
+        });
+    },
+    selectPerson(){
+      this.formModel.name = this.selectedPerson.name;
+      this.formModel.phone = this.selectedPerson.phone;
+      this.formModel.openId = this.selectedPerson.openId;
     }
   },
   mounted: function() {

src/views/base/warningPusher-list.vue

@@ -79,12 +79,17 @@
       <el-table-column prop="phone" label="手机号" width="120"></el-table-column>
       <el-table-column prop="companyName" label="单位" width="120"></el-table-column>
       <el-table-column prop="temperature" label="预警触发温度" width="120"></el-table-column>
-      <el-table-column prop="times" label="上报触发次数" width="120"></el-table-column>
+      <el-table-column prop="times" label="上报触发次数" width="120"></el-table-column>      
       <el-table-column prop="openId" label="是否绑定公众号" width="120">
         <template slot-scope="{row}">{{row.openId == null ? "否" : "是"}}</template>
       </el-table-column>
+      <el-table-column prop="missingNoticeEnabled" label="未测温提醒" width="120">
+        <template slot-scope="{row}">
+          <el-switch v-model="row.missingNoticeEnabled" @change="changeMissingNoticeEnabled(row)"/>
+        </template>
+      </el-table-column>
       <el-table-column prop="openId" label="open_id" width="280"></el-table-column>
-      <el-table-column label="操作" width="200">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="{row}">
           <el-row>
             <el-col>
@@ -313,6 +318,9 @@ export default {
     handleHideWechat(record) {
       var self = this;
       self.qrcodeImg = "";
+    },
+    changeMissingNoticeEnabled(row){
+      warningPusherApi.update(row);
     }
   },
   mounted: function() {