Merge branch 'master' of http://47.92.161.104:10080/zq/jp-housekeeper-portal

src/api/base/personInfo.js

@@ -134,9 +134,19 @@ function enabledSyncList(ids) {
   });
 }
 
+function bindWechat(userId) {
+  var formData = new FormData();
+
+  formData.append("expire_seconds", "3600");
+  formData.append("action_name", "QR_STR_SCENE");
+  formData.append("scene_str", process.env.VUE_APP_BIND_PERSON_WECHAT_CODE + "," + userId);
+
+  return request.post(constant.serverUrl + "/wechat/qrcode/create", formData);
+}
+
 export default {
   pageList, create, edit, add, update, remove, batchRemove, exportXls,
   enabledFace, enabledCard, enabledApp, enabledGuest, dataSync, enabledFaceList,
   enabledWechatNotice, unbindWechat, lifeRecordList, clearFaceImg, batchClearFaceImg,
-  enabledSync, enabledSyncList
+  enabledSync, enabledSyncList, bindWechat
 }

src/views/Home.vue

@@ -8,7 +8,7 @@
     </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">
+      <el-button style="font-size:24px" type="primary" @click="openView">
         健康
         <br />公示
       </el-button>

src/views/Login.vue

@@ -40,7 +40,7 @@
             style="width:100%;margin-bottom:30px;"
             :loading="loading"
             @click.native.prevent="handleLogin"
-            class="green-btn"
+            class="blue-btn"
           >登录</el-button>
         </el-form>
       </el-card>
@@ -243,5 +243,9 @@ $text_color: black;
     background-color:#64a63c;
     border-color: #64a63c;
   }
+  .blue-btn{
+    background-color:#3385FF;
+    border-color: #3385FF;
+  }
 }
 </style>

src/views/base/alarmConfig-detail.vue

@@ -28,8 +28,7 @@
           <el-select-tree
             :props="props"
             :options="companyResult"
-            :value="formModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="formModel.companyId"
             height="200"
           ></el-select-tree>
         </el-form-item>
@@ -52,6 +51,9 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <!-- <el-checkbox-group v-model="formModel.weekdays" size="small">
+              <el-checkbox-button v-for="item in options" :label="item.value" :key="item.value">{{item.label}}</el-checkbox-button>
+            </el-checkbox-group> -->
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-time-picker
@@ -204,10 +206,11 @@ export default {
         if (valid) {
           (function() {
             var id = self.formModel.id;
-
-            var weekdays = self.formModel.weekdays.join(",");
-            self.formModel.weekdays = weekdays;
             self.loading = true;
+            if (self.formModel.weekdays != null) {
+                var weekdays = self.formModel.weekdays.join(",");
+                self.formModel.weekdays = weekdays;
+            }
 
             if (self.formModel.companyId == null) {
               self.formModel.companyId = "";

src/views/base/alarmConfig-list.vue

@@ -33,8 +33,7 @@
           :props="props"
           aria-setsize="mini"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>
       </el-form-item>

src/views/base/companyInfo-detail.vue

@@ -53,8 +53,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.parentId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.parentId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/companyInfo-list.vue

@@ -33,8 +33,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.parentId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.parentId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/devicePerson-list.vue

@@ -71,8 +71,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="queryModel.parentId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.parentId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/personDeviceLog-list.vue

@@ -61,8 +61,7 @@
           <el-select-tree
             :props="props"
             :options="companyResult"
-            :value="queryModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.companyId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/personInfo-detail.vue

@@ -26,8 +26,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.companyId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.companyId"
                 height="200"
               ></el-select-tree>
             </el-form-item>
@@ -47,8 +46,7 @@
               <el-select-tree
                 :props="props"
                 :options="parkList"
-                :value="formModel.parkId"
-                @getValue="getSelectedParkValue($event)"
+                v-model="formModel.parkId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/punchLocation-detail.vue

@@ -20,8 +20,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="formModel.companyId"
-            @getValue="getSelectedValue($event)"
+            v-model="formModel.companyId"
             height="200"
           ></el-select-tree>
         </el-form-item>

src/views/base/punchLocation-list.vue

@@ -19,8 +19,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/temperatureRecord-list.vue

@@ -20,8 +20,7 @@
             size="mini"
             :props="props"
             :options="companyResult"
-            :value="queryModel.parentId"
-            @getValue="getSelectedValue($event)"
+            v-model="queryModel.parentId"
             height="200"
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/base/warningPusher-detail.vue

@@ -34,8 +34,7 @@
               <el-select-tree
                 :props="props"
                 :options="companyResult"
-                :value="formModel.companyId"
-                @getValue="getSelectedValue($event)"
+                v-model="formModel.companyId"
                 height="200"
               ></el-select-tree>
             </el-form-item>

src/views/base/warningPusher-list.vue

@@ -32,8 +32,7 @@
         <el-select-tree
           :props="props"
           :options="companyResult"
-          :value="queryModel.companyId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.companyId"
           height="200"
         ></el-select-tree>
       </el-form-item>

src/views/business/fillAttendance-list.vue

@@ -22,8 +22,7 @@
           size="mini"
           :props="props"
           :options="companyResult"
-          :value="queryModel.parentId"
-          @getValue="getSelectedValue($event)"
+          v-model="queryModel.parentId"
           height="200"
         ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>

src/views/business/workAttendance-list.vue

@@ -44,8 +44,7 @@
             <el-select-tree
               :props="props"
               :options="companyResult"
-              :value="queryModel.companyId"
-              @getValue="getSelectedValue($event)"
+              v-model="queryModel.companyId"
               height="200"
             ></el-select-tree>
           </el-form-item>