Merge remote-tracking branch 'origin/master'

src/components/RouterSearch/index.vue

@@ -24,6 +24,7 @@
       filterable
       :reserve-keyword="false"
       remote
+      size="default"
       placeholder="请输入菜单内容"
       :remote-method="remoteMethod"
       class="overflow-hidden transition-all-600"
@@ -66,7 +67,7 @@ const options = computed(() => {
   })
   return list.map((item) => {
     return {
-      label: `${item.meta.title}${item.path}`,
+      label: `${item.meta.title}`,
       value: item.path
     }
   })

src/layout/components/ToolHeader.vue

@@ -9,7 +9,7 @@ import RouterSearch from '@/components/RouterSearch/index.vue'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
 
-const { getPrefixCls, variables } = useDesign()
+const {  variables } = useDesign()
 
 
 const appStore = useAppStore()

src/store/modules/app.ts

@@ -68,7 +68,7 @@ export const useAppStore = defineStore('app', {
       layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
       // isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
       isDark: false, // 是否是暗黑模式
-      currentSize: wsCache.get('default') || 'default', // 组件尺寸
+      currentSize: wsCache.get('default') || 'large', // 组件尺寸
       theme: {
         elColorPrimary: '#409eff',
         leftMenuBorderColor: '#eee',

src/views/Home/Index.vue

@@ -6,7 +6,6 @@
           <el-select
             v-model="queryParams.region"
             placeholder="请选择区域"
-            size="large"
             @change="getData"
           >
             <el-option
@@ -22,7 +21,6 @@
             v-model="queryParams.selectWeek"
             placeholder="请选择周期"
             clearable
-            size="large"
             @select="getData"
             @change="getData"
           >
@@ -36,7 +34,7 @@
         </el-form-item>
       </el-form>
     </el-col>
-    <section class="flex gap-20px">
+    <section class="flex gap-20px items-center mb-20px">
       <el-button type="primary" plain @click="getData">
         <Icon icon="ep:search" />
         查询
@@ -87,11 +85,15 @@
             <div
               v-for="(item, index) in tasks"
               :key="`dynamics-${index}`"
-              class="text-15px flex justify-between"
+              class="text-15px flex gap-40px flex-nowrap"
             >
-              <span class="color-#303133">{{ item.title }}</span>
-              <span class="color-#606266">{{ item.deptName }}</span>
-              <span class="color-#909399">{{ formatDate(item.startDate, 'YYYY年M月D日') }}</span>
+              <div class="color-#303133 flex-1 whitespace-nowrap text-ellipsis overflow-hidden">
+                {{ item.title }}
+              </div>
+              <div class="color-#606266 w80px text-right">{{ item.deptName }}</div>
+              <div class="color-#909399 w140px text-right">
+                {{ formatDate(item.startDate, 'YYYY年M月D日') }}
+              </div>
             </div>
             <el-empty v-if="tasks.length == 0" />
           </section>
@@ -106,10 +108,13 @@
             <div
               v-for="(item, index) in notice1"
               :key="`dynamics-${index}`"
-              class="text-15px flex justify-between"
+              class="text-15px flex gap-40px flex-nowrap"
             >
-              <span class="color-#303133">{{ item.name }}</span>
-              <span class="color-#909399">{{ item.count }}次</span>
+              <div class="color-#303133 flex-1 whitespace-nowrap text-ellipsis overflow-hidden">
+                {{ item.name }}
+              </div>
+              <div class="color-#606266 w80px text-right">{{ item.deptName }}</div>
+              <div class="color-#909399 w140px text-right">{{ item.count }}次</div>
             </div>
             <el-empty v-if="notice1.length == 0" />
           </section>
@@ -124,10 +129,13 @@
             <div
               v-for="(item, index) in notice2"
               :key="`dynamics-${index}`"
-              class="text-15px flex justify-between"
+              class="text-15px flex gap-40px flex-nowrap"
             >
-              <span class="color-#303133">{{ item.name }}</span>
-              <span class="color-#909399">{{ item.count }}天</span>
+              <div class="color-#303133 flex-1 whitespace-nowrap text-ellipsis overflow-hidden">
+                {{ item.name }}
+              </div>
+              <div class="color-#606266 w80px text-right">{{ item.realName }}</div>
+              <div class="color-#909399 w140px text-right">{{ item.count }}次</div>
             </div>
             <el-empty v-if="notice2.length == 0" />
           </section>
@@ -170,7 +178,7 @@ const pieOptionsData = ref({
   series: {
     name: '任务进度',
     type: 'pie',
-    radius: ['60%', '80%'],
+    radius: ['55%', '80%'],
     center: ['50%', '50%'],
     itemStyle: {
       borderColor: '#fff',
@@ -183,6 +191,7 @@ const pieOptionsData = ref({
         }
         return ''
       },
+      fontSize: 13,
       padding: [0, 0, 15, 0],
       distanceToLabelLine: 0,
       rich: {
@@ -323,8 +332,8 @@ const barOptionsData = ref({
       type: 'pictorialBar',
       symbol: 'rect',
       symbolPosition: 'end',
-      symbolSize: [20,5],
-	    symbolOffset: [13, -1],
+      symbolSize: [20, 5],
+      symbolOffset: [13, -1],
       barWidth: 20,
       itemStyle: {
         color: 'rgba(103, 194, 58, 1)'
@@ -399,7 +408,7 @@ const lineOptionsData = ref({
   },
   series: [
     {
-      name: '任务数',
+      name: '任务数量',
       data: [13253, 34235, 26321, 12340, 24643],
       type: 'line',
       smooth: true,
@@ -414,7 +423,7 @@ const lineOptionsData = ref({
       }
     },
     {
-      name: '执法数',
+      name: '执法数量',
       data: [15678, 28943, 31452, 19876, 22345],
       type: 'line',
       smooth: true,