diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..8b121cb 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -217,15 +217,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..8b121cb 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -217,15 +217,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..8b121cb 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -217,15 +217,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,

diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 801c3b3..8b121cb 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -217,15 +217,11 @@
             size="medium"
           >
             <el-form-item label="">
-<<<<<<< HEAD
-              <el-input v-model="deviceRelatedQuery.searchStr" placeholder="请输入设备名称/厂家" clearable></el-input>
-=======
               <el-input
                 v-model="deviceRelatedQuery.searchStr"
                 placeholder="请输入设备编号/厂家"
                 clearable
               ></el-input>
->>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
             </el-form-item>
             <el-form-item>
               <el-button
diff --git a/src/components/ConfigManager/project.vue b/src/components/ConfigManager/project.vue
index d230b2e..0eb5a75 100644
--- a/src/components/ConfigManager/project.vue
+++ b/src/components/ConfigManager/project.vue
@@ -364,7 +364,7 @@
           width: "240",
           btList: [
             { label: "添加用户", size: "small", type: "text", event: "addUser", show: true },
-            { label: "查看用户", size: "small", type: "text", event: "detail", show: true },
+            { label: "关联用户", size: "small", type: "text", event: "detail", show: true },
             { label: "删除用户组", size: "small", type: "text", event: "delGroup", show: true }
           ]
         }
diff --git a/src/components/common/PageTable/index.vue b/src/components/common/PageTable/index.vue
index 01ba393..c22b21d 100644
--- a/src/components/common/PageTable/index.vue
+++ b/src/components/common/PageTable/index.vue
@@ -342,7 +342,7 @@
             if (this.tableType === "tree") {
               arr = this.$fn.handleTree(arr);
             }
-            if (arr) {
+            if (arr.length) {
               arr.forEach(item => {
                 item.createTime = this.$fn.switchTime(
                   item.createTime,
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index b3ceab2..291c8e4 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -42,29 +42,29 @@
         </el-table-column>
         <el-table-column label="操作" width="240px">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('update', scope.row)"
-              v-has="'m9-1-2'"
-              >修改用户</el-button
-            >
             <template v-if="scope.row.userType !== 1">
               <el-button
                 type="text"
                 size="small"
+                @click="handleClick('update', scope.row)"
+                v-has="'m9-1-2'"
+                >修改用户</el-button
+              >
+              <el-button
+                type="text"
+                size="small"
                 @click="handleClick('delete', scope.row)"
                 v-has="'m9-1-3'"
                 >删除用户</el-button
               >
+              <el-button
+                type="text"
+                size="small"
+                @click="handleClick('reset', scope.row)"
+                v-has="'m9-1-4'"
+                >重置密码</el-button
+              >
             </template>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleClick('reset', scope.row)"
-              v-has="'m9-1-4'"
-              >重置密码</el-button
-            >
           </template>
         </el-table-column>
       </el-table>