设备等功能修改

src/api/base/personPopedom.js

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

src/views/base/devicePerson-list.vue

@@ -21,25 +21,6 @@
       class="demo-form-inline"
     >
       <div>
-        <el-form-item label="绑定设备名称" prop="deviceId">
-          <el-select
-            v-model="queryModel.deviceId"
-            size="mini"
-            filterable
-            clearable
-            remote
-            style="width:220px;"
-            placeholder="请输入关键词"
-            :remote-method="queryDevice"
-          >
-            <el-option
-              v-for="device in deviceResult"
-              :key="device.id"
-              :label="device.aliasName"
-              :value="device.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>
@@ -76,6 +57,25 @@
           ></el-select-tree>&nbsp;
           <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
         </el-form-item>
+        <el-form-item label="绑定设备名称" prop="deviceId">
+          <el-select
+            v-model="queryModel.deviceId"
+            size="mini"
+            filterable
+            clearable
+            remote
+            style="width:220px;"
+            placeholder="请输入关键词"
+            :remote-method="queryDevice"
+          >
+            <el-option
+              v-for="device in deviceResult"
+              :key="device.id"
+              :label="device.aliasName"
+              :value="device.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否上传照片" prop="isUploadPhoto">
           <el-select
             v-model="queryModel.isUploadPhoto"
@@ -103,7 +103,7 @@
           </el-select>
         </el-form-item>
       </div>
-      <div>
+      <!-- <div>
         <el-form-item v-if="position1Show" :label="position1" prop="position1">
           <el-input type="text" size="mini" v-model="queryModel.position1"></el-input>
         </el-form-item>
@@ -119,7 +119,7 @@
         <el-form-item v-if="position5Show" :label="position5" prop="position5">
           <el-input type="text" size="mini" v-model="queryModel.position5"></el-input>
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -314,7 +314,8 @@ export default {
 
     return {
       ruleValidate: {
-        deviceId: [{ required: true, message: "不能为空", trigger: "blur" }]
+        parentId: [{ required: true, message: "请选择单位", trigger: "blur" }],
+        deviceId: [{ required: true, message: "请选择设备", trigger: "blur" }]
       },
       queryModel: {
         companyCode: "",
@@ -419,6 +420,7 @@ export default {
     queryDevice(aliasName) {
       var self = this;
       var formData = new FormData();
+      formData.append("companyId", self.queryModel.parentId);
       formData.append("aliasName", aliasName);
       formData.append("limit", 10);
 

src/views/base/personInfo-list.vue

@@ -498,6 +498,12 @@
                   @click="handleDelete(row)"
                   >删除</el-link
                 >-
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="bindRole(row)"
+                  >角色管理</el-link
+                >-
                 <span v-if="row.faceBound">
                   <el-link
                     type="primary"
@@ -736,6 +742,11 @@
         <img :src="bindWechatUrl" style="width: 300px; fit-object: cover" />
       </div>
     </el-dialog>
+    <personPopedom-list
+      v-if="showRoleModal"
+      :personId="personId"
+      @close="onDetailModalClose"
+    ></personPopedom-list>
   </div>
 </template>
 <script>
@@ -743,6 +754,7 @@ import Constant from "@/constant";
 import PersonInfoDetail from "./personInfo-detail";
 import PersonDeviceRelationList from "./personDeviceRelation-list";
 import PersonDeviceRelationBoundList from "./personDeviceRelation-BoundList";
+import PersonPopedomList from "./personPopedom-list";
 
 import personInfoApi from "@/api/base/personInfo";
 import companyInfoApi from "@/api/base/companyInfo";
@@ -838,7 +850,8 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
-      parkList:[]
+      parkList:[],
+      showRoleModal:false
     };
   },
   created() {
@@ -1083,6 +1096,7 @@ export default {
       this.showModal = false;
       this.showDeviceModal = false;
       this.showBoundModal = false;
+      this.showRoleModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
@@ -1597,6 +1611,11 @@ export default {
           });
       });
     },
+    bindRole(record) {
+      //绑定设备
+      this.personId = record.id;
+      this.showRoleModal = true;
+    },
   },
   async mounted() {
     var self = this;
@@ -1610,6 +1629,7 @@ export default {
     "personDeviceRelation-BoundList": PersonDeviceRelationBoundList,
     "el-select-tree": SelectTree,
     "lifeRecord-list": LifeRecordList,
+    "personPopedom-list":PersonPopedomList
   },
 };
 </script>

