提交最新代码

back/config.js

@@ -1,6 +1,6 @@
 window.g = {
-  ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
-  // ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
+  // ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
+  ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
   // ApiUrl: 'http://192.168.11.17:9111/yx-fyzd', //浙江本地
 
 }

back/static/css/chunk-1237a072.1588311c.css

@@ -1 +0,0 @@
-.flex[data-v-685e8309]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:start;width:1150px}.sure[data-v-685e8309]{margin-left:520px;margin-top:37px}.title[data-v-685e8309]{margin-top:30px;margin-bottom:20px}.title .line[data-v-685e8309]{width:3px;height:13px;background:#409eff;border-radius:13px;display:inline-block;margin-right:8px}.title span[data-v-685e8309]{font-weight:500;font-size:17px;color:#333}.user_msg[data-v-685e8309]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-bottom:30px}.user_msg .line_msg[data-v-685e8309]{width:33.33%;margin-bottom:15px}.user_msg .line_msg .basic_msg[data-v-685e8309]{color:#b0b6c5;margin-right:32px}.user_msg .line_msg .value[data-v-685e8309]{color:#606266}.reset[data-v-685e8309]{margin-right:80px}[data-v-685e8309].upload-demo{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-685e8309].upload-demo .el-upload-list{display:none!important}.upload-img[data-v-685e8309]{margin-right:10px;width:100px;height:100px;position:relative}.upload-img img[data-v-685e8309]{width:100%;height:100%;border-radius:12px}.del-img[data-v-685e8309]{display:inline-block;width:20px;height:20px;background:#83878f;color:#fff;position:absolute;top:-12px;right:-10px;border-radius:48%;line-height:18px}.item-margin-bottom[data-v-685e8309]{-webkit-box-flex:.5;-ms-flex:.5;flex:.5;margin-bottom:0!important}.custom-css[data-v-685e8309]{border:1px solid #d6eaff;padding:10px;border-radius:10px;margin-bottom:10px}.custom-css-item[data-v-685e8309]{border-bottom:2px dashed #e7ebf4;padding:20px 5px 45px 20px}.custom-css-item[data-v-685e8309]:last-child{border-bottom:none}::v-deep.el-upload-list{max-width:390px}

back/static/css/chunk-66b03410.4f9b5114.css

@@ -1 +0,0 @@
-.table[data-v-36d130ec]{margin-top:15px}.flex[data-v-36d130ec]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-36d130ec]{margin:10px 0 0 10px}.input[data-v-36d130ec]{width:150px}.choose-time[data-v-36d130ec]{margin-left:10px}

back/static/css/chunk-16d9a660.912a25f3.css → back/static/css/chunk-797d586c.ff0b4703.css

@@ -1 +1 @@
-.table[data-v-5d41524e]{margin-top:15px}.flex[data-v-5d41524e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-5d41524e]{margin:10px 0 0 10px}.input[data-v-5d41524e]{width:150px}.table[data-v-6871f5e0]{margin-top:15px}.flex[data-v-6871f5e0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-6871f5e0]{margin:10px 0 0 10px}.input[data-v-6871f5e0]{width:150px}
+.table[data-v-40e244c1]{margin-top:15px}.flex[data-v-40e244c1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-40e244c1]{margin:10px 0 0 10px}.input[data-v-40e244c1]{width:150px}.table[data-v-6871f5e0]{margin-top:15px}.flex[data-v-6871f5e0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-6871f5e0]{margin:10px 0 0 10px}.input[data-v-6871f5e0]{width:150px}

back/static/css/chunk-51eba704.33fa7847.css → back/static/css/chunk-7e6371e6.83a4f6b2.css

@@ -1 +1 @@
-.pagination-container[data-v-07f7dac8]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-07f7dac8]{display:none}.table[data-v-d68035e6]{margin-top:15px}.flex[data-v-d68035e6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-d68035e6]{margin:10px 0 0 10px}.input[data-v-d68035e6]{width:150px}.prompt .el-dialog .el-dialog__body{padding-top:0!important}.table[data-v-13f83243]{margin-top:15px}.flex[data-v-13f83243]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-13f83243]{margin:10px 0 0 10px}.input[data-v-13f83243]{width:150px}
+.pagination-container[data-v-07f7dac8]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-07f7dac8]{display:none}.table[data-v-31948004]{margin-top:15px}.flex[data-v-31948004]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-31948004]{margin:10px 0 0 10px}.input[data-v-31948004]{width:150px}.prompt .el-dialog .el-dialog__body{padding-top:0!important}.table[data-v-13f83243]{margin-top:15px}.flex[data-v-13f83243]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.margin-left[data-v-13f83243]{margin:10px 0 0 10px}.input[data-v-13f83243]{width:150px}

