From dc552e4c48a66d4c8ef49a2257a24312c8e045dc Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Wed, 23 Oct 2024 09:56:07 +0800
Subject: [PATCH] 10.22

---
 fuintAdmin_zt/src/views/Site/index.vue        | 55 ++++++++-----------
 .../src/views/components/Service/index.vue    | 36 +++++-------
 .../src/views/components/Service/payment.vue  | 23 +++++---
 .../dai_yunyingfenxi/tab/paym.vue             |  4 +-
 .../dai_yunyingfenxi/tab/paytype.vue          |  4 +-
 .../src/views/homeComponents/agent.vue        | 16 +++---
 6 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index f86c35daf..a79a4a8f8 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -628,15 +628,22 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="用户名" prop="accountName">
-              <el-input v-model="form.accountName" placeholder="请输入用户名" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
+            <el-form-item label="用户姓名" prop="realName">
+              <el-input v-model="form.realName" placeholder="请输入用户姓名" maxlength="30" autocomplete="off"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="50" autocomplete="off" />
+            <el-form-item label="联系方式" prop="mobile">
+              <el-input v-model="form.mobile" placeholder="请输入用户的联系方式" maxlength="50" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="登录账号" prop="accountName">
+              <el-input v-model="form.accountName" placeholder="请输入" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -651,36 +658,11 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item v-if="form.id == undefined" label="确认密码" prop="password1">
-              <el-input v-model="form.password1" placeholder="请输入确认密码" type="password" maxlength="30" show-password autocomplete="off"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         </template>
 
         <el-row>
           <el-col :span="24">
-            <el-form-item label="真实姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入真实姓名" maxlength="30" autocomplete="off"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.accountStatus" @change="$forceUpdate()">
-                <el-radio :key=1 :label=1 :value=1>启用</el-radio>
-                <el-radio :key=0 :label=0 :value=0>禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="分配角色" prop="roleIds">
+            <el-form-item label="用户角色" prop="roleIds">
               <el-select v-model="form.roleIds"  @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色">
                 <el-option
                   v-for="item in rolelist"
@@ -689,12 +671,23 @@
                   :value="item.dutyId"
                 ></el-option>
               </el-select>
-              <div v-if="!rolelist || rolelist.length==0" style="color: red;font-size: 12px">请先为当前机构添加角色信息</div>
+              <!-- <div v-if="!rolelist || rolelist.length==0" style="color: red;font-size: 12px">请先为当前机构添加角色信息</div> -->
 
             </el-form-item>
           </el-col>
         </el-row>
 
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="角色状态">
+              <el-radio-group v-model="form.accountStatus" @change="$forceUpdate()">
+                <el-radio :key=1 :label=1 :value=1>启用</el-radio>
+                <el-radio :key=0 :label=0 :value=0>禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
index 1015e7ca9..0e9d0c3b3 100644
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@@ -71,20 +71,14 @@
 
           </div>
         </div>
-        <el-dialog title="编辑油站" class="d-dialog"  :visible.sync="editDialog" width="1000px" style="padding-right: 10px;">
+        <el-dialog title="编辑油站" class="d-dialog"  :visible.sync="editDialog" width="700px" style="padding-right: 10px;">
           <el-form :model="from" ref="form" :rules="rules">
             <el-row>
                 <el-col :span="10">
                   <el-form-item label="油站名称" prop="name" :label-width="formLabelWidth">
-                    <el-input v-model="from.name" autocomplete="off" style="width:220px"></el-input>
+                    <el-input v-model="from.name" autocomplete="off" style="width:500px"></el-input>
                   </el-form-item>
 
-                  <el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth">
-                    <el-input v-model="from.contact" autocomplete="off" style="width:220px"></el-input>
-                  </el-form-item>
-
-                </el-col>
-                <el-col :span="10">
                   <el-form-item label="上传头像" prop="name" :label-width="formLabelWidth">
                   <el-upload
                       :action="uploadAction"
@@ -104,12 +98,16 @@
                   </el-upload>
                    </el-form-item>
 
+                  <el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth" placeholder="请输入油站负责人">
+                    <el-input v-model="from.contact" autocomplete="off" style="width:500px"></el-input>
+                  </el-form-item>
+
                 </el-col>
             </el-row>
             <el-row>
                 <el-col :span="10">
-                  <el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth">
-                    <el-input v-model="from.phone" autocomplete="off" style="width:220px"></el-input>
+                  <el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth" placeholder="请输入联系方式">
+                    <el-input v-model="from.phone" autocomplete="off" style="width:500px"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="10">
@@ -119,16 +117,14 @@
               <el-col :span="10">
                 <el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth">
                   <el-input
-                  style="width:220px"
+                    style="width:500px"
                     type="textarea"
                     :rows="2"
-                    placeholder="请输入地址"
+                    placeholder="请输入店铺地址"
                     v-model="from.address">
                   </el-input>
                 </el-form-item>
 
-              </el-col>
-              <el-col :span="10">
                 <el-form-item label="油站状态" prop="status" :label-width="formLabelWidth">
                   <el-tooltip class="item" effect="dark" content="油站状态在组织架构中设置" placement="top-start">
 
