فهرست منبع

1.居家养老增加新增手表紧急联系人、手表通讯录。
2.居家养老运动步数改为按天查看每日步数。

zhengqiang 5 سال پیش
والد
کامیت
c5922cab92
4فایلهای تغییر یافته به همراه48 افزوده شده و 25 حذف شده
  1. 6 1
      src/api/base/watchInfo.js
  2. 3 2
      src/views/base/deviceInfo-list.vue
  3. 4 4
      src/views/base/watchInfo-detail.vue
  4. 35 18
      src/views/base/watchInfo-list.vue

+ 6 - 1
src/api/base/watchInfo.js

@@ -41,6 +41,11 @@ function batchRemove(idList){
   });
 }
 
+function remoteConfig(id){
+  return request.get(constant.serverUrl + "/base/watchInfo/remoteConfig/" + id);
+}
+
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,remoteConfig
 }

+ 3 - 2
src/views/base/deviceInfo-list.vue

@@ -158,8 +158,9 @@
       <el-table-column prop="manufacturerN" label="设备厂家"></el-table-column>
       <el-table-column prop="heartbeatUpdateTime" sort-by="a.heartbeat_update_time"
         sortable="custom" label="心跳更新时间" width="160"></el-table-column>
-        <el-table-column prop="remoteOpenStartTime" label="远程开门开始时间"></el-table-column>
-        <el-table-column prop="remoteOpenEndTime" label="远程开门结束时间"></el-table-column>
+      <el-table-column prop="updateTime" label="记录更新时间" width="160"></el-table-column>
+      <el-table-column prop="remoteOpenStartTime" label="远程开门开始时间"></el-table-column>
+      <el-table-column prop="remoteOpenEndTime" label="远程开门结束时间"></el-table-column>
       <el-table-column label="照片库" width="120">
         <template slot-scope="{row}">
           <el-link 

+ 4 - 4
src/views/base/watchInfo-detail.vue

@@ -44,27 +44,27 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="紧急联系人号码" prop="sos1">
+        <!-- <el-form-item label="紧急联系人号码1" prop="sos1">
           <el-input
             v-model="formModel.sos1"
             placeholder="请输入紧急联系人号码"
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="紧急联系人号码" prop="sos2">
+        <el-form-item label="紧急联系人号码2" prop="sos2">
           <el-input
             v-model="formModel.sos2"
             placeholder="请输入紧急联系人号码"
             style="width: 300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="紧急联系人号码" prop="sos3">
+        <el-form-item label="紧急联系人号码3" prop="sos3">
           <el-input
             v-model="formModel.sos3"
             placeholder="请输入紧急联系人号码"
             style="width: 300px"
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="计步器开关" prop="stepSwitch">
           <div style="width:300px;">
            <el-switch

+ 35 - 18
src/views/base/watchInfo-list.vue

@@ -84,34 +84,33 @@
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="isOnline"
-        sort-by="is_online"
-        label="运行状态"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
-      <el-table-column
+      <el-table-column prop="isOnline" label="在线状态" width="100">
+        <template slot-scope="{row}">
+          <span v-if="row.isOnline" style="color:green;">在线</span>
+          <span v-else>不在线</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
         prop="sos1"
         sort-by="sos1"
-        label="紧急联系人号码"
+        label="紧急联系人1号码"
         sortable="custom"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="sos2"
         sort-by="sos2"
-        label="紧急联系人号码"
+        label="紧急联系人2号码"
         sortable="custom"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="sos3"
         sort-by="sos3"
-        label="紧急联系人号码"
+        label="紧急联系人3号码"
         sortable="custom"
         width="180"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column
         prop="stepSwitch"
         sort-by="step_switch"
@@ -163,12 +162,9 @@
       ></el-table-column>
       <el-table-column label="操作" fixed="right" width="200">
         <template slot-scope="{row}">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
-            >编辑</el-button
-          >
-          <el-button size="mini" type="danger" @click="handleDelete(row)"
-            >删除</el-button
-          >
+          <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
+          <el-link type="primary" :underline="false" @click="handleRemoteConfig(row)" :disabled="!row.isOnline">同步</el-link>-
+          <el-link type="primary" :underline="false" @click="handleDelete(row)">删除</el-link>
         </template>
       </el-table-column>
     </el-table>
@@ -341,6 +337,27 @@ export default {
         });
       });
     },
+    handleRemoteConfig(row) {
+      var self = this;
+
+      baseWatchInfoApi.remoteConfig(row.id)
+      .then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.$message({
+              type: "success",
+              message: "指令发送成功!"
+            });
+          }
+          else{
+            self.$message({
+              type: "warning",
+              message: jsonData.message
+            });
+          }
+        });
+    },
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;