From 465674f7f94c38fb25e2029a2b65830aaeaa190f Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 23 Nov 2022 22:29:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/App.vue                              |  4 ++--
 back/src/assets/scss/common.scss              | 23 +++++++++++++++++++
 .../views/modules/abilityStatistics/index.vue |  9 +++-----
 back/src/views/modules/assetReport/index.vue  |  9 ++++----
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/back/src/App.vue b/back/src/App.vue
index a3ce4034..36cb8b9d 100644
--- a/back/src/App.vue
+++ b/back/src/App.vue
@@ -26,7 +26,7 @@
     min-width: 80px !important;
     border-radius:2px !important;  
   } */
-  .el-button--primary {
+  /* .el-button--primary {
     vertical-align: middle !important;
     align-items: center !important;
     display: inline-flex !important;
@@ -35,7 +35,7 @@
     justify-content: center !important;
     min-width: 80px !important;
     border-radius:2px !important;  
-  } 
+  }  */
 </style>
 <script>
 import Cookies from 'js-cookie'
diff --git a/back/src/assets/scss/common.scss b/back/src/assets/scss/common.scss
index c0d15e50..e6f34ebd 100644
--- a/back/src/assets/scss/common.scss
+++ b/back/src/assets/scss/common.scss
@@ -138,6 +138,28 @@ img {
   color: $--color-text-secondary;
 }
 // 按钮
+.el-button--primary {
+  border-radius: 2px;
+  // vertical-align: middle !important;
+  // align-items: center !important;
+  // display: inline-flex !important;
+  // height:32px !important;
+  // line-height: 32px !important;
+  // justify-content: center !important;
+  // min-width: 80px !important;
+  // border-radius:2px !important;  
+} 
+// .el-button--primary {
+//   vertical-align: middle !important;
+//   align-items: center !important;
+//   display: inline-flex !important;
+//   height:32px !important;
+//   line-height: 32px !important;
+//   justify-content: center !important;
+//   min-width: 80px !important;
+//   border-radius:2px !important;  
+// } 
+
 .aui-button--dashed {
   border-style: dashed;
   &:focus,
@@ -253,6 +275,7 @@ img {
 }
 
 
+
 /* Navbar
 ------------------------------ */
 .aui-navbar {
diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 4dfd21b6..0cfe9548 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -1206,16 +1206,13 @@ input::placeholder {
 }
 
 .export {
-  margin-top: 6px;
   display: inline-block;
   width: 80px;
-  height: 32px;
-  line-height: 32px;
+  height: 40px;
+  line-height: 40px;
   text-align: center;
-  border-radius: 2px;
+  border-radius: 4px;
   background: #fff;
-  border: 2px solid #dcdfe6;
-  color: #000;
   color: #fff;
   background-color: #0058e1;
   border-color: #0058e1;
diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index 45758cca..87ac76dc 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -348,15 +348,14 @@ export default {
   width: 400px;
 }
 .export {
-  margin-top: 6px;
+  /* margin-top: 6px; */
   display: inline-block;
   width: 80px;
-  height: 32px;
-  line-height: 32px;
+  height: 40px;
+  line-height: 40px;
   text-align: center;
-  border-radius: 2px;
+  border-radius: 4px;
   background: #fff;
-  border: 2px solid #dcdfe6;
   color: #000;
   color: #fff;
   background-color: #0058e1;

From d636f949b3da87fc3b596eb2b7a360d0c5776907 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Wed, 23 Nov 2022 22:30:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/assetReport/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index 87ac76dc..f3a385e8 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -348,7 +348,6 @@ export default {
   width: 400px;
 }
 .export {
-  /* margin-top: 6px; */
   display: inline-block;
   width: 80px;
   height: 40px;

From cdfd3fdb1cc14beecc7cf16b69295809f164ec16 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Thu, 24 Nov 2022 09:07:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/abilityStatistics/index.vue | 86 ++++++++-----------
 back/src/views/modules/assetReport/index.vue  | 81 ++++++++---------
 2 files changed, 75 insertions(+), 92 deletions(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 0cfe9548..5978155a 100644
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@@ -3,10 +3,15 @@
     <div class="container">
 <!--能力上架统计1 能力使用统计 2-->
       <el-form :inline="true" v-if="this.departmentId === 1 || this.departmentId === 2">
-        <a-row>
+        <!--日期-->
+        <el-form-item>
+          <span>日期：</span>
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
          
-         <!--上架部门-->
-         <a-col :span="8">
+         <!--上架部门-->  
         <el-form-item>
           <span v-if="this.departmentId === 1 ">上架部门：</span>
           <span v-else>申请部门：</span>
@@ -16,16 +21,7 @@
               v-bind="item"></el-option>
           </el-select>
         </el-form-item>
-        </a-col>
-        <a-col :span="8">
-        <el-form-item>
-          <span>日期：</span>
-          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </el-form-item>
-        </a-col>
-        <a-col :span="8">
+
               <!--操作按钮查询-->
          <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -39,16 +35,20 @@
         <!-- 导出 -->
         <a class='export'
           :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
-        </a-col>
-        </a-row>
       </el-form>
   
       <!--能力上架明细3 能力使用明细 4-->
-        <el-form  :inline="true"  v-else>
-        <a-row>
+      <div v-else> 
+        <el-form  :inline="true"  >
+          <!--日期-->
+          <el-form-item>
+          <span>日期：</span>
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
         
         <!--审核状态-->
-        <a-col :span="6">
         <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
           <span>审核状态：</span>
           <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
@@ -58,9 +58,7 @@
             <el-option label="不通过" value="2"></el-option>
           </el-select>
         </el-form-item>
-        </a-col>
            <!--上架部门-->
-           <a-col :span="6">
         <el-form-item>
           <span v-if=" this.departmentId === 3">上架部门：</span>
           <span v-else>申请部门：</span>
@@ -70,22 +68,23 @@
               v-bind="item"></el-option>
           </el-select>
         </el-form-item>
-        </a-col>
+  
          <!--能力使用统计明细--添加提供部门-->
         
-        <a-col :span="12">
-        <el-form-item>
-          <span>日期：</span>
-          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-          </el-date-picker>
+         <el-form-item v-if=" this.departmentId === 4">
+          <span >提供部门：</span>
+          <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
+              v-bind="item"></el-option>
+          </el-select>
         </el-form-item>
-        </a-col> 
-      </a-row>
+        </el-form>
+      
+      
+  
+        <el-form :inline="true" >
         <!--资源类型-->
-        <a-row>
-          
-          <a-col :span="6">
         <el-form-item >
           <span>资源类型：</span>
           <el-select  @change="changeIiem" v-if="this.departmentId === 4"   v-model="abilityType" placeholder="请选择资源类型" clearable>
@@ -101,25 +100,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        </a-col>
+
         <!--资源名称 仅明细添加-->
-        <a-col :span="6">
+
         <el-form-item >
           <span>资源名称：</span>
           <el-input style="width:70%;"  v-model="resourceName" placeholder="请输入资源名称" clearable></el-input>
         </el-form-item>
-    </a-col>
-    <a-col :span="6">
-        <el-form-item v-if=" this.departmentId === 4">
-          <span >提供部门：</span>
-          <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
-            <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in provideSelects" :key="item.label" :label="item.label" :value="item.value"
-              v-bind="item"></el-option>
-          </el-select>
-        </el-form-item>
-        </a-col>  
-    <a-col :span="12">
+
               <!--操作按钮查询-->
          <el-form-item>
           <el-button type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -133,10 +121,10 @@
         <!-- 导出 -->
         <a class='export'
           :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
-        </a-col>
-    </a-row>
+        </el-form> 
+  </div>
+
 
-  </el-form> 
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
      
diff --git a/back/src/views/modules/assetReport/index.vue b/back/src/views/modules/assetReport/index.vue
index f3a385e8..7b83a55a 100644
--- a/back/src/views/modules/assetReport/index.vue
+++ b/back/src/views/modules/assetReport/index.vue
@@ -30,10 +30,23 @@
       </div>
     </div>
     <el-form :inline="true">
-      <a-row>
+       <!--日期-->
+      <el-form-item>
+        <span>日期：</span>
+        <el-date-picker
+          v-model="dateList"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
       
       <!--提供部门 传id-->
-      <a-col :span="6">
+
       <el-form-item>
         <span>提供部门：</span>
         <el-select
@@ -52,9 +65,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-</a-col>
+
       <!--申请部门 传汉字-->
-      <a-col :span="6">
+   
       <el-form-item>
         <span>申请部门：</span>
         <el-select
@@ -73,28 +86,9 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      </a-col>
-      <a-col :span="12">
-      <el-form-item>
-        <span>日期：</span>
-        <el-date-picker
-          v-model="dateList"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        >
-        </el-date-picker>
-      </el-form-item>
-     </a-col>
-      <!--类型-->
-      
-    </a-row>
-    <a-row>
-      <!--名称-->
-      <a-col :span="6">
+    
+  
+      <!--资源类型-->
         <el-form-item>
         <span>资源类型：</span>
         <el-select
@@ -114,19 +108,11 @@
           </el-option>
         </el-select>
       </el-form-item>
-      </a-col>
-        <a-col :span="6">
-      <el-form-item>
-        <span>资源名称：</span>
-        <el-input
-          style="width: 70%"
-          v-model="dataForm.resourceName"
-          placeholder="请输入资源名称"
-          clearable
-        ></el-input>
-      </el-form-item>
-        </a-col>
-        <a-col :span="6">
+      </el-form>
+  
+
+      <el-form :inline="true">
+    <!--审核状态-->
       <el-form-item>
         <span>审核状态：</span>
         <el-select v-model="dataForm.applyResult" placeholder="请选审核状态" clearable>
@@ -135,8 +121,17 @@
             <el-option label="审核中" value="审核中"></el-option>  
           </el-select>
       </el-form-item>
-        </a-col>
-        <a-col :span="6">
+        <!--资源名称-->
+        <el-form-item>
+        <span>资源名称：</span>
+        <el-input
+          style="width: 70%"
+          v-model="dataForm.resourceName"
+          placeholder="请输入资源名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+    
        <!--操作按钮查询-->
        <el-form-item>
         <el-button type="primary" @click="init()">{{
@@ -160,10 +155,10 @@
         "
         >导出全部</a
       >
-        </a-col>
-        </a-row>
+      
     </el-form>
     
+    
 
     <div class="mod-activiti__process">
       <el-table