Merge remote-tracking branch 'origin/master'

src/util/fileUpload.js

@@ -3,13 +3,13 @@ import { baseUrl } from "../config/env";
 import axios from 'axios';
 
 const uploadFile = (files,callback) => {
-  // files.status = "uploading";
+      files.status = "uploading";
-  // files.message = "上传中...";
+      files.message = "上传中...";
-  // files.status = "uploading";
+      files.status = "uploading";
       // files.message = "上传中...";
       // 需要使用 FormData 进行文件上传
       let form = new FormData();
-      form.append("file", files);
+      form.append("file", files.file);
       axios({
         method: "post",
         url:  baseUrl+ "/common/upload",

src/views/enforce/assistUserFilter.vue

@@ -18,7 +18,7 @@
         <div class="search-result">
           <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
             <div class="case-title">姓名：{{ item.userName }}</div>
-            <div class="case-depart">电话：{{ item.phonenumber }}</div>
+            <!-- <div class="case-depart">电话：{{ item.phonenumber }}</div> -->
               <div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>
           </div>
     </div>

src/views/enforce/enforceNotice.vue

@@ -31,13 +31,13 @@
          <div class="item-cont">
            <span class="item-title">{{ item.planName }}</span>
 <!--           <span class="item-time"> {{ item.enforcementDepartment }} - {{ item.createTime }}</span>-->
-           <span class="item-time" style="width: 90%;">
+           <span class="item-time">
                <div style="display: flex; justify-content: space-between;">
-                   <div style="color: #333333;">{{ item.enforcementDepartment }}</div>
+                   <div>{{ item.enforcementDepartment }}</div>
                    <div>{{ item.createTime }}</div>
                </div>
            </span>
-           <div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)"><a style="color: green; ">{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
+           <div class="item-text" @click="toPdfView(null==item.fileObject?'':item.fileObject.fileUrl)"><a>{{ null==item.fileObject?'':item.fileObject.fileName }}</a></div>
          </div>
        </div>
 
@@ -359,14 +359,15 @@ const toPdfView = (url) =>{
   margin: 3% 0.26rem;
   height: 10vh;
   align-items: center;
+  border-bottom: 1px solid #f3f4f5;
 }
 
 .notice-item > i {
   display: inline-block;
   margin: 5% 0.25rem;
-  height: 90%;
+  height: 80%;
-  width: 1.75rem;
+  width: 1.5rem;
-  background: url("../../assets/images/icon_notice2.png") no-repeat left center;
+  background: url("../../assets/images/icon_notice2.png") no-repeat left top 50%;
   background-size: auto 80%;
 }
 
@@ -376,18 +377,18 @@ const toPdfView = (url) =>{
 }
 
 .item-time {
-  float: right;
+  float: left;
   margin-right: 2%;
+  width: 98%;
   color: #c1bfbf;
   font-size: 0.3rem;
-  height: 0.75rem;
+  //height: 0.75rem;
-  line-height: 1rem;
+  //line-height: 1rem;
 }
 
 .item-title, .item-text {
   float: left;
-  width: calc(100% - 3.0rem);
+  width: 100%;
-  height: 0.75rem;
   font-size: 0.4rem;
   font-weight: 600;
   line-height: 0.75rem;
@@ -399,8 +400,12 @@ const toPdfView = (url) =>{
 .item-text {
   width: 100%;
   color: #999;
-  font-size: 0.4rem;
+  font-size: 0.35rem;
   font-weight: normal;
 }
 
+.item-text a {
+  color: #2b75fd;
+}
+
 </style>

src/views/enforce/userFilter.vue

@@ -18,7 +18,7 @@
         <div class="search-result">
           <div class="case-item" v-for="(item, index) in dataList" :key="index" @click="selectData(item)">
             <div class="case-title">姓名：{{ item.userName }}</div>
-            <div class="case-depart">电话：{{ item.phonenumber }}</div>
+            <!-- <div class="case-depart">电话：{{ item.phonenumber }}</div> -->
               <div class="case-time">执法证件号：{{ item.lawCertificateNum }}</div>
           </div>
     </div>