diff --git a/src/api/assets/userAgri.js b/src/api/assets/userAgri.js
index 8d7389a..cec16df 100644
--- a/src/api/assets/userAgri.js
+++ b/src/api/assets/userAgri.js
@@ -42,3 +42,11 @@ export function delUserAgri(id) {
     method: 'delete'
   })
 }
+
+export function findAgriByUser(query) {
+  return request({
+    url: '/assets/userAgri/findAgriByUser',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/assets/agri/index.vue b/src/views/assets/agri/index.vue
index 4ff945b..ee59630 100644
--- a/src/views/assets/agri/index.vue
+++ b/src/views/assets/agri/index.vue
@@ -99,9 +99,6 @@
       <el-table-column label="ID" width="180" align="center" prop="id" />
       <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="用户" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -111,12 +108,7 @@
             @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>=
       <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">
@@ -163,20 +155,13 @@
         <el-form-item label="大棚名称" prop="agriName">
           <el-input id="agriName" v-model="form.agriName" placeholder="请输入大棚名称" />
         </el-form-item>
-        <el-form-item label="关联用户ID" prop="userId">
-          <el-input id="userId" v-model="form.userId" placeholder="请输入关联用户ID" />
-        </el-form-item>
-        <el-form-item label="温度上限(℃)" prop="tempUpper">
-          <el-input-number v-model="form.tempUpper" id="tempUpper"/>
-        </el-form-item>
-        <el-form-item label="温度下限(℃)" prop="tempLower">
-          <el-input-number v-model="form.tempLower" id="tempLower"/>
-        </el-form-item>
-        <el-form-item label="湿度上限(%RH)" prop="humiUpper">
-          <el-input-number v-model="form.humiUpper" id="humiUpper"/>
-        </el-form-item>
-        <el-form-item label="湿度下限(%RH)" prop="humiLower">
-          <el-input-number v-model="form.humiLower" id="humiLower"/>
+        <el-form-item label="关联用户" prop="userId">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-user"
+            @click="getUserInfo(form.agriId)"
+          >点击查看</el-button>
         </el-form-item>
         <el-form-item label="安装时间" prop="installTime">
           <el-date-picker clearable
@@ -192,9 +177,6 @@
         <el-form-item label="备注" prop="remark">
           <el-input id="remark" v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="逻辑删除(0-未删，1-已删)" prop="isDeleted">
-          <el-input id="isDeleted" v-model="form.isDeleted" placeholder="请输入逻辑删除(0-未删，1-已删)" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -247,8 +229,7 @@ export default {
         alarmStatus: null,
         deviceStatus: null,
         installTime: null,
-        location: null,
-        isDeleted: null
+        location: null
       },
       // 表单参数
       form: {},
@@ -280,9 +261,6 @@ export default {
         ],
         updateBy: [
           { required: true, message: "修改人ID不能为空", trigger: "blur" }
-        ],
-        isDeleted: [
-          { required: true, message: "逻辑删除(0-未删，1-已删)不能为空", trigger: "blur" }
         ]
       }
     }
@@ -301,7 +279,11 @@ export default {
       })
     },
     showUser(row) {
-      this.$refs.show.showUser(row.agriId)
+      this.$refs.show.showUser(row.agriId,0)
+    },
+    getUserInfo(agriId) {
+      this.$refs.show.associaUser(agriId,1)
+
     },
     // 取消按钮
     cancel() {
diff --git a/src/views/assets/agri/showUser.vue b/src/views/assets/agri/showUser.vue
index c9cbc5b..75f071b 100644
--- a/src/views/assets/agri/showUser.vue
+++ b/src/views/assets/agri/showUser.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { unallocatedUserList, authUserSelectAll } from "@/api/system/role"
+import { findAgriByUser, authUserSelectAll } from "@/api/system/role"
 export default {
   dicts: ['sys_normal_disable'],
   props: {
@@ -78,8 +78,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         agriId: undefined,
-        userName: undefined,
-        phonenumber: undefined
       }
     }
   },
@@ -99,11 +97,12 @@ export default {
     },
     // 查询表数据
     getList() {
-      unallocatedUserList(this.queryParams).then(res => {
+      findAgriByUser(this.queryParams).then(res => {
         this.userList = res.rows
         this.total = res.total
       })
     },
+    associaUser() {},
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -122,11 +121,6 @@ export default {
         this.$modal.msgError("请选择要分配的用户")
         return
       }
-      authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
-        this.$modal.msgSuccess(res.msg)
-        this.visible = false
-        this.$emit("ok")
-      })
     }
   }
 }