src/views/base/personPopedom-detail.vue

@@ -0,0 +1,220 @@
+
+<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"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="" prop="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="对应公司id" prop="companyId">
+          <el-input
+            v-model="formModel.companyId"
+            placeholder="请输入对应公司id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="对应角色id" prop="personRoleId">
+          <el-input
+            v-model="formModel.personRoleId"
+            placeholder="请输入对应角色id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="人员id" prop="personId">
+          <el-input
+            v-model="formModel.personId"
+            placeholder="请输入人员id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="展示的图标id" prop="showIconId">
+          <el-input
+            v-model="formModel.showIconId"
+            placeholder="请输入展示的图标id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input
+            v-model="formModel.delFlag"
+            placeholder="请输入是否删除"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input
+            v-model="formModel.createBy"
+            placeholder="请输入创建人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input
+            v-model="formModel.createTime"
+            placeholder="请输入创建时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input
+            v-model="formModel.updateBy"
+            placeholder="请输入更新人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-input
+            v-model="formModel.updateTime"
+            placeholder="请输入更新时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </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 personPopedomApi from "@/api/base/personPopedom";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        companyId: [
+          { required: true, message: "对应公司id不能为空", trigger: "blur" },
+        ],
+        personRoleId: [
+          { required: true, message: "对应角色id不能为空", trigger: "blur" },
+        ],
+        personId: [
+          { required: true, message: "人员id不能为空", trigger: "blur" },
+        ],
+        showIconId: [
+          { required: true, message: "展示的图标id不能为空", trigger: "blur" },
+        ],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" },
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" },
+        ],
+        updateBy: [
+          { required: true, message: "更新人不能为空", trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" },
+        ],
+        remark: [
+          { required: true, message: "备注信息不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  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 personPopedomApi.add(self.formModel);
+            } else {
+              return personPopedomApi.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);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return personPopedomApi.create();
+      } else {
+        return personPopedomApi.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/personPopedom-list.vue

@@ -0,0 +1,266 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    title="查看关联设备"
+    :modal-append-to-body="false"
+    append-to-body
+    :modal="true"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="970px"
+  >
+    <div>
+      <!--
+      要resetFields起作用，必须配置:model和prop
+      -->
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          @click="handleRemoveAll"
+          >新增</el-button
+        >
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-refresh"
+          @click="handleUpdateIsWrite"
+          >删除</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
+          prop="companyId"
+          label="对应公司id"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="personRoleId"
+          label="对应角色id"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="personId"
+          label="人员id"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="showIconId"
+          label="展示的图标id"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="delFlag"
+          label="是否删除"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="createBy"
+          label="创建人"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="createTime"
+          label="创建时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="updateBy"
+          label="更新人"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="updateTime"
+          label="更新时间"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注信息"
+          width="180"
+        ></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>
+      <personPopedom-detail
+        v-if="showModal"
+        :businessKey="businessKey"
+        :title="modalTitle"
+        @close="onDetailModalClose"
+        ></personPopedom-detail>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import PersonPopedomDetail from "./personPopedom-detail";
+import personPopedomApi from "@/api/base/personPopedom";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["personId"],
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        personId: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      showDialog: true,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    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("personId", self.personId);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      personPopedomApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+          console.log(jsonData.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();
+    },
+    handleDelete(record) {
+      var self = this;
+      this.$confirm("是否解除关联？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          self.loading = true;
+
+          personPopedomApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+            self.loading = false;
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "解绑成功!",
+              });
+            }
+          });
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "personPopedom-detail": PersonPopedomDetail
+  },
+};
+</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>