From f5f2d8089ab7d292401af3b76dc27fe7e444d294 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 15:21:09 +0800
Subject: [PATCH] 字体

---
 src/views/system/monitor/car/index.vue |  339 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 215 insertions(+), 124 deletions(-)

diff --git a/src/views/system/monitor/car/index.vue b/src/views/system/monitor/car/index.vue
index 596da1f..d5fe796 100644
--- a/src/views/system/monitor/car/index.vue
+++ b/src/views/system/monitor/car/index.vue
@@ -1,37 +1,42 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card" >
+    <div
+      style="display: flex;flex-direction: row;min-width: 300px;max-width: 300px;margin-bottom: 5px;border-radius: 1px; user-select: none"
+    >
+      <div @click="clickTab(null)" class="tab"
+           :class="{tabActive: !queryParams.provinceTag && !queryParams.deptTag, tabInactive: queryParams.provinceTag || queryParams.deptTag}">鍏ㄩ儴
+      </div>
+      <div @click="clickTab(0)" class="tab"
+           :class="{tabActive: queryParams.provinceTag, tabInactive: !queryParams.provinceTag}">鐪佸巺鑰冩牳
+      </div>
+      <div @click="clickTab(1)" class="tab"
+           :class="{tabActive: queryParams.deptTag, tabInactive: !queryParams.deptTag}">鍏畨閮ㄨ�冩牳
+      </div>
+    </div>
+    <el-card class="box-card">
       <el-row type="flex" align="middle" justify="space-between">
-        <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
-          <div class="icon-container" style="background-color: #5599F7">
+        <el-col :span="4">
+          <div class="icon-container" style="background-color: #1890FF">
             <i class="el-icon-truck"></i>
           </div>
         </el-col>
-        <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
+        <el-col :span="20">
           <div class="dashboard">
             <div class="dashboard-item">
               <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
-              <p>璁惧鎬绘暟</p >
+              <p>璁惧鎬绘暟</p>
             </div>
             <div class="dashboard-item">
               <h3 style="color: #3eba45">{{ count.totalMembers }}</h3>
-              <p>姝e父鏁�</p >
+              <p>姝e父鏁�</p>
             </div>
             <div class="dashboard-item">
               <h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
-              <p>寮傚父鏁�</p >
-            </div>
-            <div class="dashboard-item">
-              <h3>{{ count.totalViews }}</h3>
-              <p>鐢熸垚寮傚父宸ュ崟鏁�</p >
-            </div>
-            <div class="dashboard-item">
-              <h3>{{ count.totalCar }}</h3>
-              <p>杩囪溅鏁版嵁鎬婚噺</p >
+              <p>寮傚父鏁�</p>
             </div>
             <div class="dashboard-item">
               <h3>{{ count.viewsPercentage }}%</h3>
-              <p>璁惧杩愯鐜�</p >
+              <p>璁惧杩愯鐜�</p>
             </div>
           </div>
         </el-col>
@@ -52,15 +57,14 @@
           v-model="queryParams.address"
           placeholder="璇烽�夋嫨鍖哄煙"
           clearable
+          @change="handleQuery"
         >
-        <el-option label="鑷础甯�" value="鑷础甯�"/>
-        <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
-        <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
-        <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
-        <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
-        <el-option label="楂樻柊鍖�" value="楂樻柊鍖�"/>
-        <el-option label="鑽e幙" value="鑽e幙"/>
-        <el-option label="瀵岄『鍘�" value="瀵岄『鍘�"/>
+          <el-option
+            v-for="dept in deptList"
+            :key="dept.deptId"
+            :label="dept.area"
+            :value="dept.deptId"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="璁惧鐘舵��" prop="onState">
@@ -70,79 +74,81 @@
           clearable
           style="width: 100px"
         >
-        <el-option
-          v-for="dict in dict.type.camera_state"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
+          <el-option
+            v-for="dict in dict.type.camera_state"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
-       <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟" prop="defaultOrder" label-width="130px">
-         <el-select
-           v-model="queryParams.defaultOrder"
-           placeholder="鏄惁鐢熸垚寮傚父宸ュ崟"
-           clearable
-           style="width: 170px"
-         >
-         <el-option
-           v-for="dict in dict.type.platform_yes_no"
-           :key="dict.value"
-           :label="dict.label"
-           :value="dict.value"
-         />
-         </el-select>
-        </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:monitor:export']"
-        >瀵煎嚭</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" align="center" />
       <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed show-overflow-tooltip/>
       <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