public/config.js

@@ -1,6 +1,6 @@
 window.g = {
-  ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
-  // ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
+  // ApiUrl: 'https://face.ldxk.edu.cn:8901/ywjl-fyzd', //计量
+  ApiUrl: 'https://noise.hz-hanghui.com:8088/yx-fyzd', //浙江
   // ApiUrl: 'http://192.168.11.17:9111/yx-fyzd', //浙江本地
 
 }

src/router/index.js

@@ -103,18 +103,18 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/tree_month_record',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'tree_month_record',
-        component: () => import('@/views/tree_month_record/index'),
-        meta: { title: '近期进出记录', role: [1, 2,3,4,5,99], icon: 'el-icon-monitor' }
-      }
-    ]
-  },
+  // {
+  //   path: '/tree_month_record',
+  //   component: Layout,
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'tree_month_record',
+  //       component: () => import('@/views/tree_month_record/index'),
+  //       meta: { title: '近期进出记录', role: [1, 2,3,4,5,99], icon: 'el-icon-monitor' }
+  //     }
+  //   ]
+  // },
   {
     path: '/pass_records',
     component: Layout,

src/views/basic_setup/index.vue

@@ -252,7 +252,6 @@
           class="upload-demo"
           :multiple="false"
           :action="doUpload"
-          :on-remove="handleRemove"
           :file-list="user_form.screenShowPhotos"
           list-type="picture"
           :http-request="doUploadAvatar"
@@ -265,35 +264,100 @@
             v-if="user_form.screenShowPhotos.length < 1"
             class="upload-img"
           />
+
           <div v-else class="upload-img">
             <img :src="user_form.screenShowPhotos[0].url" alt="" />
-            <span @click="handleRemove" class="del-img">x</span>
+            <span @click.stop="handleRemove" class="del-img">x</span>
           </div>
         </el-upload>
       </el-form-item>
 
       <!-- 设备显示配置 -->
-      <div v-if="user_form.type === 5">
-        <div class="title">
-          <div class="line"></div>
-          <span>设备显示配置</span>
-        </div>
-        <div class="flex">
-          <el-form-item
-            label-width="200px"
-            label="顶部标题"
-            class="form-item-style item-margin-bottom"
-            prop="topTitle"
-          >
-            <el-input
-              v-model="user_form.topTitle"
-              placeholder="请输入顶部标题"
-              maxlength="8"
-              show-word-limit
-            ></el-input>
-          </el-form-item>
+       <div v-if="user_form.type === 5">
+          <div class="title">
+            <div class="line"></div>
+            <span>设备显示配置</span>
+          </div>
+          <div class="flex">
+            <el-form-item
+              label-width="120px"
+              label="顶部标题"
+              class="form-item-style"
+              prop="topTitle"
+            >
+              <el-input
+                v-model="user_form.topTitle"
+                placeholder="请输入顶部标题"
+                maxlength="8"
+                show-word-limit
+              ></el-input>
+            </el-form-item>
+            <el-form-item
+              label-width="120px"
+              label="二维码码值"
+              class="form-item-style special"
+              prop="qrcodeText"
+            >
+              <el-input
+                v-model="user_form.qrcodeText"
+                placeholder="二维码码值"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="flex">
+            <el-form-item
+              label-width="120px"
+              label="二维码是否显示"
+              class="el-form-item form-item-style special"
+              prop="showQrcode"
+            >
+              <el-radio-group
+                v-model="user_form.showQrcode"
+                style="width: 100%"
+              >
+                <el-radio :label="false">否</el-radio>
+                <el-radio :label="true">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              label-width="120px"
+              label="广告图片"
+              class="el-form-item form-item-style special"
+              prop="advertise"
+            >
+              <el-upload
+                ref="upload"
+                name="file"
+                class="avatar-uploader"
+                :action="doUpload"
+                :show-file-list="false"
+                :http-request="doUploadAvatar1"
+                :before-upload="beforeAvatarUpload"
+                :auto-upload="true"
+                accept="image/png,image/gif,image/jpg,image/jpeg"
+              >
+                <img
+                  src="../../assets/default-img.png"
+                  alt=""
+                  v-if="!user_form.advertise"
+                  class="upload-img"
+                />
+                <div
+                :class="[
+                  'upload-img',
+                  user_form.showQrcode ? 'upload-img1' : 'upload-img2',
+                ]"
+                v-else
+              >
+                  <img :src="user_form.advertise" />
+                  <span @click.stop="handleRemove('advertise')" class="del-img"
+                    >x</span
+                  >
+                </div>
+              </el-upload>
+            </el-form-item>
+          </div>
         </div>
