预警上报人员管理

src/api/base/warningPusher.js

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

src/routers/modules/base.js

@@ -235,6 +235,18 @@ var routers = [
                         roles: ["admin"]
                 }
         },
+        {
+                //检测预警上报人员管理
+                path: '/base/warningPusher/list',
+                name: 'base-warningPusher-list',
+                // 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/warningPusher-list.vue'),
+                meta: {
+                        roles: ["admin"]
+                }
+        }
 ]
 
 export default routers;

src/views/base/personInfo-list.vue

@@ -161,8 +161,8 @@
       </el-table-column>
       <el-table-column prop="companyName" label="单位" width="250"></el-table-column>
       <el-table-column prop="phone" label="手机号" width="180"></el-table-column>
-      <el-table-column prop="idCard" label="身份证" width="100" :show-overflow-tooltip="false"></el-table-column>
-      <el-table-column prop="deviceName" label="绑定设备" width="150" :show-overflow-tooltip="false"></el-table-column>
+      <el-table-column prop="idCard" label="身份证" width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="deviceName" label="绑定设备" width="150" show-overflow-tooltip></el-table-column>
       <el-table-column prop="position1" :label="position1" width="250" v-if="position1Show"></el-table-column>
       <el-table-column prop="position2" :label="position2" width="250" v-if="position2Show"></el-table-column>
       <el-table-column prop="position3" :label="position3" width="250" v-if="position3Show"></el-table-column>

src/views/base/warningPusher-detail.vue