-      <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/>
-      <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible"/>
+      <el-table-column label="ip" align="center" prop="ip" width="180"/>
+      <el-table-column label="鏍囩" align="center" width="180" v-if="columns[0].visible">
+        <template slot-scope="scope">
+          <div>
+            {{
+              (
+                (scope.row.provinceTag ? '鐪佸巺銆�' : '') +
+                (scope.row.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
+            }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="鍖哄煙" align="center" prop="area" width="180" v-if="columns[1].visible"/>
       <el-table-column label="璁惧鐘舵��" align="center" prop="onState" v-if="columns[2].visible">
-      <template slot-scope="scope">
-        <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
-      </template>
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
+        </template>
       </el-table-column>
-      <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180" v-if="columns[3].visible">
-      <template slot-scope="scope">
-        <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
-      </template>
+      <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="error" width="180" v-if="columns[3].visible"/>
+      <el-table-column label="绠$悊鍗曚綅" align="center" prop="unitName" width="180" v-if="columns[4].visible"/>
+      <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="mongoCreateTime" width="180" v-if="columns[5].visible"/>
+      <el-table-column label="涓�鏈轰竴妗g姸鎬�" align="center" prop="monitorQualify" width="180" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <div>{{ scope.row.monitorQualify ? "姝e父" : "寮傚父" }}</div>
+        </template>
       </el-table-column>
-      <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
-      <el-table-column label="绠$悊鍗曚綅" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
-      <el-table-column label="杩囪溅鏁版嵁閲�" align="center" prop="a" width="180" v-if="columns[6].visible"/>
-      <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="a" width="180" v-if="columns[7].visible"/>
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"  fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="handleView(scope.row,scope.index)"
-            >璇︾粏</el-button>
-          </template>
+      <el-table-column label="鏄惁涓烘湭娉ㄥ唽璁惧" align="center" prop="newMonitor" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <div>{{ scope.row.newMonitor ? "鏄�" : "鍚�" }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="鎶撴媿鏁版嵁閲忕洃娴�" align="center" prop="snapResult" width="180" v-if="columns[8].visible">
+        <template slot-scope="scope">
+          <div v-if="scope.row.snapResult === 1">姝e父</div>
+          <div v-else-if="scope.row.snapResult === 2">鏃犳暟鎹�</div>
+          <div v-else-if="scope.row.snapResult === 4">鏁版嵁閲忓皯</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="褰撴棩鎶撴媿閲�" align="center" prop="snapCount" width="180" v-if="columns[9].visible"/>
+      <el-table-column label="鏃堕挓鍑嗙‘鐜�" align="center" prop="clockPercent" width="180" v-if="columns[10].visible"/>
+      <el-table-column label="涓婁紶鍙婃椂鐜�" align="center" prop="uploadPercent" width="180" v-if="columns[11].visible"/>
+      <el-table-column label="涓昏灞炴�т竴鑷寸巼" align="center" prop="importantConPercent" width="180"
+                       v-if="columns[12].visible"/>
+      <el-table-column label="鍏ㄩ噺灞炴�т竴鑷寸巼" align="center" prop="majorConPercent" width="180" v-if="columns[13].visible"/>
+      <el-table-column label="澶у浘鍙敤鐜�" align="center" prop="bigUsefulPercent" width="180" v-if="columns[14].visible"/>
+      <el-table-column label="url鍙敤鐜�" align="center" prop="urlPercent" width="180" v-if="columns[15].visible"/>
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row,scope.index)"
+          >璇︾粏
+          </el-button>
+        </template>
       </el-table-column>
     </el-table>
 
@@ -155,38 +161,65 @@
     />
 
     <!-- 璁惧璧勪骇璇︽儏 -->
-    <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog title="杞﹁締鐩戞帶璇︽儏" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" label-width="150px" size="mini">
         <el-row>
+          <el-form-item label="璁惧鍚嶇О锛�">{{ form.name }}</el-form-item>
           <el-col :span="12">
             <el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
-            <el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
-            <el-form-item label="鍦板尯锛�">{{ form.address }} </el-form-item>
-            <el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
+            <el-form-item label="鏍囩锛�">
+              {{
+                ((form.provinceTag ? '鐪佸巺銆�' : '') +
+                  (form.deptTag ? '鍏畨閮ㄣ��' : '')).replace(/銆�$/, '')
+              }}
+            </el-form-item>
             <el-form-item label="璁惧鐘舵�侊細">
-              <div v-if="form.onState === 1">鍙敤</div>
-              <div v-else-if="form.onState === 2">涓嶅彲鐢�</div>
+              <div v-if="form.onState === 0">绂荤嚎</div>
+              <div v-else-if="form.onState === 1">鍦ㄧ嚎</div>
             </el-form-item>
-
+            <el-form-item label="绠$悊鍗曚綅锛�">{{ form.unitName }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="鍦板潃锛�">{{ form.address }}</el-form-item>
+          <el-col :span="12">
+            <el-form-item label="ip锛�">{{ form.ip }}</el-form-item>
+            <el-form-item label="鍦板尯锛�">{{ form.area }}</el-form-item>
             <el-form-item label="鏄惁鐢熸垚寮傚父宸ュ崟锛�">
-              <div v-if="form.defaultOrder === 1">鏄�</div>
-              <div v-else-if="form.defaultOrder === 2">鍚�</div>
+              {{ form.error }}
             </el-form-item>
+            <el-form-item label="杩愮淮鏃堕棿锛�">{{ form.startTime + '鑷�' + form.endTime }}</el-form-item>
           </el-col>
+        </el-row>
+        <!-- 杩愯鏁版嵁鐨勫垎闅旂寮�濮嬫柊鐨勮 -->
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
+            <el-divider content-position="left">杩愯鏁版嵁</el-divider>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="24">
-            <el-form-item label="绠$悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
+            <el-form-item label="鏁版嵁鏃堕棿锛�">{{ form.mongoCreateTime }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="杩囪溅鏁版嵁閲忥細">{{ form.a }}</el-form-item>
+          <el-col :span="12">
+            <el-form-item label="涓�鏈轰竴妗g姸鎬侊細">
+              {{ form.monitorQualify ? '姝e父' : '寮傚父' }}
+            </el-form-item>
+            <el-form-item label="鎶撴媿鏁版嵁閲忕洃娴嬶細">
+              <div v-if="form.snapResult === 1">姝e父</div>
+              <div v-else-if="form.snapResult === 2">鏃犳暟鎹�</div>
+              <div v-else-if="form.snapResult === 4">鏁版嵁閲忓皯</div>
+            </el-form-item>
+            <el-form-item label="鏃堕挓鍑嗙‘鐜囷細">{{ form.clockPercent }}</el-form-item>
+            <el-form-item label="涓昏灞炴�т竴鑷寸巼锛�">{{ form.importantConPercent }}</el-form-item>
+            <el-form-item label="澶у浘鍙敤鐜囷細">{{ form.bigUsefulPercent }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細">{{ form.a }}</el-form-item>
+
+          <el-col :span="12">
+            <el-form-item label="鏄惁涓烘湭娉ㄥ唽璁惧锛�">
+              {{ form.newMonitor ? '鏄�' : '鍚�' }}
+            </el-form-item>
+            <el-form-item label="褰撴棩鎶撴媿閲忥細">{{ form.snapCount }}</el-form-item>
+            <el-form-item label="涓婁紶鍙婃椂鐜囷細">{{ form.uploadPercent }}</el-form-item>
+            <el-form-item label="鍏ㄩ噺灞炴�т竴鑷寸巼锛�">{{ form.majorConPercent }}</el-form-item>
+            <el-form-item label="url鍙敤鐜囷細">{{ form.urlPercent }}</el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -194,27 +227,38 @@
         <el-button @click="open = false">鍏� 闂�</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
+import {videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor} from "@/api/platform/monitor";
+import {listDept} from "@/api/system/dept";
 
 export default {
   name: "Monitor",
-  dicts: ['sys_normal_disable','platform_yes_no','camera_state'],
+  dicts: ['sys_normal_disable', 'platform_yes_no', 'camera_state'],
   data() {
     return {
+      deptList: [],
       // 鍒椾俊鎭�
       columns: [
-        { key: 0, label: `鏍囩`, visible: true },
-        { key: 1, label: `鍖哄煙`, visible: true },
-        { key: 2, label: `璁惧鐘舵�乣, visible: true },
-        { key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true },
-        { key: 4, label: `鏁版嵁鏃堕棿`, visible: true },
-        { key: 5, label: `绠$悊鍗曚綅`, visible: true },
-        { key: 6, label: `杩囪溅鏁版嵁閲廯, visible: true },
-        { key: 7, label: `鎸佺画鏃犳暟鎹ぉ鏁癭, visible: true },
+        {key: 0, label: `鏍囩`, visible: true},
+        {key: 1, label: `鍖哄煙`, visible: true},
+        {key: 2, label: `璁惧鐘舵�乣, visible: true},
+        {key: 3, label: `鏄惁鐢熸垚寮傚父宸ュ崟`, visible: true},
+        {key: 4, label: `绠$悊鍗曚綅`, visible: true},
+        {key: 5, label: `鏁版嵁鏃堕棿`, visible: false},
+        {key: 6, label: `涓�鏈轰竴妗g姸鎬乣, visible: false},
+        {key: 7, label: `鏄惁涓烘湭娉ㄥ唽璁惧`, visible: false},
+        {key: 8, label: `鎶撴媿鏁版嵁閲忕洃娴媊, visible: false},
+        {key: 9, label: `褰撴棩鎶撴媿閲廯, visible: false},
+        {key: 10, label: `鏃堕挓鍑嗙‘鐜嘸, visible: false},
+        {key: 11, label: `涓婁紶鍙婃椂鐜嘸, visible: false},
+        {key: 12, label: `涓昏灞炴�т竴鑷寸巼`, visible: false},
+        {key: 13, label: `鍏ㄩ噺灞炴�т竴鑷寸巼`, visible: false},
+        {key: 14, label: `鍥剧墖璁块棶寮傚父閲廯, visible: false},
+        {key: 15, label: `澶у浘涓嶅彲鐢ㄩ噺`, visible: false}
       ],
       count: {
         totalPosts: 0,
@@ -260,16 +304,16 @@
       // 琛ㄥ崟鏍¢獙
       rules: {
         serialNumber: [
-          { required: true, message: "璁惧缂栫爜涓嶈兘涓虹┖", trigger: "blur" }
+          {required: true, message: "璁惧缂栫爜涓嶈兘涓虹┖", trigger: "blur"}
         ],
         name: [
-          { required: true, message: "璁惧鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+          {required: true, message: "璁惧鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
         ],
         onState: [
-          { required: true, message: "璁惧鐘舵��", trigger: "blur" }
+          {required: true, message: "璁惧鐘舵��", trigger: "blur"}
         ],
         address: [
-          { required: true, message: "鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
+          {required: true, message: "鍦板潃涓嶈兘涓虹┖", trigger: "blur"}
         ],
       }
     };
@@ -277,8 +321,25 @@
   created() {
     this.getVideoCount();
     this.getList();
+    listDept({status: 0}).then(response => {
+      this.deptList = response.data.filter(item => item.area);
+    });
   },
   methods: {
+    clickTab(active) {
+      if (active === 0) {
+        this.queryParams.provinceTag = true
+        this.queryParams.deptTag =null
+      } else if (active === 1) {
+        this.queryParams.provinceTag = null
+        this.queryParams.deptTag = true
+      }else {
+        this.queryParams.provinceTag = null
+        this.queryParams.deptTag = null
+      }
+      this.getList()
+      this.getVideoCount()
+    },
     /** 鏌ヨ璁惧璧勪骇鍒楄〃 */
     getList() {
       this.loading = true;
@@ -290,7 +351,7 @@
     },
     /** 鏌ヨ璁惧璧勪骇缁熻鏁� */
     getVideoCount() {
-      videoCount('2').then(response => {
+      videoCount(this.queryParams).then(response => {
         this.count = response.data;
       });
     },
@@ -326,13 +387,14 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
+      this.queryParams.address = '';
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -374,12 +436,13 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎璁惧璧勪骇缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎璁惧璧勪骇缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
         return delMonitor(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -392,22 +455,49 @@
 </script>
 
 <style lang="scss" scoped>
+.tab {
+  padding: 5px 15px;
+}
+
+.tab:hover {
+  cursor: pointer;
+  user-select: none;
+}
+
+.tabActive {
+  color: white;
+  background-color: #409eff;
+  border: none;
+  border-radius: 1px;
+}
+
+.tabInactive {
+  background-color: #edf2f6;
+  color: #409eff;
+}
+
+.tabInactive:hover {
+  background-color: #edf2f6;
+}
+
 
 .box-card {
-  background-color: #F5F9FE;
+  background-color: #ffffff;
   width: 100%;
   margin-bottom: 20px;
   height: 120px
 }
+
 .icon-container {
   display: flex;
   justify-content: center;
   align-items: center;
-  border-radius: 20px;
-  width: 20%;
+  border-radius: 10px;
+  width: 130px;
   height: 80px;
   margin-left: 5%;
 }
+
 .el-icon-truck {
   font-size: 50px;
   color: #FFFFFF;
@@ -415,9 +505,10 @@
 
 .dashboard {
   display: flex;
-  gap: 10%;
+  gap: 5%;
   align-items: center;
-  margin-left: -50%;
+  justify-content: space-between;
+  margin-right: 20px;
 }
 
 .dashboard-item {

--
Gitblit v1.8.0