Merge remote-tracking branch 'origin/master'

src/api/assets/agri.js

@@ -42,3 +42,11 @@ export function delAgri(id) {
     method: 'delete'
   })
 }
+
+export function findAgriByUser(query) {
+  return request({
+    url: '/assets/agri/findAgriByUser',
+    method: 'get',
+    params: query
+  })
+}

src/api/assets/userAgri.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询大棚信息（用户-设备关联）列表
+export function listUserAgri(query) {
+  return request({
+    url: '/assets/userAgri/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询大棚信息（用户-设备关联）详细
+export function getUserAgri(id) {
+  return request({
+    url: '/assets/userAgri/' + id,
+    method: 'get'
+  })
+}
+
+// 新增大棚信息（用户-设备关联）
+export function addUserAgri(data) {
+  return request({
+    url: '/assets/userAgri',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改大棚信息（用户-设备关联）
+export function updateUserAgri(data) {
+  return request({
+    url: '/assets/userAgri',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除大棚信息（用户-设备关联）
+export function delUserAgri(id) {
+  return request({
+    url: '/assets/userAgri/' + id,
+    method: 'delete'
+  })
+}

src/views/assets/agri/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备IMEI" prop="imei">
+      <el-form-item label="IMEI" prop="imei">
         <el-input
           id="imei" v-model="queryParams.imei"
           placeholder="请输入设备IMEI"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关联用户ID" prop="userId">
+      <el-form-item label="用户" prop="userId">
         <el-input
           id="userId" v-model="queryParams.userId"
           placeholder="请输入关联用户ID"
@@ -25,26 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="温度上限(℃)" prop="tempUpper">
-        <el-input-number
-            id="tempUpper" v-model="queryParams.tempUpper"
-        />
-      </el-form-item>
-      <el-form-item label="温度下限(℃)" prop="tempLower">
-        <el-input-number
-            id="tempLower" v-model="queryParams.tempLower"
-        />
-      </el-form-item>
-      <el-form-item label="湿度上限(%RH)" prop="humiUpper">
-        <el-input-number
-            id="humiUpper" v-model="queryParams.humiUpper"
-        />
-      </el-form-item>
-      <el-form-item label="湿度下限(%RH)" prop="humiLower">
-        <el-input-number
-            id="humiLower" v-model="queryParams.humiLower"
-        />
-      </el-form-item>
       <el-form-item label="安装时间" prop="installTime">
         <el-date-picker clearable
           id="installTime" v-model="queryParams.installTime"
@@ -61,14 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
+
-        <el-input
-          id="isDeleted" v-model="queryParams.isDeleted"
-          placeholder="请输入逻辑删除(0-未删，1-已删)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -123,16 +96,29 @@
 
     <el-table v-loading="loading" border :data="agriList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="ID" width="180" align="center" prop="id" />
-      <el-table-column label="设备IMEI" align="center" prop="imei" />
+      <el-table-column label="IMEI" width="150" align="center" prop="imei" />
       <el-table-column label="大棚名称" align="center" prop="agriName" />
-      <el-table-column label="关联用户ID" align="center" prop="userId" />
+      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="温度上限(℃)" align="center" prop="tempUpper" />
+
-      <el-table-column label="温度下限(℃)" align="center" prop="tempLower" />
+
-      <el-table-column label="湿度上限(%RH)" align="center" prop="humiUpper" />
+      <el-table-column label="用户" align="center" class-name="small-padding fixed-width">
-      <el-table-column label="湿度下限(%RH)" align="center" prop="humiLower" />
+        <template slot-scope="scope">
-      <el-table-column label="告警开关(0-关闭，1-开启)" align="center" prop="alarmStatus" />
+          <el-button
-      <el-table-column label="设备状态(0-离线，1-在线，2-故障)" align="center" prop="deviceStatus" />
+            size="mini"
+            type="text"
+            icon="el-icon-user"
+            @click="showUser(scope.row)"
+          >点击查看</el-button>
+        </template>
+      </el-table-column>
+
+<!--      <el-table-column label="温度上限" align="center" prop="tempUpper" />-->
+<!--      <el-table-column label="温度下限(℃)" align="center" prop="tempLower" />-->
+<!--      <el-table-column label="湿度上限(%RH)" align="center" prop="humiUpper" />-->
+<!--      <el-table-column label="湿度下限(%RH)" align="center" prop="humiLower" />-->
+      <el-table-column label="告警开关" align="center" prop="alarmStatus" />
+      <el-table-column label="设备状态" align="center" prop="deviceStatus" />
       <el-table-column label="安装时间" align="center" prop="installTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.installTime, '{y}-{m}-{d}') }}</span>
@@ -140,7 +126,6 @@
       </el-table-column>
       <el-table-column label="安装位置" align="center" prop="location" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="逻辑删除(0-未删，1-已删)" align="center" prop="isDeleted" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -216,14 +201,18 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <show-user ref="show"/>
   </div>
 </template>
 
 <script>
 import { listAgri, getAgri, delAgri, addAgri, updateAgri } from "@/api/assets/agri"
+import ShowUser from "./showUser.vue";
 
 export default {
   name: "Agri",
+  components: {ShowUser},
   data() {
     return {
       // 遮罩层
@@ -311,6 +300,9 @@ export default {
         this.loading = false
       })
     },
+    showUser(row) {
+      this.$refs.show.showUser(row.agriId)
+    },
     // 取消按钮
     cancel() {
       this.open = false

src/views/assets/agri/showUser.vue

@@ -0,0 +1,133 @@
+<template>
+  <!-- 授权用户 -->
+  <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input
+          v-model="queryParams.phonenumber"
+          placeholder="请输入手机号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+      <el-button @click="visible = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { unallocatedUserList, authUserSelectAll } from "@/api/system/role"
+export default {
+  dicts: ['sys_normal_disable'],
+  props: {
+
+  },
+  data() {
+    return {
+      // 遮罩层
+      visible: false,
+      // 选中数组值
+      userIds: [],
+      // 总条数
+      total: 0,
+      // 未授权用户数据
+      userList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        agriId: undefined,
+        userName: undefined,
+        phonenumber: undefined
+      }
+    }
+  },
+  methods: {
+    // 显示弹框
+    showUser(agriId) {
+      this.queryParams.agriId = agriId
+      this.getList()
+      this.visible = true
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row)
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.userIds = selection.map(item => item.userId)
+    },
+    // 查询表数据
+    getList() {
+      unallocatedUserList(this.queryParams).then(res => {
+        this.userList = res.rows
+        this.total = res.total
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    /** 选择授权用户操作 */
+    handleSelectUser() {
+      const roleId = this.queryParams.roleId
+      const userIds = this.userIds.join(",")
+      if (userIds == "") {
+        this.$modal.msgError("请选择要分配的用户")
+        return
+      }
+      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
+        this.$modal.msgSuccess(res.msg)
+        this.visible = false
+        this.$emit("ok")
+      })
+    }
+  }
+}
+</script>