Merge branch 'zq-routerShort-06-15' of gitea.intra.yunpaper.com:zhangqi/kuailelunwen_new_houtai into zq-routerShort-06-15

src/components/SliderMenu.vue

@@ -32,7 +32,7 @@
           <el-menu-item v-else :index="item.index"  :key="item.index" @click="handleSelect(item.index, [item.index], item)">
               <div class="flex">
                 <SvgIcon1 :iconPath="require(`@/assets/menu/${item.icon}.svg`)" defaultColor="#8A9099"
-                  activeColor="#006AFF" :isActive="item.index == currentMenuItem?.index" />
+                  activeColor="#006AFF" :isActive="item.index == currentMenuItem && currentMenuItem[index]" />
                 <span class="title_text" slot="title">{{ item.title }}</span>
               </div>
           </el-menu-item>

src/style/theme/index.css

@@ -4328,7 +4328,7 @@ border-color:#006AFF !important;
     color: #1e2226
 }
 
-.el-menu-item:focus,
+/* .el-menu-item:focus, */
 .el-menu-item:hover {
     outline: 0;
     background-color: #e6f0ff
@@ -4386,7 +4386,7 @@ border-color:#006AFF !important;
     color: #1e2226
 }
 
-.el-submenu__title:focus,
+/* .el-submenu__title:focus, */
 .el-submenu__title:hover {
     outline: 0;
     background-color: #e6f0ff
@@ -12530,15 +12530,17 @@ border-color:#006AFF !important;
     vertical-align: middle;
     float: left;
     font-size: 14px;
-    color: #1e2226;
+    color: #626573;
     line-height: 18px;
     white-space: nowrap;
     padding: 0 12px 0 0;
     -webkit-box-sizing: border-box;
-    box-sizing: border-box
+    box-sizing: border-box;
+    letter-spacing: 0.08em;
 }
 .column .el-form-item__label{
     margin-bottom: 12px;
+    color: #1e2226;
 }
 .el-form-item__content {
     line-height: 40px;

src/views/agent/checkOrderList.vue

@@ -45,7 +45,7 @@
         <div class="elementWrap mb-10">
             <el-form>
                 <div class="flex-between operateBtns">
-                    <b>筛选及导出列表</b>
+                    <b class="checktitle">筛选及导出列表</b>
                     <div class="flex gap24">
                         <GuipButton size="table" type="ignore" @click="resetSearchParams">清空</GuipButton>
                         <GuipButton size="table" type="system" @click="getFilterParams">筛选</GuipButton>
@@ -53,19 +53,19 @@
                     </div>
                 </div>
                 <div class="flex">
-                    <p class="mr-12">时间范围</p>
+                    <p class="mr-12 noWrap">时间范围</p>
                     <el-date-picker class="mr-32" v-model="searchDate" type="daterange" range-separator="至"
-                        start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                        start-placeholder="开始日期" end-placeholder="结束日期" style="min-width:210px;flex:1"  format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                     </el-date-picker>
 
-                    <GuipSelect class="mr-32" label="服务类型" v-model="searchType" @change="changeSearchType()"
+                    <GuipSelect class="mr-32" label="服务类型" v-model="searchType" style="flex:1;min-width: 150px;" @change="changeSearchType()"
                         :options="searchTypeList" :extraItem="{ label: '全部', value: '0' }" placeholder="" clearable />
 
-                    <GuipSelect class="mr-32" label="站点" v-model="searchUid" @change="changeSearchSite()"
+                    <GuipSelect class="mr-32" label="站点" v-model="searchUid" @change="changeSearchSite()" style="flex:1;min-width: 150px;"
                         :options="searchSiteList" valueKey="uid" labelKey="name" :extraItem="{ label: '全部', value: '0' }"
                         placeholder="" clearable />
 
-                    <GuipSelect class="mr-32" width="100px" label="报告状态" v-model="searchStatus"
+                    <GuipSelect class="mr-32" label="报告状态" v-model="searchStatus" style="flex:1;min-width: 120px;" 
                         @change="changeSearchStatus()" :options="searchStatusList"
                         :extraItem="{ label: '全部', value: 'all' }" placeholder="不限" clearable />
                 </div>
@@ -151,13 +151,13 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="title" label="标题" v-else-if="pageTab == 'ai'" min-width="200px">
-                            <template slot-scope="scope">
+                            <!-- <template slot-scope="scope">
                                 <div class="flex">
                                     <GuipToolTip :content="scope.row.title">
                                         <p>{{ scope.row.title }}</p>
                                     </GuipToolTip>
                                 </div>
-                            </template>
+                            </template> -->
                         </el-table-column>
 
 
@@ -800,6 +800,10 @@ export default {
     margin-left: 0 !important;
     transform: none !important;
 }
+.noWrap{
+    white-space: nowrap;
+    color: #626573;
+}
 
 .wh-16 {
     width: 16px;