Przeglądaj źródła

feat: 日报基本布局

sunxiao 9 miesięcy temu
rodzic
commit
46eb50eef8

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 人工智能运营体决策助手
 
 # 开发环境配置
 VITE_APP_ENV = 'development'
 
-# 若依管理系统/开发环境
+# 管理系统/开发环境
 VITE_APP_BASE_API = '/dev-api'

+ 2 - 2
.env.production

@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 人工智能运营体决策助手
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# 若依管理系统/生产环境
+# 管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli

+ 2 - 2
.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VITE_APP_TITLE = 若依管理系统
+VITE_APP_TITLE = 人工智能运营体决策助手
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'
 
-# 若依管理系统/生产环境
+# 管理系统/生产环境
 VITE_APP_BASE_API = '/stage-api'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli

Plik diff jest za duży
+ 255 - 196
index.html


BIN
public/favicon.ico


+ 10 - 0
src/api/daily/index.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request';
+
+// 新增日报
+export function postDaily(data) {
+  return request({
+    url: '/business/daily',
+    method: 'post',
+    data: data
+  })
+}

BIN
src/assets/logo/logo.png


BIN
src/assets/logo/logo_1x.png


+ 4 - 4
src/assets/styles/ruoyi.scss

@@ -182,10 +182,10 @@
 	float: right !important;
 }
 
-.el-card__header {
-	padding: 14px 15px 7px !important;
-	min-height: 40px;
-}
+// .el-card__header {
+// 	padding: 14px 15px 7px !important;
+// 	min-height: 40px;
+// }
 
 .el-card__body {
 	padding: 15px 20px 20px 20px !important;

+ 5 - 2
src/layout/components/Navbar.vue

@@ -5,8 +5,9 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="settingsStore.topNav" />
 
     <div class="right-menu">
+      <!--
       <template v-if="appStore.device !== 'mobile'">
-        <header-search id="header-search" class="right-menu-item" />
+         <header-search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
@@ -16,12 +17,14 @@
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <screenfull id="screenfull" class="right-menu-item hover-effect" /> 
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
+       
       </template>
+       -->
       <div class="avatar-container">
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
           <div class="avatar-wrapper">

+ 2 - 2
src/layout/components/Sidebar/Logo.vue

@@ -54,8 +54,8 @@ const sideTheme = computed(() => settingsStore.sideTheme);
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 22px;
+      height: 22px;
       vertical-align: middle;
       margin-right: 12px;
     }

+ 284 - 0
src/views/daily/config.js