@@ -0,0 +1,241 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align:left;"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="companyId">
+              <el-select
+                v-model="formModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width:280px"
+              >
+                <el-option
+                  v-for="company in companyResult"
+                  :key="company.id"
+                  :label="company.name"
+                  :value="company.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="ip地址" prop="ipAddress">
+              <el-input
+                v-model="formModel.ipAddress"
+                @blur="queryDeviceNo"
+                placeholder="请输入ip地址"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="端口" prop="port">
+              <el-input
+                v-model="formModel.port"
+                @blur="queryDeviceNo"
+                placeholder="请输入端口"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="deviceNo">
+              <el-input v-model="formModel.deviceNo" placeholder="请输入设备编号" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备别名" prop="aliasName">
+              <el-input v-model="formModel.aliasName" placeholder="请输入设备别名" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="运行状态" prop="isOnline">
+              <el-select v-model="formModel.isOnline" filterable style="width:200px">
+                <el-option :key="true" label="在线" :value="true"></el-option>
+                <el-option :key="false" label="离线" :value="false"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开锁密码" prop="unlockPassword">
+              <el-input
+                v-model="formModel.unlockPassword"
+                placeholder="请输入开锁密码"
+                style="width:200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="formModel.type" filterable placeholder="请选择" style="width:200px">
+                <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-col :span="12">
+            <el-form-item label="二维码地址" prop="codeAddress">
+              <el-input v-model="formModel.codeAddress" placeholder="请输入二维码地址" style="width:200px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import deviceInfoApi from "@/api/base/deviceInfo";
+
+export default {
+  props: ["businessKey", "title", "typeData", "companyResult"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        aliasName: [
+          { required: true, message: "设备别名不能为空", trigger: "blur" }
+        ],
+        isOnline: [
+          {
+            required: true,
+            message: "运行状态不能为空",
+            trigger: "blur"
+          }
+        ],
+        // unlockPassword: [
+        //   { required: true, message: "开锁密码不能为空", trigger: "blur" }
+        // ],
+        // codeAddress: [
+        //   { required: true, message: "二维码地址不能为空", trigger: "blur" }
+        // ],
+        ipAddress: [
+          { required: true, message: "ip地址不能为空", trigger: "blur" }
+        ],
+        port: [{ required: true, message: "端口不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "类型不能为空", trigger: "blur" }]
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      canQuery: true
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          (function() {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return deviceInfoApi.add(self.formModel);
+            } else {
+              return deviceInfoApi.update(self.formModel);
+            }
+          })().then(function(response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+
+              //self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    queryDeviceNo() {
+      var self = this;
+      if (self.canQuery) {
+        self.canQuery = false;
+        var formData = new FormData();
+        formData.append("ipAddress", self.formModel.ipAddress);
+        formData.append("port", self.formModel.port);
+        deviceInfoApi.getByIpAddressAndPort(formData).then(function(response) {
+          var jsonData = response.data;
+          setTimeout(() => {
+            self.canQuery = true;
+            //延迟1秒
+          }, 1000);
+          if (jsonData.result) {
+            if (jsonData.data != null) {
+              let deviceNo = jsonData.data.deviceNo;
+              self.formModel.deviceNo = deviceNo;
+            }
+          }
+        });
+      }
+    }
+  },
+  mounted: function() {
+    var self = this;
+    (function() {
+      if (self.businessKey.length == 0) {
+        return deviceInfoApi.create();
+      } else {
+        return deviceInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch(error => {
+        self.$message.error(error + "");
+      });
+  }
+};
+</script>

src/views/base/warningPusher-list.vue

@@ -0,0 +1,328 @@
+<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="/warningPusher">预警上报人员管理</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="companyId">
+        <el-select
+          v-model="queryModel.companyId"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:280px"
+        >
+          <el-option
+            v-for="company in companyResult"
+            :key="company.id"
+            :label="company.name"
+            :value="company.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input type="text" size="mini" v-model="queryModel.phone"></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-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-remove"
+        :disabled="multipleSelection.length==0"
+        @click="handleBatchDelete"
+      >删除选中项</el-button>
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height:400px;"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="100" fixed="left"></el-table-column>
+      <el-table-column prop="remark" label="备注" width="150"></el-table-column>
+      <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="openId" label="是否绑定公众号" width="120">
+        <template slot-scope="{row}">{{row.openId == null ? "否" : "是"}}</template>
+      </el-table-column>
+      <el-table-column prop="openId" label="微信OpenID" width="120"></el-table-column>
+      <el-table-column label="操作" width="200">
+        <template slot-scope="{row}">
+          <el-row>
+            <el-col>
+              <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
+              <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
+              <el-link type="primary" :underline="false" @click="handleBindWeChat(row)">绑定公众号</el-link>
+            </el-col>
+          </el-row>
+        </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>
+    <warningPusher-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      :typeData="typeData"
+      :companyResult="companyResult"
+      @close="onDetailModalClose"
+    ></warningPusher-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import WarningPusherDetail from "./warningPusher-detail";
+import warningPusherApi from "@/api/base/warningPusher";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import companyInfoApi from "@/api/base/companyInfo";
+
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        phone: "",
+        name: "",
+        companyId: ""
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      typeData: [],
+      companyResult: "",
+      tableHeight: ""
+    };
+  },
+  created() {
+    this.tableHeight = window.innerHeight - 280;
+
+    var formData = new FormData();
+    formData.append("catalogName", "设备类型");
+    return dataDictionaryApi.findByCatalogName(formData).then(response => {
+      var jsonData = response.data;
+      this.typeData = 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("name", self.queryModel.name);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("companyId", self.queryModel.companyId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      warningPusherApi
+        .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;
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      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(() => {
+          warningPusherApi.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(() => {
+        warningPusherApi.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);
+      }
+    },
+    handleBindWeChat(record) {
+      //二维码地址
+    }
+  },
+  mounted: function() {
+    var self = this;
+    this.changePage(1);
+    companyInfoApi.list().then(function(response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  components: {
+    "warningPusher-detail": WarningPusherDetail
+  }
+};
+</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>

src/views/layout/index.vue

@@ -10,7 +10,7 @@
     </el-header>
     <el-container>
       <el-aside :width="sidebarWidth" v-loading="loading" class="sidebar">
-        <div class="sidebar-collpase-btn" @click="collapse=!collapse">
+        <div class="sidebar-collpase-btn" @click="collapse=!collapse" style="cursor:pointer">
           <i :class="sidbarHandlerClass"></i>
         </div>
         <el-menu