Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/surface/windowskin/WindowSkin.vue

@@ -18,16 +18,13 @@
         <div class="header flex aic jcc">
           <img src="../../../../assets/img/logo.png" />
           <div>
-            <h1 :style="{ color: filterItem('2', 0) }">政务服务中心</h1>
+            <h1 :style="{ color: filterItem('7', 0) }">政务服务中心</h1>
           </div>
         </div>
-        <div
-          class="call-out flex aic"
-          :style="{ background: filterItem('8', 0) }"
-        >
+        <div class="call-out flex aic">
           <div class="call-out-now flex flexc aic jcb">
             <p class="call-out-title">正在办理</p>
-            <p class="call-out-now-code" :style="{ color: filterItem('7', 0) }">
+            <p class="call-out-now-code" :style="{ color: filterItem('8', 0) }">
               A001
             </p>
           </div>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/logService/Service.vue

@@ -135,7 +135,7 @@ export default {
         query: {
           logDateStart: this.BegindAndEndTime[0],
           logDateEnd: this.BegindAndEndTime[1],
-          siteId: this.siteId,
+          // siteId: this.siteId,
           content: `%${this.searchName}%`,
         },
       });
@@ -146,8 +146,6 @@ export default {
         this.tableSourceData = result;
         this.total = total;
       }
-
-      console.log(res);
     },
     changePagination(cur) {
       this.current = cur;