From 0deeb811977738066636feab9e539997656b7f7c Mon Sep 17 00:00:00 2001
From: zhaotianfeng <12345678>
Date: Fri, 20 Sep 2024 09:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/components/Service/index.vue       |  8 --------
 .../dai_yunyingfenxi/tab/paytype.vue             |  4 ++--
 fuintAdmin_zt/src/views/setting/app/index.vue    |  2 +-
 fuintAdmin_zt/src/views/setting/sysLog.vue       | 16 ++++++++--------
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
index 1a3f72f55..1015e7ca9 100644
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@@ -36,10 +36,6 @@
                 <div>油站联系方式：</div>
                 <div>{{ seeFrom.phone }}</div>
               </div>
-              <div class="threebox">
-                <div>油站ID：</div>
-                <div>{{ seeFrom.id }}</div>
-              </div>
               <div class="threebox">
                 <div>油站创建时间：</div>
                 <div>{{ parseTime(seeFrom.createTime) }}</div>
@@ -87,10 +83,6 @@
                     <el-input v-model="from.contact" autocomplete="off" style="width:220px"></el-input>
                   </el-form-item>
 
-                  <el-form-item label="油站ID"  :label-width="formLabelWidth">
-                       <span>{{ from.id }}</span>
-                  </el-form-item>
-
                 </el-col>
                 <el-col :span="10">
                   <el-form-item label="上传头像" prop="name" :label-width="formLabelWidth">
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 6ddc1bc5e..2153d8b95 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -49,8 +49,8 @@
           <div class="title_">{{ orderStatistics.storeId?orderStatistics.storeId:0 }}/{{orderStatistics.sumOil}}</div>
         </div>
         <div class="k_" id="k_2">
-          <div class="size_" >交易金额汇总数（万元）/交易笔数</div>
-          <div class="title_">{{ orderStatistics.payMoney?(orderStatistics.payMoney/10000).toFixed(4):0 }}/{{orderStatistics.count}}</div>
+          <div class="size_" >交易金额汇总数（元）/交易笔数</div>
+          <div class="title_">{{ orderStatistics.payMoney?(orderStatistics.payMoney).toFixed(2):0 }}/{{orderStatistics.count}}</div>
         </div>
         <div class="k_" id="k_3">
           <div class="size_">退款金额（元）/退款笔数</div>
diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue
index 80fd902b6..e529824be 100644
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@@ -147,8 +147,8 @@
           </el-switch>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
           <el-button @click="resetForm('deviceForm')">取消</el-button>
+          <el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
         </el-form-item>
       </el-form>
       <!--      </el-form>-->
diff --git a/fuintAdmin_zt/src/views/setting/sysLog.vue b/fuintAdmin_zt/src/views/setting/sysLog.vue
index 2106fddea..8a9bab34f 100644
--- a/fuintAdmin_zt/src/views/setting/sysLog.vue
+++ b/fuintAdmin_zt/src/views/setting/sysLog.vue
@@ -253,12 +253,7 @@ export default {
 
     },
     handleClick2() {
-      console.log("111111111111111")
-      if (this.activeindex == 0){
-        this.queryParams.systemName ='1'
-      }else {
-        this.queryParams.systemName ='2'
-      }
+
 
       this.queryParams = {
         page: 1,
@@ -266,14 +261,19 @@ export default {
           bannerName:'',
           systemPosition:'',
           bannerStatus:'',
-      },
-
+      }
+      if (this.activeindex == 0){
+        this.queryParams.systemName ='1'
+      }else {
+        this.queryParams.systemName ='2'
+      }
 
       this.getList()
 
     },
     getList(){
       this.queryParams.current = this.queryParams.page
+      console.log('请求参数',this.queryParams)
       getListApi(this.queryParams).then(res=>{
         this.tableData = res.data.records;
         this.total = res.data.total