@@ -141,11 +137,12 @@
                     ></el-switch>
                   </el-tooltip>
                 </el-form-item>
+
               </el-col>
             </el-row>
             <el-row>
               <el-col  :span="6">
-                <el-form-item label="上传营业执照" prop="name" :label-width="formLabelWidth">
+                <el-form-item label="营业执照" prop="name" :label-width="formLabelWidth">
                   <el-upload
                       :action="uploadAction"
                       list-type="picture-card"
@@ -163,11 +160,8 @@
                     <i v-if="!this.from.license"  class="el-icon-plus"></i>
                   </el-upload>
                 </el-form-item>
-              </el-col>
 
-
-              <el-col :span="18">
-                <el-form-item label="上传经营照" prop="name" :label-width="formLabelWidth">
+                <el-form-item label="经营照" prop="name" :label-width="formLabelWidth">
                   <el-upload
                     :action="uploadAction"
                       list-type="picture-card"
@@ -177,7 +171,7 @@
                       :auto-upload="true"
                       :on-preview="handlePictureCardPreview"
                       :on-success="handleUploadSuccessGift"
-                      style="height: 100px;"
+                      style="width: 700px; flex-wrap: wrap;"   
                       :on-remove="handleRemove"
                       :before-upload="beforeUpload"
                         >
@@ -188,7 +182,7 @@
                   </el-dialog>
                 </el-form-item>
               </el-col>
-
+ 
             </el-row>
           </el-form>
           <div slot="footer" class="dialog-footer">
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index 1e790f082..c9cf3d47f 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -249,15 +249,22 @@
         <el-button type="primary" @click="submitMerchant">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="Ruletitle" :visible.sync="addRule">
+    <el-dialog :title="Ruletitle" :visible.sync="addRule" width="60%">
       <el-form :model="formRule" ref="formRule" :rules="rules">
-        <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
-          <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
-        </el-form-item>
-        <el-form-item label="规则描述" :label-width="formLabelWidth">
-          <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
-                    style="width: 350px"></el-input>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
+              <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规则描述" :label-width="formLabelWidth">
+              <el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off" 
+                      style="width: 350px"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
         <el-form-item label="规则类型" :label-width="formLabelWidth" prop="ruleType">
           <div style="display: flex">
             <div class="xz_box" :class=" {'active' : formRule.ruleType == 1 } " @click="formRule.ruleType = 1"><i
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
index 63492d8c5..a02bb2872 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
@@ -1,6 +1,6 @@
 <!-- 支付通道分析-->
 <template>
-  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+  <div style="padding-top: 15px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
     <div class="card-change2-1" style="" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s" style="margin-bottom: 0px;justify-content: space-between">
@@ -56,7 +56,7 @@
         </div>
       </div>
     </div>
-    <div class="card-change-1" style="min-height: 500px;" shadow="never">
+    <div class="card-change-1" style="min-height: 500px; margin-top: 20px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
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 88348c33f..a036e541c 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+  <div style="padding-top: 15px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
     <div class="card-change2" style="margin-left: 20px; padding-top: 0px;padding-bottom: 5px" shadow="never" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="justify-content: space-between">
@@ -62,7 +62,7 @@
         </div>
       </div>
     </div>
-    <div class="card-change"  style="min-height: 500px; margin-left: 20px;margin-top: 4px" shadow="never">
+    <div class="card-change"  style="min-height: 500px; margin-left: 20px;margin-top: 20px" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 009302168..41848b176 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -57,8 +57,8 @@
           <div style="margin-right: 40px">
             <el-date-picker
               v-model="value1"
-              type="datetimerange"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -123,7 +123,7 @@
       </div>
       <div class="right-box-t">
 <!--        <div class="h-tt" >硬件设备</div>-->
-        <div class="title_">
+        <div class="title_" style="margin-top: -10px;">
           <div>硬件设备</div>
           <div style="font-size: 12px;color: #BBBBBB;display: flex;align-items: center">
             <el-popover
@@ -147,7 +147,7 @@
             <div class="r-img">
               <img :src="imagePath + item.image" style="width: 84px;height: 70px">
             </div>
-            <div>{{ item.name }}</div>
+            <div style="font-size: 14px;">{{ item.name }}</div>
           </div>
         </div>
 
@@ -161,9 +161,9 @@
         </div>
         <el-date-picker
           v-model="value2"
-          type="datetimerange"
+          type="daterange"
           range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :disabled="disabled"
@@ -258,7 +258,7 @@ export default {
   },
   methods:{
     goRoute(){
-      this.$router.push("system/notify/index")
+      this.$router.push("system/notify/page/getNotify")
     },
     getNoticeList(){
       getNotificationlogList({pageNo: 1, pageSize: 4,sentTo:this.accountId}).then(res => {
@@ -775,7 +775,7 @@ export default {
   text-align: center;
 }
 .r-size{
-  font-size: 14px;
+  font-size: 16px;
   color: #FFFFFF;
 }
 .title_{