feat：油站信息UI调整优化

admin.ui.plus-master/src/router/route.ts

@@ -1304,14 +1304,5 @@ export const staticRoutes: Array<RouteRecordRaw> = [
       title: '设备可视化',
     },
   },
-
-
-  {
-    path: '/new-page',  // 访问路径
-    name: 'NewPage',    // 路由名称
-    component: () => import('/@/views/NewPage.vue'),
-    meta: {
-      title: '新页面',  // 页面标题
-    }
-  }
+  
 ]

admin.ui.plus-master/src/views/NewPage.vue

@@ -1,127 +0,0 @@
-
-<template>
-  <div class="layout-pd">
-    <el-row>
-<!--操作-->
-      <el-col :xs="24" >
-        <el-card class="mt8"  shadow="hover" >
-<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
-            <el-form-item prop="name" style="width: 100%">
-<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
-                <el-form-item label="id">
-                  <el-input v-model="state.filter.id" placeholder="单行输入" clearable></el-input>
-                </el-form-item>
-              </el-col>
-</el-form-item>
-          </el-form>
-<div class="my-flex my-flex-start" >
-<el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
-<el-button  type="primary" icon="ele-CirclePlus" @click="onAdd"> 添加 </el-button>
-<el-button  type="primary" icon="ele-CirclePlus" @click="ondelete"> 批量删除 </el-button>
-<el-button  type="primary" icon="ele-CirclePlus" @click="onReset"> 重置 </el-button>
-</div>
-</el-card>
-      </el-col>
-<!--表格-->
-      <el-col  :xs="24" >
-        <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
-<el-table-column type="selection" width="50"></el-table-column>
-<el-table v-loading="state.loading" stripe :data="state.tableModel" row-key="id" style="width: 100%">
-        <el-table-column v-for="column in state.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  >
-        </el-table-column> 
-<el-table-column label="操作"  fixed="right" header-align="center" align="center" class="right-operation" width="140">
-        <template #default="{ row }" >
-<el-link
-                  class="my-el-link mr12 ml12"
-                  type="primary"
-                  icon="ele-Upload"
-                  @click="onDateUpdate(row)"
-                  :underline="false"
-                  target="_blank"
-                >编辑</el-link>
-<el-link
-                  class="my-el-link mr12 ml12"
-                  type="primary"
-                  icon="ele-Upload"
-                  @click="onDataDetail(row)"
-                  :underline="false"
-                  target="_blank"
-                >详情</el-link>
-<el-link
-                  class="my-el-link mr12 ml12"
-                  type="primary"
-                  icon="ele-Upload"
-                  @click="onDataDelete(row)"
-                  :underline="false"
-                  target="_blank"
-                >删除</el-link>
-</template>
-            </el-table-column>
-</el-table>
-</el-card>
-      </el-col>
-</el-row>
-    </div>
-  </template>
-  <script setup lang="ts">
-  import {onBeforeMount, onMounted, reactive, ref, watch} from "vue";
-  import eventBus from "/@/utils/mitt";
-  import {Api} from "/@/api/code/api";
-import { ModuleGetOutput } from "/@/api/code/dto";
-/**数据对象*/
-  const state = reactive({
-    /**加载显示 */
-    loading: false,
-    /**条件查询模块 */
-      filter: {
-/**id */
-        id: "",},
-  /**表格信息 */
-tableModel: [] as ModuleGetOutput,
-    /**动态表头 */
-    dynamicColumns: [
-{ prop: 'name', label: '名称' },
-{ prop: 'id', label: '编号' },
-{ prop: 'version', label: '版本' }]
-})
-  onMounted(() => {
-    init()
-    eventBus.off('refreshView')
-    eventBus.on('refreshView', async () => {
-      await init()
-    })
-    console.log()
-  })
-  onBeforeMount(() => {
-    eventBus.off('refreshView')
-  })
-  /**
-  * 监听变换
-  */
-  watch(() => {})
-/**条件查询 */
-          const onQuery = () => {
-          init()
-        }
-        /**初始化 */
-        const init = async () => {
-          state.loading = true
-const res:any = await new Api().getList({...state.filter})
-state.tableModel = res?.data?.list ?? []
-          state.loading = false
-        }
-/**添加 */
-        const onAdd=()=>{}
-/**批量删除 */
-        const ondelete=()=>{}
-/**重置 */
-        const onReset=()=>{}
-/**编辑 */
-      const onDateUpdate=(row)=>{}
-/**详情 */
-      const onDataDetail=(row)=>{}
-/**删除 */
-      const onDataDelete=(row)=>{}
-</script>
-<style scoped lang="scss">
-  </style>

admin.ui.plus-master/src/views/admin/statement/moreOilEngineDetails/component/main.vue

