From 89c463608083b61a67bebac9aabd020f44df2bce Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 7 May 2024 18:04:40 +0800
Subject: [PATCH] md

---
 .env.production                      | 2 +-
 README.md                            | 3 +++
 package.json                         | 1 +
 src/views/emis/emisSite/index.vue    | 6 +++---
 src/views/emis/emisUser/editForm.vue | 8 ++++++--
 src/views/emis/emisUser/index.vue    | 3 +--
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.env.production b/.env.production
index 72ac37d7..f0f359e5 100644
--- a/.env.production
+++ b/.env.production
@@ -6,4 +6,4 @@ ENV = 'production'
 
 # 管理系统/生产环境
 VUE_APP_PDOMAIN = 'tanex56'
-VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr'
+VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
diff --git a/README.md b/README.md
index e1cc2298..2059af2f 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,9 @@ npm install @antv/x6 --save
 ```
 
 ```
+
+npm i fingerprintjs2 -S
+
 npm install @antv/x6 --save
 npm install --save @antv/g6
 ```
diff --git a/package.json b/package.json
index 456285f3..621aec7c 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "element-ui": "2.15.6",
     "exceljs": "^4.3.0",
     "file-saver": "^2.0.5",
+    "fingerprintjs2": "^2.1.4",
     "font-awesome": "^4.7.0",
     "fuse.js": "6.4.3",
     "highlight.js": "^9.18.5",
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 9ada8730..1f764e7e 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -99,7 +99,7 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisSite:add']"
-                >新增</el-button>
+                >新增网点</el-button>
               </el-col>
               <!--
               <el-col :span="1.5">
@@ -113,7 +113,7 @@
                   v-hasPermi="['emis:emisSite:edit']"
                 >修改</el-button>
               </el-col> -->
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -123,7 +123,7 @@
                   @click="handleDelete"
                   v-hasPermi="['emis:emisSite:remove']"
                 >删除</el-button>
-              </el-col>
+              </el-col> -->
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
diff --git a/src/views/emis/emisUser/editForm.vue b/src/views/emis/emisUser/editForm.vue
index 753ea768..68fbf0d3 100644
--- a/src/views/emis/emisUser/editForm.vue
+++ b/src/views/emis/emisUser/editForm.vue
@@ -9,7 +9,9 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="员工名称" prop="empName">
-                  <el-input v-model="form.empName" placeholder="" maxlength="30" disabled="form.userId == undefined" />
+                  <el-input  v-if="form.userId == undefined" v-model="form.empName" placeholder="" maxlength="30"   />
+                  <el-input  v-else v-model="form.empName" placeholder="" maxlength="30"  disabled  />
+
                 </el-form-item>
               </el-col>
 
@@ -21,7 +23,9 @@
 
               <el-col :span="8">
                 <el-form-item label="归属站点" prop="ownerSiteCode">
-                  <EmisSiteSimplePicker :placeholder="$t('服务网点')"  v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled="form.userId == undefined"></EmisSiteSimplePicker>
+                  <EmisSiteSimplePicker v-if="form.userId == undefined" :placeholder="$t('服务网点')"  v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange"></EmisSiteSimplePicker>
+                  <EmisSiteSimplePicker v-else :placeholder="$t('服务网点')"  v-model="form.ownerSiteCode" :countryCode="form.countryCode" @onChange="onSiteCodeChange" disabled></EmisSiteSimplePicker>
+
                 </el-form-item>
               </el-col>
 
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index 303e3193..b88b5463 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -500,7 +500,6 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.currentId= row.userId || this.ids[0];
-      // this.currentId= row.userId;
       this.openForm = true;
       this.titleForm = "修改用户";
     },
@@ -528,7 +527,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('注意：确认是否删除？').then(function() {
         return delUser(userIds);
       }).then(() => {
         this.getList();