Explorar o código

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

yanliming %!s(int64=5) %!d(string=hai) anos
pai
achega
342e6308ae

+ 2 - 2
.env.production

@@ -3,13 +3,13 @@ OUT_PUT_DIR=dist/xpgj-admin
 VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
 
 #手机企业版
-VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=https://xpgjapi.xiaoxinda.com/healthPublicity
 
 #手机校园版
 VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
 
 #大屏企业版
-VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+VUE_APP_COMPANY_HEALTH_QY_URL=https://xpgjapi.xiaoxinda.com/healthPublicity
 
 #大屏校园版
 VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

+ 2 - 2
.env.test

@@ -4,13 +4,13 @@ OUT_PUT_DIR=dist/jp-housekeeper-portal
 VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 
 #手机企业版
-VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
+VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/healthPublicity
 
 #手机校园版
 VUE_APP_COMPANY_HEALTH_WECHAT_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd.html
 
 #大屏企业版
-VUE_APP_COMPANY_HEALTH_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
+VUE_APP_COMPANY_HEALTH_QY_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/healthPublicity
 
 #大屏校园版
 VUE_APP_COMPANY_HEALTH_XY_URL=http://wisdomhousewechat.sudaonline.net/prevention-xxd/motemwall_xxd_pc.html

+ 7 - 7
src/api/base/watchInfo.js

@@ -2,19 +2,19 @@ import request from '@/utils/request'
 import constant from '@/constant'
 
 function pageList(formData){
-  return request.post(constant.serverUrl + "/base/watch/pageList", formData);
+  return request.post(constant.serverUrl + "/base/watchInfo/pageList", formData);
 }
 
 function create(){
-  return request.get(constant.serverUrl + "/base/watch/create");
+  return request.get(constant.serverUrl + "/base/watchInfo/create");
 }
 
 function edit(id){
-  return request.get(constant.serverUrl + "/base/watch/edit/" + id);
+  return request.get(constant.serverUrl + "/base/watchInfo/edit/" + id);
 }
 
 function add(formModel){
-  return request.post(constant.serverUrl + "/base/watch/add", formModel,{
+  return request.post(constant.serverUrl + "/base/watchInfo/add", formModel,{
     headers: {
       "Content-Type": "application/json"
     }
@@ -22,7 +22,7 @@ function add(formModel){
 }
 
 function update(formModel){  
-  return request.post(constant.serverUrl + "/base/watch/update", formModel,{
+  return request.post(constant.serverUrl + "/base/watchInfo/update", formModel,{
     headers: {
       "Content-Type": "application/json"
     }
@@ -30,11 +30,11 @@ function update(formModel){
 }
 
 function remove(id){
-  return request.post(constant.serverUrl + "/base/watch/delete/" + id);
+  return request.post(constant.serverUrl + "/base/watchInfo/delete/" + id);
 }
 
 function batchRemove(idList){
-  return request.post(constant.serverUrl + "/base/watch/batchDelete",idList,{
+  return request.post(constant.serverUrl + "/base/watchInfo/batchDelete",idList,{
     headers: {
       "Content-Type": "application/json"
     }

+ 46 - 0
src/api/base/watchMeasure.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/watchMeasure/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/watchMeasure/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/watchMeasure/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/watchMeasure/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/watchMeasure/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/watchMeasure/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/watchMeasure/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

+ 12 - 0
src/routers/modules/base.js

@@ -413,6 +413,18 @@ var routers = [
                         title: '老人手表管理'
                 }
         },
+        {
+                path: '/base/watchMeasure/list',
+                name: 'baseWatchMeasureList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/base/watchMeasure-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '手表消息管理'
+                }
+        },
         {
                 path: '/base/message/list',
                 name: 'baseMessageList',

+ 10 - 0
src/views/base/watchInfo-detail.vue

@@ -35,6 +35,13 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
+        <el-form-item label="绑定人员" prop="personId">
+          <el-input
+            v-model="formModel.personId"
+            placeholder="请输入绑定人员编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="紧急联系人号码" prop="sos1">
           <el-input
             v-model="formModel.sos1"
@@ -123,6 +130,9 @@ export default {
         ],
         aliasName: [
           { required: true, message: "设备别名不能为空", trigger: "blur" },
+        ],
+        personId: [
+          { required: true, message: "绑定人员不能为空", trigger: "blur" },
         ]
       },
       showDialog: true,

+ 10 - 25
src/views/base/watchInfo-list.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">基础数据</a>
+        <a href="#">养老院管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
         <a href="/base/watchInfo">老人手表管理</a>
@@ -19,18 +19,13 @@
       class="demo-form-inline"
     >
       <el-form-item label="设备编号" prop="deviceNo">
-        <el-input
-          type="text"
-          size="mini"
-          v-model="queryModel.deviceNo"
-        ></el-input>
+        <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-input type="text" size="mini" v-model="queryModel.aliasName" ></el-input>
+      </el-form-item>
+      <el-form-item label="绑定人员" prop="personId">
+        <el-input type="text" size="mini" v-model="queryModel.personId" ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -79,20 +74,9 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column
-        prop="deviceNo"
-        sort-by="device_no"
-        label="设备编号"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="aliasName"
-        sort-by="alias_name"
-        label="设备别名"
-        sortable="custom"
-        width="180"
-      ></el-table-column>
+      <el-table-column prop="deviceNo" sort-by="device_no" label="设备编号" sortable="custom" width="180" ></el-table-column>
+      <el-table-column prop="aliasName" sort-by="alias_name" label="设备别名" sortable="custom" width="180" ></el-table-column>
+      <el-table-column prop="personId" sort-by="person_id" label="绑定人员" sortable="custom" width="180" ></el-table-column>
       <el-table-column
         prop="heartBeatUpdateTime"
         sort-by="heart_beat_update_time"
@@ -250,6 +234,7 @@ export default {
 
       formData.append("deviceNo", self.queryModel.deviceNo);
       formData.append("aliasName", self.queryModel.aliasName);
+      formData.append("personId", self.queryModel.personId);
 
       if (this.field != null) {
         formData.append("field", this.field);

+ 329 - 0
src/views/base/watchMeasure-list.vue

@@ -0,0 +1,329 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">养老院管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/watchMeasure">手表消息管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用,必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <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="name">
+        <!-- <el-input type="text" size="mini" v-model="queryModel.name"></el-input> -->
+        <el-select v-model="queryModel.name" size="mini" style="width:100px;" clearable>
+          <el-option v-for="(item,index) in nameList"  :label="item.name" :value="item.value" :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        prop="deviceNo"
+        label="设备编号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="nameN"
+        label="测量项目"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="value"
+        label="测量值"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="recordTime"
+        label="测量时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="180"
+      ></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>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <!-- <watchMeasure-detail
+	v-if="showModal"
+	:businessKey="businessKey"
+	:title="modalTitle"
+	@close="onDetailModalClose"
+	></watchMeasure-detail> -->
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+// import WatchMeasureDetail from "./watchMeasure-detail";
+import watchMeasureApi from "@/api/base/watchMeasure";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: 'baseWatchMeasureList',
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        deviceNo: "",
+        name: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      nameList: [],
+    };
+  },
+  created() {
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "老人手表测量项目"
+    }).then(response => {
+      var jsonData = response.data;
+      this.nameList = jsonData.data;
+    });
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("deviceNo", self.queryModel.deviceNo);
+      formData.append("name", self.queryModel.name);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      watchMeasureApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order == "ascending" ? "asc" : "desc";
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          watchMeasureApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        watchMeasureApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    // "watchMeasure-detail": WatchMeasureDetail
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>