代码提交

src/assets/json/authMenuList.json

@@ -325,7 +325,7 @@
             "children": [{
                     "path": "/system/user",
                     "name": "user",
-                    "component": "/proTable/useProTable/index",
+                    "component": "/system/user/index",
                     "meta": {
                         "title": "用户管理",
                         "isLink": "",
@@ -338,7 +338,7 @@
                 {
                     "path": "/system/role",
                     "name": "role",
-                    "component": "/proTable/useProTable/index",
+                    "component": "/system/role/index",
                     "meta": {
                         "title": "角色管理",
                         "isLink": "",
@@ -351,7 +351,7 @@
                 {
                     "path": "/system/stations",
                     "name": "stations",
-                    "component": "/proTable/useProTable/index",
+                    "component": "/system/stations/index",
                     "meta": {
                         "title": "台站管理",
                         "isLink": "",
@@ -364,7 +364,7 @@
                 {
                     "path": "/system/disposition",
                     "name": "disposition",
-                    "component": "/proTable/useProTable/index",
+                    "component": "/system/disposition/index",
                     "meta": {
                         "title": "系统配置",
                         "isLink": "",

src/components/PDFEmbed/PdfViewer.vue

@@ -2,7 +2,7 @@
   <div class="vue-pdf"  @scroll="onScroll" ref="myDiv">
     <vue-pdf-embed :source="testpdf1" ref="vuePdfRef" :style="scaleFun" class="vue-pdf-cs"  @loaded="onPdfLoaded"  :renderPageNumber="true" />
   </div>
-  <div class="page-tool">
+  <div class="page-tool" v-show="isToolVisible">
     <div class="page-tool-item" @click="lastPage">上一页</div>
     <div class="page-tool-item" @click="nextPage">下一页</div>
     <div class="page-tool-item" @click="pageZoomOut">放大</div>
@@ -10,15 +10,17 @@
     <div class="page-tool-item" @click="PDFPrint">打印</div>
     <div class="page-tool-item" @click="PDFDownload">下载</div>
   </div>
-  <div class="page-tool2">
-    <div class="page-tool-item" @click="lastPage">{{scaleData.pageNum}}/{{scaleData.numPages}}</div>
+  <div class="page-tool2" v-show="isToolVisible">
+    <div class="page-tool-item2" @click="lastPage">{{scaleData.pageNum}}/{{scaleData.numPages}}</div>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" v-show="isToolVisible">
 import VuePdfEmbed from 'vue-pdf-embed';
 import testpdf1 from '../../assets/testpdf.pdf';
 import {computed, onMounted, reactive, ref} from "vue";
+const isToolVisible = ref(false)
+
 // 实现pdf缩放
 const scaleFun = computed(() => {
   return {
@@ -103,6 +105,11 @@ const onScroll = () => {
   scaleData.pageNum = currentPage;
 };
 
+onMounted(() => {
+  setTimeout(() => {
+    isToolVisible.value = true;
+  }, 1000);
+})
 </script>
 
 <style scoped>
@@ -140,12 +147,24 @@ const onScroll = () => {
   cursor: pointer;
 }
 
+
+.page-tool-item2 {
+  text-align: center;
+  padding: 20px 0px;
+  width: 60px;
+  cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .vue-pdf{
   margin: 0px auto;
   width: 100%;
   position: relative;
   overflow: auto;
   background: #e3e2e2;
+  height: 100%;
 }
 
 .vue-pdf-cs{

src/layouts/index.vue

@@ -1,6 +1,6 @@
 <!-- 💥 这里是一次性加载 LayoutComponents -->
 <template>
-  <el-watermark id="watermark" :font="font" :content="watermark ? ['地面气象观测系统', 'Happy Working'] : ''">
+  <el-watermark id="watermark" :font="font" :content="watermark ? ['地面气象观测系统', 'SMO'] : ''">
     <component :is="LayoutComponents[layout]" />
     <ThemeDrawer />
   </el-watermark>

src/layouts/indexAsync.vue

@@ -1,6 +1,6 @@
 <!-- 💥 这里是异步加载 LayoutComponents -->
 <template>
-  <el-watermark id="watermark" :font="font" :content="watermark ? ['地面气象观测系统', 'Happy Working'] : ''">
+  <el-watermark id="watermark" :font="font" :content="watermark ? ['地面气象观测系统', 'SMO'] : ''">
     <suspense>
       <template #default>
         <component :is="LayoutComponents[layout]" />

src/styles/common.scss

@@ -166,4 +166,31 @@
     right: 0px;
     bottom: 0px;
   }
+
+  .container-box{
+    padding: 18px 18px;
+    margin-bottom: 15px;
+  }
+
+  .container-main{
+    display: flex;
+    gap: 10px;
+  }
+
+  .container-item{
+    cursor: pointer;
+    width: 100%;
+    color: #000000;
+    font-size: 16px;
+    padding: 15px;
+    flex: 0 1 auto;
+  }
+
+  .container__label {
+    color: var(--el-text-color-regular);
+    font-size: var(--el-form-label-font-size);
+    height: 32px;
+    line-height: 32px;
+    padding: 0 12px 0 0;
+  }
 }

src/styles/element.scss

@@ -89,6 +89,11 @@
   width: 100%;
   height: 100%;
 
+  .table-search2{
+    padding: 18px 18px;
+    margin-bottom: 10px;
+  }
+
   // table-search 表格搜索样式
   .table-search {
     padding: 18px 18px 0;
@@ -212,11 +217,11 @@
 /* el-table 组件大小 */
 .el-table--small {
   .el-table__header th {
-    height: 40px !important;
+    height: 35px !important;
     font-size: 14px !important;
   }
   .el-table__row {
-    height: 40px !important;
+    height: 35px !important;
     font-size: 13px !important;
   }
 }
@@ -286,6 +291,7 @@
 /* el-dialog */
 .el-dialog {
   padding: 0;
+  border-radius: 10px;
   .el-dialog__header {
     padding: 15px 0px;
     margin: 0 20px;

src/views/about/index.vue

@@ -19,16 +19,16 @@
           <el-tag>{{ lastBuildTime }}</el-tag>
         </el-descriptions-item>
         <el-descriptions-item label="Gitee" label-align="left">
-          <el-link type="primary" href="https://gitee.com/HalseySpicy/Geeker-Admin" target="_blank"> Gitee </el-link>
+          <el-link type="primary"  target="_blank"> Gitee </el-link>
         </el-descriptions-item>
         <el-descriptions-item label="Github" label-align="left">
-          <el-link type="primary" href="https://github.com/HalseySpicy/Geeker-Admin" target="_blank"> Github </el-link>
+          <el-link type="primary"  target="_blank"> Github </el-link>
         </el-descriptions-item>
         <el-descriptions-item label="文档地址" label-align="left">
-          <el-link type="primary" href="https://docs.spicyboy.cn" target="_blank"> 文档地址 </el-link>
+          <el-link type="primary" target="_blank"> 文档地址 </el-link>
         </el-descriptions-item>
         <el-descriptions-item label="预览地址" label-align="left">
-          <el-link type="primary" href="https://admin.spicyboy.cn" target="_blank"> 预览地址 </el-link>
+          <el-link type="primary"  target="_blank"> 预览地址 </el-link>
         </el-descriptions-item>
       </el-descriptions>
     </div>

src/views/alarm/allData/index.vue

@@ -369,6 +369,18 @@ const processTableData = ref([
     h: "61",
     i: "17.2"
   },
+  {
+    id: "681913747276782417",
+    a: "测试本地",
+    b: "RS001",
+    c: "公园",
+    d: "2024-09-02 22:57",
+    e: "0.2",
+    f: "150",
+    g: "25.3",
+    h: "61",
+    i: "17.2"
+  },
   {
     id: "681913747276782417",
     a: "测试本地",

src/views/alarm/singleDevice/index.vue

@@ -1,11 +1,38 @@
 <template>
+  <div class="table-box">
+    <div class="card container-box">
+      <div>站台概况</div>
+      <div class="container-main mt15">
+        <div class="container-item container__label">站号:
+          <el-select v-model="queryParams.name" placeholder="请选择自动站" clearable style="width: 150px">
+          <el-option label="固定站1" value="1" />
+          <el-option label="站2" value="2" />
+        </el-select></div>
+        <div class="container-item container__label">名称：固定站1</div>
+        <div class="container-item container__label">地图层级：</div>
+        <div class="container-item container__label">通信模块状态：</div>
+        <div class="container-item container__label">观测时间：2024-09-19 23:00</div>
+      </div>
+      <div class="container-main mt15">
+        <div class="container-item container__label">观测方式：自动</div>
+        <div class="container-item container__label">自动站状态：</div>
+        <div class="container-item container__label">站址：未命名29号</div>
+        <div class="container-item container__label"></div>
+        <div class="container-item container__label"></div>
+      </div>
+    </div>
+    <div class="card table-main">
 
+    </div>
+  </div>
 </template>
 
-<script>
-export default {
-  name: "index"
-}
+<script setup lang="ts">
+import {ref} from "vue";
+
+const queryParams = ref({
+  name: "1"
+});
 </script>
 
 <style scoped>

src/views/assembly/guide/index.vue

@@ -6,7 +6,7 @@
       type="warning"
       :closable="false"
     />
-    <div id="Geeker">
+    <div>
       <el-button type="primary" @click.prevent.stop="driverObj.drive()"> 打开引导页 🤹‍♂️ </el-button>
     </div>
   </div>

src/views/form/validateForm/index.vue

@@ -52,7 +52,7 @@ import { ElMessage } from "element-plus";
 
 const ruleFormRef = ref<FormInstance>();
 const ruleForm = reactive({
-  name: "Geeker-Admin",
+  name: "Admin",
   phone: "",
   region: "",
   date1: "",

src/views/link/gitee/index.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="card content-box">
-    <span class="text">
-      Gitee 仓库：
-      <a href="https://gitee.com/HalseySpicy/Geeker-Admin" target="_blank">https://gitee.com/HalseySpicy/Geeker-Admin</a> 🍒🍉🍊
-    </span>
   </div>
 </template>
 

src/views/link/github/index.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="card content-box">
-    <span class="text">
-      GitHub 仓库：
-      <a href="https://github.com/HalseySpicy/Geeker-Admin" target="_blank">https://github.com/HalseySpicy/Geeker-Admin</a> 🍒🍉🍊
-    </span>
   </div>
 </template>
 

src/views/maintenance/siteRecords/index.vue

@@ -60,7 +60,7 @@
                   content="删除"
                   placement="top"
                 >
-                  <el-button type="primary" link >
+                  <el-button type="primary" link  @click="handleDelete(scope.row)">
                     <img class="operation-img" src="@/assets/images/delete.png">
                   </el-button>
                 </el-tooltip>
@@ -83,7 +83,7 @@
       <Pagination :pageable="pageable" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange" />
     </div>
 
-    <!-- 添加或修改岗位对话框 -->
+    <!-- 添加或修改对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="维护自动站" prop="code">
@@ -136,6 +136,7 @@
 import Pagination from "@/components/ProTable/components/Pagination.vue";
 import { ref, reactive } from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
+import { ElMessageBox } from 'element-plus'
 const pageable = ref<any>({
   pageNum: 1,
   pageSize: 20,
@@ -271,4 +272,21 @@ const submitForm = () => {
   });
 }
 
+/** 删除按钮操作 */
+const handleDelete = async (row?: any) => {
+  ElMessageBox.confirm('是否确认删除岗位编号为"' + row.b + '"的数据项？', {
+    confirmButtonText: '删除',
+    cancelButtonText: '取消',
+    type: 'warning',
+    title:'删除数据',
+    draggable: true
+  })
+    .then(() => {
+
+    })
+    .catch(() => {
+
+    })
+}
+
 </script>

src/views/query/deviceHealth/index.vue

@@ -62,7 +62,7 @@
         </div>
         <div class="header-button-ri">
           <slot name="toolButton">
-            <img class="setting" src="@/assets/images/setting.png" />
+            <img class="setting" src="@/assets/images/setting.png" @click="handleSetting"/>
           </slot>
         </div>
       </div>
@@ -90,6 +90,26 @@
       <!-- 分页组件 -->
       <Pagination :pageable="pageable" :page-sizes="[24]" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange" />
     </div>
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="940px" append-to-body>
+      <div style="height: 500px">
+        <div class="container-tag">
+          <div class="item-tag">观测时间</div>
+          <div class="item-tag-active">早报</div>
+          <div class="item-tag">缺报</div>
+          <div class="item-tag">迟报</div>
+          <div class="item-tag">非实时修改数据</div>
+          <div class="item-tag-active">设备故障</div>
+          <div class="item-tag">其他</div>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -97,6 +117,24 @@
 import Pagination from "@/components/ProTable/components/Pagination.vue";
 import { ref, reactive } from "vue";
 import { ColumnProps } from "@/components/ProTable/interface";
+const dialog = reactive<any>({
+  visible: false,
+  title: ''
+});
+
+const handleSetting = () => {
+  dialog.title = "列表字段设置"
+  dialog.visible = true;
+}
+
+const submitForm = () => {
+
+}
+
+const cancel = () => {
+  dialog.visible = false;
+}
+
 const pageable = ref<any>({
   pageNum: 1,
   pageSize: 24,

src/views/query/dutyProcess/index.vue

@@ -61,7 +61,7 @@
       <!-- 分页组件 -->
       <Pagination :pageable="pageable" :handle-size-change="handleSizeChange" :handle-current-change="handleCurrentChange" />
     </div>
-    <!-- 添加或修改岗位对话框 -->
+    <!-- 添加或修改对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="940px" append-to-body>
       <div style="height: 500px">
         <div class="container-tag">

src/views/system/disposition/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/role/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/stations/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/system/user/index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>