Browse Source

更新页面样式以及其他图标log问题

丁烨烨 11 tháng trước cách đây
mục cha
commit
670cf9bec9

+ 0 - 2
components.d.ts

@@ -35,7 +35,6 @@ declare module 'vue' {
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
-    ElStatistic: typeof import('element-plus/es')['ElStatistic']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -45,7 +44,6 @@ declare module 'vue' {
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     IconCommunity: typeof import('./src/components/icons/IconCommunity.vue')['default']
     IconDocumentation: typeof import('./src/components/icons/IconDocumentation.vue')['default']

+ 2 - 2
index.html

@@ -2,9 +2,9 @@
 <html lang="">
   <head>
     <meta charset="UTF-8">
-    <link rel="icon" href="/favicon.ico">
+    <link rel="icon" href="/yl_logo.png">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>沅陵产业开发区智慧园区可视化管理平台</title>
   </head>
   <body>
     <div id="app"></div>

BIN
public/yl_logo.png


BIN
src/assets/yl_logo.png


+ 2 - 2
src/layout/SiderArea.vue

@@ -15,10 +15,10 @@ const activeIndex = ref(route.fullPath)
   <div class="h-full flex flex-col sider-area">
     <div class="flex items-center p-4 bg-el-menu-bg-color transition-all duration-300 logo-container">
       <div class="w-8 h-8 flex-shrink-0 logo">
-        <img src="@/assets/logo.svg" alt="Logo" class="w-full h-full object-contain logo-image" />
+        <img src="@/assets/yl_logo.png" alt="Logo" class="w-full h-full object-contain logo-image" />
       </div>
       <h1 v-show="!store.collapsed" class="ml-3 text-18px font-bold text-el-text-color-primary whitespace-nowrap overflow-hidden text-ellipsis system-title">
-        沅陵后台管理系统
+        沅陵产业开发区智慧园区
       </h1>
     </div>
     <el-menu

+ 41 - 42
src/router/route.ts

@@ -29,29 +29,29 @@ export const routeList:RouterType[] = [
   {
     path: 'zhdpgl',
     name: '智慧大屏管理',
-    icon: 'Location'
+    icon: 'FullScreen'
   },
   {
     path: 'zhdpgl/yqzl',
     name: '园区总览',
-    icon: 'Location',
+    icon: 'Menu',
   },
   {
     path: 'zhdpgl/yqzl/yqjs',
     name: '园区总览-园区介绍',
-    icon: 'Location',
+    icon: 'ChatLineSquare',
     addr: 'zhdpgl/yqzl/yqjs'
   },
   {
     path: 'zhdpgl/yqzl/yqaf',
     name: '园区总览-园区安防',
-    icon: 'Location',
+    icon: 'User',
     addr: 'zhdpgl/yqzl/yqaf'
   },
   {
     path: 'zhdpgl/yqzl/yqdl',
     name: '园区总览-园区电力',
-    icon: 'Location',
+    icon: 'MagicStick',
     addr: 'zhdpgl/yqzl/yqdl'
   },
   // {
@@ -72,13 +72,13 @@ export const routeList:RouterType[] = [
   {
     path: 'zhdpgl/zhaf',
     name: '智慧安防',
-    icon: 'Location',
+    icon: 'Discount',
   },
 
   {
     path: 'zhdpgl/zhaf/ssjk',
     name: '智慧安防-实时监控',
-    icon: 'Location',
+    icon: 'Timer',
     addr: 'zhdpgl/zhaf/ssjk'
   },
 
@@ -208,7 +208,6 @@ export const routeList:RouterType[] = [
   //   icon: 'Location',
   //   addr: 'zhdpgl/zhnh/zhnhd/dyydl'
   // },
-
   // {
   //   path: 'zhdpgl/zhnh/zhnhd/bndydl',
   //   name: '智慧能耗-本年度用电量',
@@ -244,7 +243,7 @@ export const routeList:RouterType[] = [
   {
     path: 'zhdpgl/zhxf',
     name: '智慧消防',
-    icon: 'Location',
+    icon: 'Van',
   },
   // {
   //   path: 'zhdpgl/zhxf/jrsb',
@@ -255,7 +254,7 @@ export const routeList:RouterType[] = [
   {
     path: 'zhdpgl/zhxf/ssjk',
     name: '智慧消防-实时监控',
-    icon: 'Location',
+    icon: 'Stopwatch',
     addr: 'zhdpgl/zhxf/ssjk'
   },
   // {
@@ -287,30 +286,30 @@ export const routeList:RouterType[] = [
   {
     path: 'zhdpgl/zhdg',
     name: '智慧灯杆',
-    icon: 'Location',
+    icon: 'WindPower',
   },
   {
     path: 'zhdpgl/zhdg/dgzm',
     name: '智慧灯杆-灯杆照明',
-    icon: 'Location',
+    icon: 'Open',
     addr: 'zhdpgl/zhdg/dgzm'
   },
-  {
-    path: 'zhdpgl/zhdg/wg',
-    name: '智慧灯杆-网关',
-    icon: 'Location',
-    addr: 'zhdpgl/zhdg/wg'
-  },
+  // {
+  //   path: 'zhdpgl/zhdg/wg',
+  //   name: '智慧灯杆-网关',
+  //   icon: 'Operation',
+  //   addr: 'zhdpgl/zhdg/wg'
+  // },
   {
     path: 'zhdpgl/zhdg/yjhj',
     name: '智慧灯杆-一键呼叫',
-    icon: 'Location',
+    icon: 'PhoneFilled',
     addr: 'zhdpgl/zhdg/yjhj'
   },
   {
     path: 'zhdpgl/zhdg/dpfb',
     name: '智慧灯杆-大屏发布',
-    icon: 'Location',
+    icon: 'Platform',
     addr: 'zhdpgl/zhdg/dpfb'
   },
 
@@ -372,130 +371,130 @@ export const routeList:RouterType[] = [
   {
     path: 'zhld',
     name: '智慧路灯',
-    icon: 'Location',
+    icon: 'IceCreamSquare',
   },
   {
     path: 'zhld/dggl',
     name: '智慧路灯-路灯管理',
-    icon: 'Location',
+    icon: 'Management',
     addr: 'zhld/dggl'
   },
   {
     path: 'zhld/tyfw',
     name: '智慧路灯-统一服务',
-    icon: 'Location',
+    icon: 'Service',
     addr: 'zhld/tyfw'
   },
   {
     path: 'zhld/bjld',
     name: '智慧路灯-报警联动',
-    icon: 'Location',
+    icon: 'PhoneFilled',
     addr: 'zhld/bjld'
   },
   {
     path: 'zhld/sbjr',
     name: '智慧路灯-设备接入',
-    icon: 'Location',
+    icon: 'Plus',
     addr: 'zhld/sbjr'
   },
   {
     path: 'zhld/yzxg',
     name: '智慧路灯-阈值修改',
-    icon: 'Location',
+    icon: 'Edit',
     addr: 'zhld/yzxg'
   },
   {
     path: 'zhld/bjckcl',
     name: '智慧路灯-报警查看处理',
-    icon: 'Location',
+    icon: 'Operation',
     addr: 'zhld/bjckcl'
   },
   {
     path: 'zhld/csjc',
     name: '智慧路灯-参数监测',
-    icon: 'Location',
+    icon: 'MessageBox',
     addr: 'zhld/csjc'
   },
   {
     path: 'zhld/yckz',
     name: '智慧路灯-远程控制',
-    icon: 'Location',
+    icon: 'Operation',
     addr: 'zhld/yckz'
   },
   {
     path: 'zhld/yczj',
     name: '智慧路灯-远程自检',
-    icon: 'Location',
+    icon: 'Finished',
     addr: 'zhld/yczj'
   },
   {
     path: 'zhld/dsrw',
     name: '智慧路灯-定时任务',
-    icon: 'Location',
+    icon: 'Clock',
     addr: 'zhld/dsrw'
   },
   {
     path: 'zhld/lstj',
     name: '智慧路灯-历史统计',
-    icon: 'Location',
+    icon: 'TrendCharts',
     addr: 'zhld/lstj'
   },
   {
     path: 'zhhj',
     name: '智慧环境',
-    icon: 'Location',
+    icon: 'Odometer',
   },
   {
     path: 'zhhj/ssjc',
     name: '实时监测',
-    icon: 'Location',
+    icon: 'PieChart',
     addr: 'zhhj/ssjc'
   },
   {
     path: 'zhhj/sjcx',
     name: '数据查询',
-    icon: 'Location',
+    icon: 'Search',
     addr: 'zhhj/sjcx'
   },
   {
     path: 'zhhj/bjcx',
     name: '报警查询',
-    icon: 'Location',
+    icon: 'Coin',
     addr: 'zhhj/bjcx'
   },
   {
     path: 'zhhj/bjjbpz',
     name: '报警级别配置',
-    icon: 'Location',
+    icon: 'DocumentAdd',
     addr: 'zhhj/bjjbpz'
   },
   {
     path: 'zhhj/bjld',
     name: '报警联动',
-    icon: 'Location',
+    icon: 'Van',
     addr: 'zhhj/bjld'
   },
   {
     path: 'zhhj/ccclpz',
     name: '存储策略配置',
-    icon: 'Location',
+    icon: 'Checked',
     addr: 'zhhj/ccclpz'
   },
   {
     path: 'zhhj/pzpcyz',
     name: '配置偏差阈值',
-    icon: 'Location',
+    icon: 'SetUp',
     addr: 'zhhj/pzpcyz'
   },
   {
     path: 'abrylr',
     name: '安保管理',
-    icon: 'Location',
+    icon: 'UserFilled',
   },
   {
     path: 'abrylr/ablr',
     name: '安保录入',
-    icon: 'Location',
+    icon: 'CirclePlusFilled',
     addr: 'abrylr/ablr'
   },
 ]

+ 1 - 1
src/views/zhdpgl/yqzl/yqaf.vue

@@ -200,7 +200,7 @@ init()
 </script>
 
 <template>
-  <div class="pt-20px">
+  <div class="p-20px">
     <el-button type="primary" @click="showDialogVisible">配置大屏路径</el-button>
     <el-table :data="tableData" style="width: 100%" v-loading="loading">
       <el-table-column prop="id" label="id" width="100" />

+ 112 - 77
src/views/zhdpgl/yqzl/yqjs.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-import { ElDescriptions, ElDescriptionsItem, ElDialog, ElMessage, ElMessageBox, type UploadFile } from 'element-plus'
-import { clientDel, clientGet, clientPost, clientPut } from '@/utils/request.ts'
-import type { BaseResponse } from '@/utils/type.ts'
-import { getSuffix } from '@/utils/getSuffix.ts'
+import {ref} from 'vue'
+import {ElDescriptions, ElDescriptionsItem, ElDialog, ElMessage, ElMessageBox, type UploadFile} from 'element-plus'
+import {clientDel, clientGet, clientPost, clientPut} from '@/utils/request.ts'
+import type {BaseResponse} from '@/utils/type.ts'
+import {getSuffix} from '@/utils/getSuffix.ts'
 
 interface IntroductItem {
   id: string;
@@ -70,9 +70,9 @@ const initData: IntroductItem = {
 
 const handleView = async (row: IntroductItem) => {
   dialogVisible.value = true
-  const res = await clientGet<null, IntroductItemResponse>('/park/parkInfo/getById',{
-    params:{
-      id:row.id
+  const res = await clientGet<null, IntroductItemResponse>('/park/parkInfo/getById', {
+    params: {
+      id: row.id
     }
   })
   if (res.code !== 200) {
@@ -85,7 +85,7 @@ const editForm = ref<IntroductItem>(initData)
 
 const handleEdit = (row: IntroductItem) => {
   editDialogVisible.value = true
-  editForm.value = { ...row }
+  editForm.value = {...row}
 }
 const handleAdd = async () => {
   try {
@@ -209,21 +209,33 @@ init()
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog v-model="dialogVisible" title="详情" width="80%" destroy-on-close>
+    <el-dialog v-model="dialogVisible" title="详情" width="80%" destroy-on-close top="50px">
       <el-descriptions border>
         <el-descriptions-item min-width="200" label="ID">{{ currentRow?.id }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="园区介绍">{{ currentRow?.parkName }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="园区总面积(单位:公顷)">{{ currentRow?.totalArea }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="入驻企业">{{ currentRow?.enteredCompany }}</el-descriptions-item>
-        <el-descriptions-item min-width="200" label="已开发面积(单位:亩)">{{ currentRow?.numberBuildings }}</el-descriptions-item>
+        <el-descriptions-item min-width="200" label="已开发面积(单位:亩)">{{
+            currentRow?.numberBuildings
+          }}
+        </el-descriptions-item>
         <el-descriptions-item min-width="200" label="园区人员(单位:位)">{{ currentRow?.parkPersonnel }}</el-descriptions-item>
-        <el-descriptions-item min-width="200" label="标准厂房(单位:亩)">{{ currentRow?.standardFactory }}</el-descriptions-item>
+        <el-descriptions-item min-width="200" label="标准厂房(单位:亩)">{{
+            currentRow?.standardFactory
+          }}
+        </el-descriptions-item>
         <el-descriptions-item min-width="200" label="总车位(单位;个)">{{ currentRow?.parkingLot }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="生产用地(单位:亩)">{{ currentRow?.productionLand }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="办公用地(单位:亩)">{{ currentRow?.officeLand }}</el-descriptions-item>
-        <el-descriptions-item min-width="200" label="绿色植被(单位:亩)">{{ currentRow?.greenVegetation }}</el-descriptions-item>
+        <el-descriptions-item min-width="200" label="绿色植被(单位:亩)">{{
+            currentRow?.greenVegetation
+          }}
+        </el-descriptions-item>
         <el-descriptions-item min-width="200" label="基础设施">{{ currentRow?.infrastructure }}</el-descriptions-item>
-        <el-descriptions-item min-width="200" label="待开发区(单位:亩)">{{ currentRow?.developmentArea }}</el-descriptions-item>
+        <el-descriptions-item min-width="200" label="待开发区(单位:亩)">{{
+            currentRow?.developmentArea
+          }}
+        </el-descriptions-item>
         <el-descriptions-item min-width="200" label="业务类型">{{ currentRow?.businessType }}</el-descriptions-item>
         <el-descriptions-item min-width="200" label="是否启用">
           <el-tag :type="currentRow?.isEnable === 1 ? 'success' : 'danger'">
@@ -233,7 +245,7 @@ init()
         <el-descriptions-item min-width="200" label="附件">
           <template #default>
             <video v-if="getSuffix(currentRow?.filePath) === 'mp4'" :src="minioBaseUrl+currentRow?.filePath"
-                   controls="true" class="w-full h-full" autoplay="true" />
+                   controls="true" class="w-full h-full" autoplay="true"/>
             <el-link v-else :href="minioBaseUrl+currentRow?.filePath" type="primary" target="_blank">
               {{ currentRow?.filePath }}
             </el-link>
@@ -241,7 +253,7 @@ init()
         </el-descriptions-item>
       </el-descriptions>
     </el-dialog>
-    <el-dialog v-model="editDialogVisible" title="编辑园区信息" width="50%">
+    <el-dialog v-model="editDialogVisible" title="编辑园区信息" width="50%" top="50px">
       <el-form :model="editForm" label-width="180px">
         <el-form-item label="园区介绍">
           <el-input type="textarea" v-model="editForm.parkName"></el-input>
@@ -249,36 +261,49 @@ init()
         <el-form-item label="园区总面积(单位:公顷)">
           <el-input v-model="editForm.totalArea"></el-input>
         </el-form-item>
-        <el-form-item label="入驻企业">
-          <el-input v-model="editForm.enteredCompany"></el-input>
-        </el-form-item>
-        <el-form-item label="已开发面积(单位:亩)">
-          <el-input v-model="editForm.numberBuildings"></el-input>
-        </el-form-item>
-        <el-form-item label="园区人员(单位:位)">
-          <el-input v-model="editForm.parkPersonnel"></el-input>
-        </el-form-item>
-        <el-form-item label="标准厂房(单位:亩)">
-          <el-input v-model="editForm.standardFactory"></el-input>
-        </el-form-item>
-        <el-form-item label="总车位(单位;个)">
-          <el-input v-model="editForm.parkingLot"></el-input>
-        </el-form-item>
-        <el-form-item label="生产用地(单位:亩)">
-          <el-input v-model="editForm.productionLand"></el-input>
-        </el-form-item>
-        <el-form-item label="办公用地(单位:亩)">
-          <el-input v-model="editForm.officeLand"></el-input>
-        </el-form-item>
-        <el-form-item label="绿色植被(单位:亩)">
-          <el-input v-model="editForm.greenVegetation"></el-input>
-        </el-form-item>
-        <el-form-item label="基础设施">
-          <el-input v-model="editForm.infrastructure"></el-input>
-        </el-form-item>
-        <el-form-item label="待开发区(单位:亩)">
-          <el-input v-model="editForm.developmentArea"></el-input>
-        </el-form-item>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="入驻企业">
+            <el-input v-model="editForm.enteredCompany"></el-input>
+          </el-form-item>
+          <el-form-item label="已开发面积(单位:亩)">
+            <el-input v-model="editForm.numberBuildings"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="园区人员(单位:位)">
+            <el-input v-model="editForm.parkPersonnel"></el-input>
+          </el-form-item>
+          <el-form-item label="标准厂房(单位:亩)">
+            <el-input v-model="editForm.standardFactory"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+
+          <el-form-item label="总车位(单位;个)">
+            <el-input v-model="editForm.parkingLot"></el-input>
+          </el-form-item>
+          <el-form-item label="生产用地(单位:亩)">
+            <el-input v-model="editForm.productionLand"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+
+          <el-form-item label="办公用地(单位:亩)">
+            <el-input v-model="editForm.officeLand"></el-input>
+          </el-form-item>
+          <el-form-item label="绿色植被(单位:亩)">
+            <el-input v-model="editForm.greenVegetation"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+
+          <el-form-item label="基础设施">
+            <el-input v-model="editForm.infrastructure"></el-input>
+          </el-form-item>
+          <el-form-item label="待开发区(单位:亩)">
+            <el-input v-model="editForm.developmentArea"></el-input>
+          </el-form-item>
+        </div>
         <el-form-item label="业务类型">
           <el-input v-model="editForm.businessType"></el-input>
         </el-form-item>
@@ -310,7 +335,7 @@ init()
     </span>
       </template>
     </el-dialog>
-    <el-dialog v-model="addDialogVisible" title="新增园区信息" width="50%">
+    <el-dialog v-model="addDialogVisible" title="新增园区信息" top="50px">
       <el-form :model="addForm" label-width="180px">
         <el-form-item label="园区介绍">
           <el-input type="textarea" v-model="addForm.parkName"></el-input>
@@ -318,36 +343,46 @@ init()
         <el-form-item label="园区总面积(单位:公顷)">
           <el-input v-model="addForm.totalArea"></el-input>
         </el-form-item>
-        <el-form-item label="入驻企业">
-          <el-input v-model="addForm.enteredCompany"></el-input>
-        </el-form-item>
-        <el-form-item label="已开发面积(单位:亩)">
-          <el-input v-model="addForm.numberBuildings"></el-input>
-        </el-form-item>
-        <el-form-item label="园区人员(单位:位)">
-          <el-input v-model="addForm.parkPersonnel"></el-input>
-        </el-form-item>
-        <el-form-item label="标准厂房(单位:亩)">
-          <el-input v-model="addForm.standardFactory"></el-input>
-        </el-form-item>
-        <el-form-item label="总车位(单位;个)">
-          <el-input v-model="addForm.parkingLot"></el-input>
-        </el-form-item>
-        <el-form-item label="生产用地(单位:亩)">
-          <el-input v-model="addForm.productionLand"></el-input>
-        </el-form-item>
-        <el-form-item label="办公用地(单位:亩)">
-          <el-input v-model="addForm.officeLand"></el-input>
-        </el-form-item>
-        <el-form-item label="绿色植被(单位:亩)">
-          <el-input v-model="addForm.greenVegetation"></el-input>
-        </el-form-item>
-        <el-form-item label="基础设施">
-          <el-input v-model="addForm.infrastructure"></el-input>
-        </el-form-item>
-        <el-form-item label="待开发区(单位:亩)">
-          <el-input v-model="addForm.developmentArea"></el-input>
-        </el-form-item>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="入驻企业">
+            <el-input v-model="addForm.enteredCompany"></el-input>
+          </el-form-item>
+          <el-form-item label="已开发面积(单位:亩)">
+            <el-input v-model="addForm.numberBuildings"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="园区人员(单位:位)">
+            <el-input v-model="addForm.parkPersonnel"></el-input>
+          </el-form-item>
+          <el-form-item label="标准厂房(单位:亩)">
+            <el-input v-model="addForm.standardFactory"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="总车位(单位;个)">
+            <el-input v-model="addForm.parkingLot"></el-input>
+          </el-form-item>
+          <el-form-item label="生产用地(单位:亩)">
+            <el-input v-model="addForm.productionLand"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="办公用地(单位:亩)">
+            <el-input v-model="addForm.officeLand"></el-input>
+          </el-form-item>
+          <el-form-item label="绿色植被(单位:亩)">
+            <el-input v-model="addForm.greenVegetation"></el-input>
+          </el-form-item>
+        </div>
+        <div style="display: flex;justify-content:space-between">
+          <el-form-item label="基础设施">
+            <el-input v-model="addForm.infrastructure"></el-input>
+          </el-form-item>
+          <el-form-item label="待开发区(单位:亩)">
+            <el-input v-model="addForm.developmentArea"></el-input>
+          </el-form-item>
+        </div>
         <el-form-item label="业务类型">
           <el-input v-model="addForm.businessType"></el-input>
         </el-form-item>

+ 1 - 1
src/views/zhdpgl/zhaf/ssjk.vue

@@ -150,7 +150,7 @@ init()
 </script>
 
 <template>
-  <div class="pt-20px">
+  <div class="p-20px">
     <el-button type="primary" @click="showDialogVisible">配置大屏路径</el-button>
     <el-table :data="tableData" style="width: 100%" v-loading="loading">
       <el-table-column prop="id" label="id" width="100" />

+ 1 - 1
src/views/zhdpgl/zhxf/ssjk.vue

@@ -151,7 +151,7 @@ init()
 </script>
 
 <template>
-  <div class="pt-20px">
+  <div class="p-20px">
     <el-button type="primary" @click="showDialogVisible">配置大屏路径</el-button>
     <el-table :data="tableData" style="width: 100%" v-loading="loading">
       <el-table-column prop="id" label="id" width="100" />