验收修改一波

package-lock.json

@@ -5185,6 +5185,14 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -6667,6 +6675,18 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chalk": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/chalk/-/chalk-3.0.0.tgz",
@@ -7162,6 +7182,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -7765,6 +7793,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -10923,6 +10962,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -18741,6 +18788,17 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmmirror.com/sshpk/-/sshpk-1.18.0.tgz",
@@ -22187,6 +22245,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -22252,6 +22326,26 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
@@ -22461,7 +22555,8 @@
         "vant": "^2.12.45",
         "vue": "^2.6.11",
         "vue-router": "^3.2.0",
-        "wangeditor": "^4.7.11"
+        "wangeditor": "^4.7.11",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",

packages/admin/src/utils/request.js

@@ -1,7 +1,9 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8016', // 本地调试
-  baseURL: '/api',
+  // baseURL: 'https://jmctcl.jiangmen.cn/api', // 甲方服务器调试
+  baseURL: 'http://project.4dage.com:8016', // 测试环境
+  // baseURL: '/api',
   timeout: 5000
 })
 // 请求拦截器

packages/admin/src/views/tab1Main/five.vue

@@ -125,7 +125,7 @@
       <div class="el-icon-plus" @click="addMen">增加内容</div>
 
       <el-button @click="$router.push('/layout/tab1')">返 回</el-button>&emsp;
-      <el-button type="primary" @click="save">保 存</el-button>
+      <el-button type="primary" @click="save">发 布</el-button>
     </div>
     <!-- 照片墙的查看照片 -->
     <el-dialog :visible.sync="dialogVisible">
@@ -226,7 +226,7 @@ export default {
     goodsImgIndex (item, id) {
       item.imgActive = id
       // this.ruleForm.thumb = this.imgList[index].filePath
-      this.$message.success('操作成功')
+      this.$message.success('上线发布成功')
     },
     // 点击图片看大图
     lookImg (val) {
@@ -279,7 +279,7 @@ export default {
       }
       const res = await saveEntity(obj)
       if (res.code === 0) {
-        this.$message.success('操作成功')
+        this.$message.success('上线发布成功')
         this.id = res.data.id
       } else this.$message.warning(res.msg)
     }

packages/admin/src/views/tab1Main/four.vue

@@ -117,7 +117,7 @@
       <div class="el-icon-plus" @click="addMen">增加内容</div>
 
       <el-button @click="$router.push('/layout/tab1')">返 回</el-button>&emsp;
-      <el-button type="primary" @click="save">保 存</el-button>
+      <el-button type="primary" @click="save">发 布</el-button>
     </div>
     <!-- 照片墙的查看照片 -->
     <el-dialog :visible.sync="dialogVisible">
@@ -217,7 +217,7 @@ export default {
     goodsImgIndex (item, id) {
       item.imgActive = id
       // this.ruleForm.thumb = this.imgList[index].filePath
-      this.$message.success('操作成功')
+      this.$message.success('上线发布成功')
     },
     // 点击图片看大图
     lookImg (val) {
@@ -269,7 +269,7 @@ export default {
       }
       const res = await saveEntity(obj)
       if (res.code === 0) {
-        this.$message.success('操作成功')
+        this.$message.success('上线发布成功')
         this.id = res.data.id
       } else this.$message.warning(res.msg)
     }

packages/admin/src/views/tab1Main/one.vue

@@ -84,7 +84,7 @@
     <!-- 底部按钮 -->
     <div class="btnn">
       <el-button @click="$router.push('/layout/tab1')">返 回</el-button>&emsp;
-      <el-button type="primary" @click="save">保 存</el-button>
+      <el-button type="primary" @click="save">发 布</el-button>
     </div>
     <!-- 照片墙的查看照片 -->
     <el-dialog :visible.sync="dialogVisible">

packages/admin/src/views/tab1Main/three.vue

@@ -40,7 +40,7 @@
     <!-- 底部按钮 -->
     <div class="btnn">
       <el-button @click="$router.push('/layout/tab1')">返 回</el-button>&emsp;
-      <el-button type="primary" @click="save">保 存</el-button>
+      <el-button type="primary" @click="save">发 布</el-button>
     </div>
   </div>
 </template>

packages/admin/src/views/tab1Main/tow.vue

@@ -37,7 +37,7 @@
       <div class="el-icon-plus" @click="addMen">增加人物</div>
 
       <el-button @click="$router.push('/layout/tab1')">返 回</el-button>&emsp;
-      <el-button type="primary" @click="save">保 存</el-button>
+      <el-button type="primary" @click="save">发 布</el-button>
     </div>
   </div>
 </template>
@@ -84,7 +84,7 @@ export default {
       }
       const res = await saveEntity(obj)
       if (res.code === 0) {
-        this.$message.success('操作成功')
+        this.$message.success('上线发布成功')
         this.id = res.data.id
       } else this.$message.warning(res.msg)
     }

packages/admin/src/views/tab2/Dialog.vue

@@ -20,6 +20,13 @@
           show-word-limit
         ></el-input>
       </el-form-item>
+       <el-form-item label="真实姓名" prop="realName">
+        <el-input
+          v-model="ruleForm.realName"
+          maxlength="10"
+          show-word-limit
+        ></el-input>
+      </el-form-item>
       <el-form-item label="电话" prop="phone">
         <el-input
           v-model="ruleForm.phone"
@@ -94,7 +101,8 @@ export default {
         isEnabled: 1,
         phone: '',
         sex: 0,
-        userName: ''
+        userName: '',
+        realName: ''
       },
       rules: {
         userName: [{ required: true, message: '不能为空', trigger: 'blur' }],
@@ -165,6 +173,7 @@ export default {
         id: null,
         isEnabled: 1,
         phone: '',
+        realName: '',
         sex: 0,
         userName: ''
       }
@@ -183,12 +192,12 @@ export default {
             if (res2.code === 0) {
               this.$emit('clickSon')
               this.btnX()
-              this.$message.success('操作成功')
+              this.$message.success('上线发布成功')
             } else this.$message.warning(res2.msg)
           } else {
             this.$emit('clickSon')
             this.btnX()
-            this.$message.success('操作成功')
+            this.$message.success('上线发布成功')
           }
         } else this.$message.warning(res.msg)
       } catch (error) {

packages/admin/src/views/tab2/index.vue

@@ -29,6 +29,8 @@
           </el-table-column>
           <el-table-column prop="userName" label="账号"></el-table-column>
           <el-table-column prop="phone" label="联系电话"></el-table-column>
+          <el-table-column prop="realName" label="真实姓名"></el-table-column>
+          <el-table-column prop="unit" label="组织部门配置"></el-table-column>
           <el-table-column prop="createTime" label="新建时间">
           </el-table-column>
 
@@ -146,7 +148,7 @@ export default {
     // 启用和停用状态
     async changeSta (val, id) {
       await editStatus(id, val)
-      this.$message.success('操作成功!')
+      this.$message.success('上线发布成功!')
     },
     // 点击删除
     userDel (id) {
@@ -176,7 +178,14 @@ export default {
     async userList (data) {
       const res = await userList(data)
       this.total = res.data.total
-      this.tableData = res.data.records
+
+      const resArr = res.data.records || []
+
+      this.tableData = resArr.map(v => ({
+        ...v,
+        realName: v.realName || '-',
+        unit: v.unit || '-'
+      }))
     },
     // 分页器
     currentChange (val) {