@@ -190,11 +190,12 @@ import {
 
 /******************************数据对象***************************************/
 
-const url = '/src/assets/jiayouzhan.png'
-const urll = '/src/assets/youzhan.png'
+const url = '/src/assets/youzhan.png'
+const urll = '/src/assets/youqiang.png'
 const uurl = '/src/assets/map/IconParkSolidCheckOne.png'
 const urrl = '/src/assets/map/IconParkSolidCloseOne.png'
 
+
 /**
  * 接收index.vue传的id,传递 菜单栏控制参数
  */

admin.ui.plus-master/src/views/admin/statement/partInformation/index.vue

@@ -2,6 +2,8 @@
     <div class="container">
         <el-col class="main" :span="4">
             <img :src="url" class="oilInfo-img">
+            <text class="title">逻辑枪号：{{ parameter.name }}</text>
+            <br><br>
             <el-row justify="space-between">
                 <text>1、{{ parameter.status }}</text>
                 <text>2、{{ parameter.NozzleNo }}</text>
@@ -13,8 +15,9 @@
             </el-row>
         </el-col>
         <el-col class="top" :span="5">
+            <img :src="urllllll" class="oilInfo-img">
+            <text class="title">安全装置</text>
             <el-row>
-                <text class="title">安全装置</text>
             </el-row>
             <el-row>
                 <text>二维码：{{ Data.partDetails.blackBox.qrCode }}</text>
@@ -37,8 +40,9 @@
             </el-row>
         </el-col>
         <el-col class="left-top" :span="5">
+            <img :src="urlllllll" class="oilInfo-img">
+            <text class="title">计控主板</text>
             <el-row>
-                <text class="title">计控主板</text>
                 <text class="statusBox">{{ Data.partDetails.calculatorMainboard.onlineStatus }}</text>
             </el-row>
             <el-row>
@@ -63,8 +67,9 @@
 
         </el-col>
         <el-col class="left-bottom" :span="5">
+            <img :src="urllllllll" class="oilInfo-img">
+            <text class="title">油气回收控制主板</text>
             <el-row>
-                <text class="title">油气回收控制主板</text>
                 <text class="statusBox">{{ Data.partDetails.vaporRecoveryControl.onlineStatus }}</text>
             </el-row>
             <el-row>
@@ -82,7 +87,7 @@
             </el-row>
         </el-col>
         <el-col class="right-top" :span="5">
-            <img :src="url" class="oilInfo-img">
+            <img :src="urlll" class="oilInfo-img">
             <text class="title">监控微处理器</text>
             <text class="statusBox">{{ 1 }}</text>
             <el-row>
@@ -110,7 +115,7 @@
             </el-row>
         </el-col>
         <el-col class="right" :span="5">
-            <img :src="url" class="oilInfo-img">
+            <img :src="urllll" class="oilInfo-img">
             <text class="title">编码器</text>
             <el-row>
                 <text class="statusBox">{{ Data.partDetails.encoderControls.onlineStatus }}</text>
@@ -138,7 +143,7 @@
             </el-row>
         </el-col>
         <el-col class="right-bottom" :span="5">
-            <img :src="url" class="oilInfo-img">
+            <img :src="urlllll" class="oilInfo-img">
             <text class="title">加密显示屏</text>
             <el-row>
                 <text class="statusBox">{{ Data.partDetails.displayControls.onlineStatus }}</text>
@@ -162,11 +167,12 @@ import { partInformationApi } from "/@/api/admin/reportManagement/partInformatio
 
 const url = '/src/assets/youqiang.png'
 const urll = '/src/assets/jiliangqi.png'
-const urlll = '/src/assets/youqiang.png'
-const urllll = '/src/assets/youqiang.png'
-const urlllll = '/src/assets/youqiang.png'
-const urllllll = '/src/assets/youqiang.png'
-
+const urlll = '/src/assets/jiankongweichuliqi.png'
+const urllll = '/src/assets/bianmaqi.png'
+const urlllll = '/src/assets/jiamixianshiqi.png'
+const urllllll = '/src/assets/anquanzhaungzhi.png'
+const urlllllll = '/src/assets/jikongzhuban.png'
+const urllllllll = '/src/assets/youqihuishoukongzhizhuban.png'
 
 const router = useRoute()
 // 中间内容 - 传值
@@ -289,49 +295,49 @@ onMounted(() => {
 
 .main {
     position: absolute;
-    top: 40%;
+    top: 39%;
     left: 40%;
 }
 
 .top {
     position: absolute;
-    top: 8%;
+    top: 7%;
     left: 40%;
 }
 
 .bottom {
     position: absolute;
-    top: 78%;
+    top: 76%;
     left: 40%;
 }
 
 .left-top {
     position: absolute;
-    top: 19%;
+    top: 17%;
     left: 7%;
 }
 
 .left-bottom {
     position: absolute;
-    top: 60%;
+    top: 58%;
     left: 7%;
 }
 
 .right-top {
     position: absolute;
-    top: 10%;
+    top: 9%;
     left: 70%;
 }
 
 .right {
     position: absolute;
-    top: 43%;
+    top: 41%;
     left: 70%;
 }
 
 .right-bottom {
     position: absolute;
-    top: 77%;
+    top: 75%;
     left: 70%;
 }
 .statusBox{
@@ -344,8 +350,8 @@ onMounted(() => {
 
 .oilInfo-img {
     margin-right: 1vh;
-    width: 65px;
-    height: 60px;
+    width: 45px;
+    height: 45px;
     // background-color: #ccc;
     border-radius: 8px;
 }

admin.ui.plus-master/src/views/admin/yujing/alarmRules/index.vue

@@ -49,7 +49,7 @@
       </el-col>
       <!--表格-->
       <el-col :xs="24">
-        <el-card class="my-fill mt8" shadow="hover">
+        <el-card style="height: 76vh;" class="my-fill mt8" shadow="hover">
           <el-table ref="multipleTableRef" v-loading="Data.loading" stripe :data="Data.tableModel" row-key="id"
             style="width: 100%">
             <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop"

admin.ui.plus-master/src/views/admin/yujing/alarmRules/template.vue

@@ -49,7 +49,7 @@
             </el-col>
             <!--表格-->
             <el-col :xs="24">
-                <el-card class="my-fill mt8" shadow="hover">
+                <el-card style="overflow: hidden;height: 76vh;" class="my-fill mt8" shadow="hover">
                     <el-table ref="multipleTableRef" v-loading="Data.loading" stripe :data="Data.tableModel"
                         row-key="id" style="width: 100%">
                         <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop"