Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue

@@ -170,6 +170,7 @@
                 @change="handleUpload"
                 :before-upload="beforeUpload"
                 :show-upload-list="false"
+                :accept="accept"
               >
                 <div v-if="formData.modelIcon">
                   <div class="svg-box" v-if="isSvg(formData.modelIcon)">
@@ -261,6 +262,7 @@ export default {
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      accept: "image/jpeg,image/png,image/svg+xml", // 上传类型
       columns,
       loading: true,
       title: "新增模块",

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -163,6 +163,7 @@
               :action="api + 'base/file/commonupload'"
               :before-upload="beforeUpload"
               @change="handleChange"
+              :accept="accept"
             >
               <img
                 class="logo"
@@ -307,6 +308,7 @@ export default {
     };
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      accept: "image/jpeg,image/png", // 上传类型
       loading: false,
       options: regionData, // 地区级联数据
       tablename: "", //接口名称

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -107,6 +107,7 @@
                         prop: `skinFieldList.${i}.fieldValue`,
                       }"
                       :customRequest="handleChangeBg"
+                      :accept="accept"
                     >
                       <a-button
                         type="primary"
@@ -220,6 +221,7 @@ export default {
       loading: false,
       formLoading: false,
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
+      accept: "image/jpeg,image/png,image/gif", // 上传类型
       facilityInfo: {}, // 设备信息
       skinTemplate: [], // 皮肤模板列表
       curSkinTemplate: undefined, //当前选择皮肤模板

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -182,6 +182,7 @@
                 :show-upload-list="false"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
+                :accept="accept"
               >
                 <img
                   v-if="form.photoPath"
@@ -322,6 +323,7 @@ export default {
     };
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      accept: "image/jpeg,image/png", // 上传类型
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -187,6 +187,7 @@
                 :show-upload-list="false"
                 :customRequest="uploadImg"
                 :before-upload="beforeUpload"
+                :accept="accept"
               >
                 <img
                   v-if="form.photoPath"
@@ -384,6 +385,7 @@ export default {
     };
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      accept: "image/jpeg,image/png", // 上传类型
       loading: false,
       imageUrl: "",
       labelCol: { span: 5 },

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -506,7 +506,10 @@ export default {
       let that = this;
       let input = document.createElement("input");
       input.setAttribute("type", "file");
-      input.setAttribute("accept", "*");
+      input.setAttribute(
+        "accept",
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+      );
       input.style.display = "none";
       input.addEventListener("change", () => {
         if (input.files && input.files.length > 0) {
@@ -531,9 +534,8 @@ export default {
       let { code, msg } = res.data;
       if (code === 1) {
         this.$message.success(msg);
+        this.page = 1;
         this.getWorkmanData();
-      } else {
-        this.$message.error(msg);
       }
     },
     // 修改密码弹窗