@@ -0,0 +1,284 @@
+
+export const schema = {
+  js: {
+    title: '一、进水指标',
+    default: {
+      list: [
+        {
+          key: 'jsPh',
+          label: 'pH'
+        },
+        {
+          key: 'jsCod',
+          label: 'COD',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsBod5',
+          label: 'BOD₅',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsSs',
+          label: 'SS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsNh3',
+          label: 'NH₃-N',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsTn',
+          label: 'TN',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsTp',
+          label: 'TP',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'jsDcgj',
+          label: '粪菌群',
+          unit: '(个/L)'
+        },
+        {
+          key: 'jsSw',
+          label: '水温',
+          unit: '(°C)'
+        }
+      ]
+    }
+  },
+  cs: {
+    title: '二、出水指标',
+    default: {
+      list: [
+        {
+          key: 'csPh',
+          label: 'pH'
+        },
+        {
+          key: 'csCod',
+          label: 'COD',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csBod5',
+          label: 'BOD₅',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csSs',
+          label: 'SS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csNh3',
+          label: 'NH₃-N',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csTn',
+          label: 'TN',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csTp',
+          label: 'TP',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'csDcgj',
+          label: '粪菌群',
+          unit: '(个/L)'
+        },
+        {
+          key: 'csSw',
+          label: '水温',
+          unit: '(°C)'
+        }
+      ]
+    }
+  },
+  hyc: {
+    title: '三、生化池运行指标',
+    hycOne: {
+      title: '1#好氧池(生化池)',
+      list: [
+        {
+          key: 'shcOnePh',
+          label: 'pH'
+        },
+        {
+          key: 'shcHyOneSv',
+          label: 'SV',
+          unit: '(%)'
+        },
+        {
+          key: 'shcHyOneSvi',
+          label: 'SVI',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyOneMlss',
+          label: 'MLSS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyOneMlvss',
+          label: 'MLVSS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyOneDo',
+          label: 'DO',
+          unit: '(mg/L)'
+        }
+      ]
+    },
+    hycTwo: {
+      title: '2#好氧池(生化池)',
+      list: [
+        {
+          key: 'shcTwoPh',
+          label: 'pH'
+        },
+        {
+          key: 'shcHyTwoSv',
+          label: 'SV',
+          unit: '(%)'
+        },
+        {
+          key: 'shcHyTwoSvi',
+          label: 'SVI',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyTwoMlss',
+          label: 'MLSS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyTwoMlvss',
+          label: 'MLVSS',
+          unit: '(mg/L)'
+        },
+        {
+          key: 'shcHyTwoDo',
+          label: 'DO',
+          unit: '(mg/L)'
+        }
+      ]
+    },
+    yyc: {
+      title: '厌氧池(生化池)',
+      list: [
+        {
+          key: 'shcYyOneDo',
+          label: '1# DO'
+        },
+        {
+          key: 'shcYyTwoDo',
+          label: '2# DO'
+        },
+      ]
+    },
+    qyc: {
+      title: '缺氧池(生化池)',
+      list: [
+        {
+          key: 'shcQyOneDo',
+          label: '1# DO'
+        },
+        {
+          key: 'shcQyTwoDo',
+          label: '2# DO'
+        },
+      ]
+    },
+  },
+  sl: {
+    title: '四、水量指标',
+    default: {
+      list: [
+        {
+          key: 'JSL',
+          label: '进水量',
+          unit: '(m³/d)'
+        },
+        {
+          key: 'CSL',
+          label: '出水量',
+          unit: '(m³/d)'
+        },
+        {
+          key: 'SDCLCXSL',
+          label: '深度处理冲洗水量',
+          unit: '(m³/d)'
+        },
+      ]
+    }
+  },
+  yxcs: {
+    title: '五、运行参数—生化系统主要参数',
+    default: {
+      list: [
+        {
+          key: 'QSB',
+          label: '气水比',
+          unit: '(m³/m³)'
+        },
+        {
+          key: 'fM',
+          label: 'F/M',
+          unit: '(kgBOD/kgMLSS·d)'
+        },
+        {
+          key: 'tyqBod5Tn',
+          label: '投药前(BOD/TN)',
+        },
+        {
+          key: 'tyhBod5Tn',
+          label: '投药后(BOD/TN)',
+        },
+        {
+          key: 'yyHrt',
+          label: '厌氧停留时间',
+          unit: '(h)'
+        },
+        {
+          key: 'qyHrt',
+          label: '缺氧停留时间',
+          unit: '(h)'
+        },
+        {
+          key: 'hyHrt',
+          label: '好氧停留时间',
+          unit: '(h)'
+        },
+        {
+          key: 'nhlR',
+          label: '内回流比',
+          unit: '(%)'
+        },
+        {
+          key: 'whlR',
+          label: '外回流比',
+          unit: '(%)'
+        },
+        {
+          key: 'SRT',
+          label: '污泥龄',
+          unit: '(天)'
+        },
+        {
+          key: 'CNL',
+          label: '产泥率',
+          unit: '(T/万吨)'
+        }
+      ]
+    }
+  }
+}

+ 90 - 0
src/views/daily/index.vue

@@ -0,0 +1,90 @@
+<script setup>
+import { schema } from './config.js';
+import { postDaily } from '@/api/daily';
+
+const form = ref({});
+const formInline = ref({});
+const testDate = ref();
+
+</script>
+
+<template>
+  <div class="daily-container">
+
+    <el-card shadow="never" header="选择日报填写日期" class="pre-form">
+      <el-form :inline="true" :model="formInline">
+        <div class="pre-form_inner">
+          <el-form-item label="水厂名称">
+            <el-select v-model="formInline.region" placeholder="请选择水厂" clearable>
+              <el-option label="Zone one" value="shanghai" />
+              <el-option label="Zone two" value="beijing" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="日报时间">
+            <el-date-picker v-model="testDate" type="date" placeholder="请选择日期" :editable="false" value-format="YYYY/MM/DD"/>
+          </el-form-item>
+        </div>
+      </el-form>
+
+      <div class="next-btn">
+        <el-button type="primary">下一步</el-button>
+      </div>
+
+    </el-card>
+
+    <el-card class="card" shadow="never" :header="obj.title" :key="key" v-for="obj, key in schema">
+      <el-form label-position="right" label-suffix=":">
+        <div v-for="val, k in obj" :key="key + k">
+          <el-divider content-position="left" v-show="val.title">{{ val.title }}</el-divider>
+          <el-row :gutter="100">
+            <el-col :span="8" v-for="item in val.list" :key="item.key">
+              <el-form-item :label-width="150" :label="item.label">
+                <el-input-number v-model="form[item.key]" :controls="false" />
+                <span style="padding-left: 10px; color: #999;">{{ item.unit }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </el-card>
+
+    <div class="btn-group">
+      <el-button>保存</el-button>
+      <el-button type="primary">提交</el-button>
+    </div>
+  </div>
+
+</template>
+
+<style lang="scss" scoped>
+.daily-container {
+  height: 100%;
+  padding: 20px;
+  background: #fafbfa;
+
+  .card:not(:last-child) {
+    margin-bottom: 20px;
+  }
+}
+
+.pre-form {
+  margin-bottom: 20px;
+  &_inner, .next-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.btn-group {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
+
+<style>
+.daily-container .el-card__header {
+  font-weight: bold;
+}
+</style>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików