diff --git a/src/views/hardware/deviceList/index.vue b/src/views/hardware/deviceList/index.vue
index 258a902..0aec0a1 100644
--- a/src/views/hardware/deviceList/index.vue
+++ b/src/views/hardware/deviceList/index.vue
@@ -80,15 +80,24 @@
         <el-form-item label="设备编码" prop="deviceCode">
           <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
         </el-form-item>
-        <el-form-item label="类型" prop="deviceType">
+        <el-form-item label="设备类型" prop="deviceType">
           <el-input v-model="form.deviceType" placeholder="请输入设备类型" />
         </el-form-item>
-        <el-form-item label="装置模型" prop="deviceModel">
-          <el-input v-model="form.deviceModel" placeholder="请输入装置模型" />
+        <el-form-item label="设备型号" prop="deviceModel">
+          <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="产品" prop="productId">
+          <el-select v-model="form.productId" clearable placeholder="请选择">
+            <el-option v-for="item in productSelectList" :key="item.id" :label="item.productName" :value="item.productId">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="国家行政区 省" prop="provinceCode">
           <el-input v-model="form.provinceCode" />
         </el-form-item>
+        <el-form-item label="国家行政区 市" prop="cityCode">
+          <el-input v-model="form.cityCode" />
+        </el-form-item>
         <el-form-item label="国家行政区 区" prop="areaCode">
           <el-input v-model="form.areaCode" />
         </el-form-item>
@@ -110,6 +119,7 @@ import {
   update,
   del,
 } from "@/api/hardware/device";
+import { select as productSelect } from "@/api/hardware/product";
 export default {
   name: "DeviceList",
   components: {
@@ -117,6 +127,8 @@ export default {
   },
   data () {
     return {
+      // 产品下拉列表
+      productSelectList: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -141,7 +153,7 @@ export default {
         },
       ],
       // 表单参数
-      form: { },
+      form: {},
       // 表格数据
       tableData: null,
       // 查询参数
@@ -159,10 +171,20 @@ export default {
         deviceType: [
           { required: true, message: "设备编码不能为空", trigger: "blur" },
         ],
+        productId: [
+          { required: true, message: "产品不能为空", trigger: "blur" },
+        ],
       },
     };
   },
   created () {
+    productSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.productSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {
diff --git a/src/views/hardware/productList/index.vue b/src/views/hardware/productList/index.vue
index 0eaf53a..c297ab7 100644
--- a/src/views/hardware/productList/index.vue
+++ b/src/views/hardware/productList/index.vue
@@ -258,7 +258,7 @@ export default {
         productId: "",
         productType: "",
         productName: "",
-        status: "0",
+        status: "",
       };
       this.nodeForm = {
         productId: "",
diff --git a/src/views/hardware/projectList/index.vue b/src/views/hardware/projectList/index.vue
index 406c99e..402b1a4 100644
--- a/src/views/hardware/projectList/index.vue
+++ b/src/views/hardware/projectList/index.vue
@@ -1,76 +1,82 @@
 <template>
-<section class="app-container">
-  <el-row>
-    <el-col>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable size="small" style="width: 240px"
-            @keyup.enter.native="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="cyan" 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 :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:project:add']">增加</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-            v-hasPermi="['monitor:project:remove']">批量删除</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
-        <el-table-column prop="projectName" align="center" label="项目名称">
-        </el-table-column>
-        <el-table-column prop="createTime" align="center" label="创建时间">
-        </el-table-column>
-        <el-table-column prop="status" align="center" label="状态">
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">修改
-            </el-button>
-            <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-              v-hasPermi="['system:project:remove']">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
-    </el-col>
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-input v-model="form.createTime" placeholder="请输入创建时间" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-input v-model="form.status" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </el-row>
-</section>
+  <section class="app-container">
+    <el-row>
+      <el-col>
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable size="small" style="width: 240px"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="cyan" 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 :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:project:add']">增加</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+              v-hasPermi="['monitor:project:remove']">批量删除</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center">
+          </el-table-column>
+          <el-table-column prop="projectName" align="center" label="项目名称">
+          </el-table-column>
+          <el-table-column prop="createTime" align="center" label="创建时间">
+          </el-table-column>
+          <el-table-column prop="status" align="center" label="状态">
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">
+                修改
+              </el-button>
+              <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:project:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
+      <!-- 添加或修改参数配置对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+          </el-form-item>
+          <el-form-item label="客户" prop="userId">
+            <el-select v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
+              <el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-input v-model="form.status" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+    </el-row>
+  </section>
 </template>
 
 <script>
 import { list, info, add, update, del, select } from "@/api/hardware/project";
+import { userSelect } from "@/api/system/user";
 export default {
   name: "ProjectList",
   data () {
     return {
+      userSelectList: [],
       // 选中数组
       ids: [],
       // 非多个禁用
@@ -95,11 +101,21 @@ export default {
       rules: {
         projectName: [
           { required: true, message: "项目名称不能为空", trigger: "blur" },
-        ]
+        ],
+        userId: [
+          { required: true, message: "客户不能为空", trigger: "blur" },
+        ],
       },
     }
   },
   created () {
+    userSelect().then(({ code, msg, select }) => {
+      if (code == 200) {
+        this.userSelectList = select;
+      } else {
+        this.$message.error(msg);
+      }
+    })
     this.getList();
   },
   methods: {
@@ -123,7 +139,7 @@ export default {
     },
 
     // 表单重置
-    reset() {
+    reset () {
       this.form = {
         projectName: "",
         createTime: "",
@@ -133,7 +149,7 @@ export default {
     },
 
     // 取消按钮
-    cancel() {
+    cancel () {
       this.open = false;
       this.reset();
     },
@@ -148,40 +164,40 @@ export default {
 
     /** 新增按钮操作 */
     handleAdd () {
-        this.reset();
-        this.open = true;
-        this.title = "添加项目";
+      this.reset();
+      this.open = true;
+      this.title = "添加项目";
     },
 
     /** 修改按钮操作 */
     handleUpdate (row) {
-        this.reset();
-        this.form = row;
-        this.open = true;
-        this.title = "修改项目";
+      this.reset();
+      this.form = row;
+      this.open = true;
+      this.title = "修改项目";
     },
 
     /** 删除按钮操作 */
     handleDelete (row) {
-        const ids = row.id || this.ids;
-        this.$confirm("是否确认删除?", "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+      const ids = row.id || this.ids;
+      this.$confirm("是否确认删除?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return del(ids);
         })
-          .then(() => {
-            return del(ids);
-          })
-          .catch(() => {})
-          .then((res) => {
-            if (200 == res.code) {
-              this.getList();
-              this.msgSuccess("删除成功");
-            } else {
-              this.msgSuccess(res.msg);
-            }
-          })
-          .catch((res) => {});
+        .catch(() => { })
+        .then((res) => {
+          if (200 == res.code) {
+            this.getList();
+            this.msgSuccess("删除成功");
+          } else {
+            this.msgSuccess(res.msg);
+          }
+        })
+        .catch((res) => { });
     },
 
     /** 提交按钮 */