Merge branch 'test' of http://192.168.0.56:3000/bonus/devicesmgt into test

sgzb-ui/package.json

@@ -5,7 +5,7 @@
   "author": "机具",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",

sgzb-ui/src/views/claimAndRefund/receive/agreement.vue

@@ -273,7 +273,7 @@ export default {
       dialogVisible: false,
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       // 表单校验
       rules: {

sgzb-ui/src/views/repairTest/testExamine/index.vue

@@ -338,6 +338,7 @@
       </el-form>
 
       <el-table v-loading="loading" :data="dialogList" height="500px">
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="序号" sortable align="center" type="index" />
         <el-table-column
           label="类型名称"

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -309,9 +309,8 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
-      //  uploadUrl:'http://10.40.92.102:9201',//本地测试
       dialogImageUrl: '',
       dialogVisible: false,
       //--------------

sgzb-ui/src/views/store/tools/toolsSupplier.vue

@@ -215,7 +215,7 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       // 表单校验
       rules: {

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -458,7 +458,8 @@ export default {
       field101fileList:[],
       //上传地址
       // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://192.168.5.12:9201',//本地测试
       uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
       defaultProps: {
         children: "children",

sgzb-ui/src/views/system/user/profile/userAvatar.vue

@@ -132,7 +132,11 @@ export default {
     uploadImg() {
       this.$refs.cropper.getCropBlob(data => {
         let formData = new FormData();
+        // console.log(data)
+        // console.log(formData)
         formData.append("avatarfile", data);
+        formData.append("fileType", 'user');
+        // console.log(formData)
         uploadAvatar(formData).then(response => {
           this.open = false;
           this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;