-      </div>
     </el-form>
     <div class="sure">
       <el-button plain type="primary" @click="getInfo(1)" class="reset"
@@ -333,6 +397,9 @@ export default {
         screenShowPhotos: [],
         topTitle: null,
         examDeviceList: [], //考试设备列表
+         qrcodeText: null, //二维码码值
+        showQrcode: false, //二维码是否显示
+        advertise: null, //广告图片
       },
 
       // 验证规则
@@ -431,9 +498,14 @@ export default {
         this.getInfo();
       });
     },
-    handleRemove(event) {
-      event.stopPropagation();
-      this.user_form.screenShowPhotos = [];
+    handleRemove(type) {
+      console.log(type);
+      if (type==='advertise') {
+        this.user_form.advertise = null;
+      } else {
+        this.user_form.screenShowPhotos = [];
+      }
+      return false;
     },
     // 图片上传前
     beforeAvatarUpload(file) {
@@ -473,6 +545,16 @@ export default {
         this.user_form.screenShowPhotos.push(data);
       });
     },
+    doUploadAvatar1(obj) {
+      this.listLoading = true;
+      var avatar = new FormData();
+      avatar.append("file", obj.file);
+      pictureLocal(avatar).then((res) => {
+        this.value = res.data;
+        this.listLoading = false;
+        this.user_form.advertise = res.data;
+      });
+    },
     // 获取设备列表-搜索
     getFaceDeviceList() {
       getFaceDeviceList().then((res) => {
@@ -546,16 +628,29 @@ export default {
 }
 
 .upload-img {
-  margin-right: 10px;
   width: 100px;
   height: 100px;
   position: relative;
+  margin-bottom: 20px;
   img {
     width: 100%;
     height: 100%;
-    border-radius: 12px;
+    object-fit: contain;
+    // border-radius: 12px;
   }
 }
+.upload-img1 {
+  width: 253px;
+  height: 91px;
+  border: 1px solid #d6eaff;
+  box-sizing: border-box;
+}
+.upload-img2 {
+  width: 356px;
+  height: 91px;
+  border: 1px solid #99d3f5;
+  box-sizing: border-box;
+}
 .del-img {
   display: inline-block;
   width: 20px;

src/views/machine_list/components/ysgz_machine_list.vue

@@ -1021,11 +1021,18 @@ export default {
       })
         .then(() => {
           doAuthFaceDevice(id).then((response) => {
-            this.fetchData();
-            this.$message({
-              type: "success",
-              message: "授权成功!",
-            });
+            if (response.data) {
+              this.fetchData();
+              this.$message({
+                type: "success",
+                message: "授权成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: "授权失败!",
+              });
+            }
           });
         })
         .catch(() => {
@@ -1045,11 +1052,18 @@ export default {
       })
         .then(() => {
           doStopFaceDevice(id).then((response) => {
-            this.fetchData();
-            this.$message({
-              type: "success",
-              message: "停用成功!",
-            });
+            if (response.data) {
+              this.fetchData();
+              this.$message({
+                type: "success",
+                message: "停用成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: "停用失败!",
+              });
+            }
           });
         })
         .catch(() => {

src/views/pass_records/components/ysgz_pass_records.vue

@@ -299,7 +299,14 @@
         >导出照片</el-button
       >
     </el-tooltip>
-
+ <el-button
+      type="primary"
+      icon="el-icon-download"
+      class="margin-left"
+      v-if="isOut === 1"
+      @click="openUploadDoc"
+      >导出报表</el-button
+    >
     <el-button
       type="primary"
       :icon="!isUpdate ? 'el-icon-refresh-left' : 'el-icon-loading'"
@@ -543,6 +550,49 @@
       :visitToJetList="visitToJetList"
       :row="row"
     />
+        <!-- 导出报表 -->
+    <el-dialog
+      title="导出报表"
+      center
+      :visible.sync="uploadDocVisible"
+      destroy-on-close
+    >
+      <el-form
+        :model="uploadDoc_form"
+        ref="uploadDoc_form"
+        label-width="120px"
+        label-position="left"
+      >
+        <el-form-item label="报表类型" prop="adminAreaType">
+          <el-radio-group v-model="uploadDoc_form.type">
+            <el-radio :label="1">日报</el-radio>
+            <el-radio :label="2">周报</el-radio>
+            <el-radio :label="3">月报</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="选择时间" prop="adminAreaType">
+          <el-date-picker
+            v-model="uploadDoc_form.startTime"
+            type="date"
+            placeholder="选择开始时间"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+          <el-date-picker
+            v-model="uploadDoc_form.endTime"
+            type="date"
+            placeholder="选择结束时间"
+            value-format="yyyy-MM-dd"
+            class="choose-time"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="uploadDocFun"> 下载 </el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -570,6 +620,7 @@ import {
 } from "@/api/user_manage";
 import { parseTime } from "@/utils";
 import { downloadPhotosPassRecords } from "@/utils/steakPhoto"; // secondary package based on el-pagination
+import { monthRecords, todayRecords, weekedRecords } from "@/api/xiaosha";
 
 export default {
   components: { Pagination, detailsDialog },
@@ -666,6 +717,13 @@ export default {
       //自定义字段模板
       addCustomList: [],
       row: {},
+      // 报表导出
+      uploadDocVisible: false,
+      uploadDoc_form: {
+        type: 1,
+        startTime: null,
+        endTime: null,
+      },
     };
   },
   created() {
@@ -881,6 +939,40 @@ export default {
           });
         });
     },
+    openUploadDoc() {
+      this.uploadDocVisible = true;
+      this.uploadDoc_form.startTime = null;
+      this.uploadDoc_form.endTime = null;
+    },
+    // 导出报表
+    async uploadDocFun() {
+      let { startTime, endTime, type } = this.uploadDoc_form;
+      if (!endTime || !startTime) {
+        this.$message.error("请选择时间");
+        return;
+      }
+      let data = null;
+      let time = {
+        startTime: startTime + "  00:00:00",
+        endTime: endTime + " 23:59:59",
+      };
+      if (type === 1) {
+        data = await todayRecords(time);
+      } else if (type === 2) {
+        data = await weekedRecords(time);
+      } else if (type === 3) {
+        data = await monthRecords(time);
+      }
+      var eleLink = document.createElement("a");
+      eleLink.style.display = "none";
+      var blob = new Blob([data]);
+      eleLink.href = URL.createObjectURL(blob);
+      eleLink.setAttribute("download", "报表.doc");
+      document.body.appendChild(eleLink);
+      eleLink.click();
+      document.body.removeChild(eleLink);
+      this.uploadDocVisible = false;
+    },
     // 返回列表序号
     indexMethod(index) {
       return (this.page.pageNum - 1) * this.page.pageSize + index + 1;

src/views/user_manage/index.vue

@@ -760,7 +760,8 @@
             <el-form-item
               label="卡号认证"
               prop="cardPhysics"
-              class="form-item-style item-margin-bottom">
+              class="form-item-style item-margin-bottom"
+            >
               <el-radio-group v-model="user_form.cardPhysics">
                 <el-radio :label="2">停用</el-radio>
                 <el-radio :label="1">启用</el-radio>
@@ -769,7 +770,8 @@
             <el-form-item
               label="是否开启布控"
               prop="isControlEarlyWarning"
-              class="form-item-style item-margin-bottom">
+              class="form-item-style item-margin-bottom"
+            >
               <el-radio-group v-model="user_form.isControlEarlyWarning">
                 <el-radio :label="2">否</el-radio>
                 <el-radio :label="1">是</el-radio>
@@ -898,7 +900,8 @@
               <el-form-item
                 label="进出人员数据统计"
                 prop="openInOutStatistics"
-                class="form-item-style item-margin-bottom">
+                class="form-item-style item-margin-bottom"
+              >
                 <el-radio-group v-model="user_form.openInOutStatistics">
                   <el-radio :label="false">停用</el-radio>
                   <el-radio :label="true">启用</el-radio>
@@ -937,7 +940,6 @@
                 class="upload-demo"
                 :multiple="false"
                 :action="doUpload"
-                :on-remove="handleRemove"
                 :file-list="user_form.screenShowPhotos"
                 list-type="picture"
                 :http-request="doUploadAvatar"
@@ -953,7 +955,7 @@
 
                 <div v-else class="upload-img">
                   <img :src="user_form.screenShowPhotos[0].url" alt="" />
-                  <span @click="handleRemove" class="del-img">x</span>
+                  <span @click.stop="handleRemove" class="del-img">x</span>
                 </div>
               </el-upload>
             </el-form-item>
@@ -1166,9 +1168,9 @@
           </div>
           <div class="flex">
             <el-form-item
-              label-width="200px"
+              label-width="120px"
               label="顶部标题"
-              class="form-item-style item-margin-bottom"
+              class="form-item-style"
               prop="topTitle"
             >
               <el-input
@@ -1178,6 +1180,70 @@
                 show-word-limit
               ></el-input>
             </el-form-item>
+            <el-form-item
+              label-width="120px"
+              label="二维码码值"
+              class="form-item-style special"
+              prop="qrcodeText"
+            >
+              <el-input
+                v-model="user_form.qrcodeText"
+                placeholder="二维码码值"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="flex">
+            <el-form-item
+              label-width="120px"
+              label="二维码是否显示"
+              class="el-form-item form-item-style special"
+              prop="showQrcode"
+            >
+              <el-radio-group
+                v-model="user_form.showQrcode"
+                style="width: 100%"
+              >
+                <el-radio :label="false">否</el-radio>
+                <el-radio :label="true">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item
+              label-width="120px"
+              label="广告图片"
+              class="el-form-item form-item-style special"
+              prop="advertise"
+            >
+              <el-upload
+                ref="upload"
+                name="file"
+                class="avatar-uploader"
+                :action="doUpload"
+                :show-file-list="false"
+                :http-request="doUploadAvatar1"
+                :before-upload="beforeAvatarUpload"
+                :auto-upload="true"
+                accept="image/png,image/gif,image/jpg,image/jpeg"
+              >
+                <img
+                  src="../../assets/default-img.png"
+                  alt=""
+                  v-if="!user_form.advertise"
+                  class="upload-img"
+                />
+                <div
+                  :class="[
+                    'upload-img',
+                    user_form.showQrcode ? 'upload-img1' : 'upload-img2',
+                  ]"
+                  v-else
+                >
+                  <img :src="user_form.advertise" />
+                  <span @click.stop="handleRemove('advertise')" class="del-img"
+                    >x</span
+                  >
+                </div>
+              </el-upload>
+            </el-form-item>
           </div>
         </div>
       </el-form>
@@ -1411,6 +1477,9 @@ export default {
         notAllowAgeMsg: "", //提示信息
         isAlarm: false, //不允许是否报警
         isOpenExam: false, //是否开启考试
+        qrcodeText: null, //二维码码值
+        showQrcode: false, //二维码是否显示
+        advertise: null, //广告图片
       },
       user_form_copy: {},
       scene_list: [
@@ -2012,9 +2081,13 @@ export default {
           this.fetchData();
         });
     },
-    handleRemove(event) {
-      event.stopPropagation();
-      this.user_form.screenShowPhotos = [];
+    handleRemove(type) {
+      if (type === "advertise") {
+        this.user_form.advertise = null;
+      } else {
+        this.user_form.screenShowPhotos = [];
+      }
+      return false;
     },
     // 批量下载账号列表
     batchDownloadUserList() {
@@ -2118,6 +2191,16 @@ export default {
         this.user_form.screenShowPhotos.push(data);
       });
     },
+    doUploadAvatar1(obj) {
+      this.listLoading = true;
+      var avatar = new FormData();
+      avatar.append("file", obj.file);
+      pictureLocal(avatar).then((res) => {
+        this.value = res.data;
+        this.listLoading = false;
+        this.user_form.advertise = res.data;
+      });
+    },
     // 场所码所属区域
     getPlaceAreas() {
       getPlaceAreas().then((res) => {
@@ -2247,7 +2330,6 @@ export default {
   }
 }
 .upload-img {
-  margin-right: 10px;
   width: 100px;
   height: 100px;
   position: relative;
@@ -2255,9 +2337,22 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    border-radius: 12px;
+    object-fit: contain;
+    // border-radius: 12px;
   }
 }
+.upload-img1 {
+  width: 253px;
+  height: 91px;
+  border: 1px solid #d6eaff;
+  box-sizing: border-box;
+}
+.upload-img2 {
+  width: 356px;
+  height: 91px;
+  border: 1px solid #99d3f5;
+  box-sizing: border-box;
+}
 .del-img {
   display: inline-block;
   width: 20px;