From a1bea8e05fc6d9783f2daadb39aea2b0090b2def Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 27 Jun 2024 17:20:11 +0800
Subject: [PATCH] =?UTF-8?q?2024-06-27=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eam_device_list.vue    |  2 +-
 src/views/modules/sys/user-add-or-update.vue | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 670de50..1d2eed5 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -152,8 +152,8 @@
             width="100"
             label="操作">
             <template slot-scope="scope">
-              <el-link style="cursor:pointer" @click="previewFile(scope.row)">预览</el-link>
               <el-link style="cursor:pointer" @click="downloadFile(scope.row)">下载</el-link>
+              <el-link style="cursor:pointer" @click="previewFile(scope.row)">预览</el-link>
               <el-link style="cursor:pointer" @click="deleteFile(scope.row)">删除</el-link>
             </template>
           </el-table-column>
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 6717cd7..fe23d53 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -30,12 +30,12 @@
             <el-input v-model="dataForm.mobile" style="width: 150px;" placeholder="手机号"></el-input>
           </el-form-item>
         </el-form>
-<!--        <el-form>-->
-<!--          <el-form-item>-->
-<!--            <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>-->
-<!--            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>-->
-<!--          </el-form-item>-->
-<!--        </el-form>-->
+        <el-form>
+          <el-form-item>
+            <span slot="label" style="" @click="getBaseList(93)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
+            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
+          </el-form-item>
+        </el-form>
         <el-form>
           <el-form-item label="角色" size="mini" prop="roleIdList">
             <el-checkbox-group v-model="dataForm.roleIdList">
@@ -214,7 +214,7 @@ export default {
               'status': this.dataForm.status,
               'roleIdList': this.dataForm.roleIdList,
               'languageDefault': this.dataForm.languageDefault,
-              'site': '2',
+              'site': this.dataForm.site,
               'userDisplay': this.dataForm.userDisplay,
             })
           }).then(({data}) => {