feat: 调整以及问题修改

src/components/Chat/ChatBaseCard.vue

@@ -31,12 +31,12 @@ const props = defineProps({
 
       <div class="flex-1 pt-[4px] ml-[16px] text-[15px]">
 
+        <slot></slot>
+        
         <template v-if="loading && delayLoading">
           <p class="font-bold text-[#1A2029] leading-[24px]">{{ loadingText }}</p>
         </template>
 
-        <slot></slot>
-
         <slot name="text"></slot>
 
       </div>

src/components/Layout/TheLogo.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { useRouter } from "vue-router";
 import { storeToRefs } from 'pinia';
 import { useAppStore } from '@/stores/modules/appStore';
 
@@ -7,13 +8,16 @@ import BasePopover from "@/components/BasePopover"
 
 const appStore = useAppStore();
 const { subMenuCollapse } = storeToRefs(appStore);
+const router = useRouter();
 
 const changeCollapse = () => appStore.toggleSubMenuCollapse();
+
+const handleClick = () => router.push('/');
 </script>
 
 <template>
   <div class="logo-main flex items-center justify-between py-[14px] px-[20px]">
-    <div class="title flex items-center space-x-2">
+    <div class="title flex items-center space-x-2 cursor-pointer" @click="handleClick">
       <div class="w-[28px] h-[28px]">
         <SvgIcon name="common-logo" size="28"></SvgIcon>
       </div>

src/components/Layout/TheMenu.vue

@@ -42,7 +42,7 @@ const menuOptions = [
     key: '/answer'
   },
   {
-    label: () => renderLabel('智能分析'),
+    label: () => renderLabel('工艺管控'),
     icon: renderIcon({ name: 'menu-analyse' }),
     key: '/analyse',
     children: [
@@ -168,4 +168,5 @@ const handleUpdateValue = (key, { url }) => {
 //   svg {
 //     display: none;
 //   }
-// }</style>
+// }
+</style>

src/components/Layout/ThePublicLayout.vue

@@ -1,10 +1,12 @@
 <script setup>
 import { ref, onMounted, onUnmounted } from 'vue';
-import { RouterView } from 'vue-router';
+import { RouterView, useRouter } from 'vue-router';
 import { NScrollbar } from 'naive-ui';
 import { SvgIcon, TheLogo, TheMenu } from '@/components';
 import { waterApi } from '@/api/water';
 
+const router = useRouter();
+
 const warningCountMseeage = ref([]);
 
 const initWraingListData = async () => {
@@ -12,6 +14,11 @@ const initWraingListData = async () => {
   warningCountMseeage.value = data;
 }
 
+const handleJump = (val) => {
+  const path = val.includes("报警") ? '/water-warn' : '/forecast-warn';
+  router.push(path);
+}
+
 onMounted(() => {
   initWraingListData();
   setInterval(_ => initWraingListData(), 60 * 60 * 1000)
@@ -39,7 +46,7 @@ onUnmounted(() => clearInterval(initWraingListData))
           <dt class="w-[64px] h-[20px] mb-[12px] text-[16px] flex items-center justify-center">
             <img src="@/assets/images/menu/bg-warn-text.png" alt="">
           </dt>
-          <dd class="info" v-for="item in warningCountMseeage" :key="item">
+          <dd class="info" v-for="item in warningCountMseeage" :key="item" @click="handleJump(item)">
             <SvgIcon name="menu-warn-tips"></SvgIcon>
             <span class="pl-[4px] block">{{ item }}</span>
           </dd>
@@ -70,7 +77,7 @@ onUnmounted(() => clearInterval(initWraingListData))
 
     .aside-main_bottom {
       height: 100px;
-      margin-bottom: 78px;
+      margin-bottom: 50px;
 
       .warn-content {
         border: 1px solid #fff;

src/components/User/userEdit.vue

@@ -89,7 +89,7 @@ const submit = async () => {
             <span class="des">设置为默认登录</span>
           </div>
         </n-form-item>
-        <n-form-item label="手机号">
+        <n-form-item label="报警手机">
           <div class="content">
             <span>{{ user.emergencyPhone }}</span>
           </div>

src/utils/enum.js

@@ -19,4 +19,20 @@ export const ORDER_OPTION_ENUM = {
   no3Qyc1Jqr:   '1#缺氧池硝酸盐',
   no3Qyc2Jqr:   '2#缺氧池硝酸盐',
   tpRccJqr:     '二沉池正磷酸盐'
+}
+
+export const SIMULATE_ENUM = {
+  COD_in:       '进水COD mg/L',
+  DO_O:         '好氧池末端DO (#1 #2) mg/L',
+  MLSS:         'MLSS (#1 #2) mg/L',
+  Q_in:         '进水流量 m3/h',
+  tyjyl:        '碳源药剂投加量 m³/h',
+  r:            '内回流比（#1 #2) %',
+  cltjl:        '除磷药剂投加量m³/h',
+  gwnl:         '干污泥量',
+  hycxsy_all:   '好氧硝酸盐（#1 #2) mg/L',
+  qyan_all:     '缺氧氨氮（#1 #2) mg/L',
+  qyckxsy_all:  '缺氧硝酸盐 mg/L',
+  T:            '水温 ℃',
+  pH:           'pH'
 }

src/utils/request.ts

@@ -77,6 +77,9 @@ export class Request {
       return Promise.reject(res.data);
 
     }, (error: AxiosError) => {
+      if (error.code === 'ECONNABORTED' ) {
+        showNotification('warning', '链接超时，请刷新后重试')
+      }
       return Promise.reject(error);
     })
   }

src/views/analyse/WorkOrder.vue

@@ -7,13 +7,13 @@ import { orderApi } from "@/api/order";
 import { chatApi } from '@/api/chat';
 import { formatEchart, isNumberComprehensive } from '@/utils/format';
 import { ORDER_OPTION_ENUM } from '@/utils/enum';
-import { getAreaOptions, getOrderAreaOptions } from './config/echartOptions'
+import { getOrderAreaOptions } from './config/echartOptions'
 import * as echarts from 'echarts';
 import dayjs from 'dayjs';
 
-import { useInfinite, useScroll, useChat, useRecommend } from '@/composables';
+import { useInfinite, useScroll, useChat } from '@/composables';
 
-const { recordList, isFetching, onScrolltolower, onReset, addHistoryRecord } = useInfinite('/front/bigModel/qa/pageList', { module: 1 });
+const { recordList, isFetching, onScrolltolower, onReset } = useInfinite('/front/bigModel/qa/pageList', { module: 1 });
 const { scrollRef, scrollToBottom, scrollToBottomIfAtBottom } = useScroll();
 const { chatDataSource, addChat, updateChat, clearChat, updateById } = useChat();
 
@@ -21,12 +21,8 @@ let controller = new AbortController();
 
 const ANSWER_ID_KEY = '@@id@@';
 
-const pageDataSource = ref({});
-const chartRefDom = ref(null);
-
 const chartInstance = {};
 
-const echartRef = ref([]);
 const message = useMessage();
 const reportDate = ref();
 
@@ -39,10 +35,8 @@ const workOrderParams = ref({
 
 const switchActive = ref(false);
 const tabActive = ref("daily");
-const model = ref({})
 
 const isLoading = ref(false);
-const inputRef = ref(null);
 const recordActive = ref(null);
 
 const currenSessionId = ref(null);
@@ -135,6 +129,7 @@ const onRegenerate = async (question, options) => {
         answer,
         loading: true,
         delayLoading: false,
+        innerLoading: false
       })
 
       console.log( "chatDataSource", chatDataSource.value );
@@ -155,7 +150,8 @@ const onRegenerate = async (question, options) => {
       showVal: question,
       answer,
       loading: false,
-      delayLoading: false
+      delayLoading: false,
+      innerLoading: false
     })
 
     scrollToBottomIfAtBottom();
@@ -201,7 +197,8 @@ const handleSubmit = async (question, params) => {
 
     updateChat({
       ...chatDataSourceItem.value,
-      delayLoading: false
+      delayLoading: true,
+      innerLoading: false,
     })
 
     createEchart(option.echartWithTableData);
@@ -253,17 +250,12 @@ const handleCreateOrder = async () => {
 const createEchart = (echartData) => {
 
   setTimeout(() => {
-   
     echartData.forEach(({ key, xAxisData, yAxisData }) => {
-      
-      // if ( !chartInstance[key] ) {
-        const dom = document.getElementById(key);
-        chartInstance[key] = echarts.init(dom, null, { width: 680, height: 300 });
-      // }
+      const dom = document.getElementById(key);
+      chartInstance[key] = echarts.init(dom, null, { width: 680, height: 300 });
     
       const option = getOrderAreaOptions({ xAxisData, yAxisData });
     
-      // chartInstance[key].clear();
       chartInstance[key].setOption(option);
     })
   })
@@ -382,9 +374,10 @@ onUnmounted(() => {
             :delay-loading="item.delayLoading"
             :isSatisfied="item.isSatisfied"
             :toggleVisibleIcons="false"
+            loadingText="数据分析中，请耐心等待..."
             @on-click-icon="params => updateById(params)"
           >
-            <main v-show="!item.delayLoading">
+            <main v-show="!item.innerLoading">
               <div 
                 class="area_inner"
                 v-for="(item, index) in item.echartWithTableData"
@@ -619,4 +612,4 @@ onUnmounted(() => {
     }
   }
 }
-</style>../../utils/enum
+</style>

src/views/analyse/components/CustomModal.vue

@@ -1,8 +1,7 @@
 <script setup>
-import { ref, defineModel, computed, unref } from 'vue';
-import { NModal, NInput } from 'naive-ui';
-import { SIMULATE_ENUM } from './config';
-import { truncateDecimals } from "@/utils/format";
+import { defineModel, computed } from 'vue';
+import { NModal } from 'naive-ui';
+import { SIMULATE_ENUM } from '@/utils/enum';
 
 const props = defineProps({
   currentData: {
@@ -22,8 +21,8 @@ const simulateData = computed(() => {
 
   usefulkeys.forEach(key => {
     const tempArr = data[key];
-    resultObj[key] = tempArr.map(item => {
 
+    resultObj[key] = tempArr.map(item => {
       let numVal = '';
       const keyWhiteList = ['MLSS', 'r']
       const numDigit = keyWhiteList.includes(item.name) ? 0 : 2;
@@ -43,7 +42,6 @@ const simulateData = computed(() => {
       }
     })
   })
-  console.log("resultObj", resultObj);
   return resultObj;
 })
 
@@ -75,7 +73,6 @@ const handleStartReport = () => {
   modelVisible.value = false;
 
   emit('on-submit', { simulate: JSON.stringify(simulate), table })
-  console.log( "result", JSON.stringify(simulate), table );
 }
 
 </script>

src/views/analyse/components/config.js

@@ -12,5 +12,4 @@ export const SIMULATE_ENUM = {
   qyckxsy_all:  '缺氧硝酸盐 mg/L',
   T:            '水温 ℃',
   pH:           'pH'
-}
-
+}

src/views/analyse/config/echartOptions.js

@@ -1,5 +1,4 @@
 import * as echarts from 'echarts';
-import { colorToRgba } from '@/utils/format';
 
 export const getAreaOptions = ({ xAxisData, seriesList }) => {
   const series = seriesList.map((data, index) => {
@@ -66,7 +65,7 @@ export const getAreaOptions = ({ xAxisData, seriesList }) => {
     },
     grid: {
       top: '10',
-      left: 30,
+      left: 60,
       right: '5%',
       bottom: '15%',
     },

src/views/screen/ScreenView.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { ref, onBeforeUnmount, onMounted } from "vue";
 import { userTop } from '@/components';
 import shuizhi from "./components/shuizhi";
 import dataBox from "./components/dataBox";
@@ -8,12 +9,11 @@ import middleBox from "./components/middleBox";
 import EchartBar from "./components/EchartBar";
 import ControlHelper from "./components/ControlHelper";
 import { screenApi } from "@/api/screen"
-import dayjs from 'dayjs'
+import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import autofit from "@/utils/autofit"
 
 dayjs.locale('zh-cn'); // 设置day.js使用中文/ 导入中文语言包
-import { ref, onBeforeUnmount, onMounted } from "vue";
+
 const gongyiData = ref([])
 const reportData = ref({})
 const screenData = ref({})
@@ -21,15 +21,15 @@ const time = ref('')
 let timer = null
 let timeHour = null
 
-const dataTime = `数据更新时间：${dayjs().format('MM-DD HH:mm')}`
+const dataTime = ref("");
 
 // 获取工艺管控 助手
 const getWarningList = () => {
   screenApi.warningList().then(res => {
     gongyiData.value = res.data || []
   })
-
 }
+
 // 获取数据费助手
 const getLeastShortReport = () => {
   screenApi.getLeastShortReport().then(res => {
@@ -41,11 +41,11 @@ const getLeastShortReport = () => {
 const getRealTimeData = () => {
   screenApi.realTimeData().then(res => {
     screenData.value = res.data
+    dataTime.value = `更新时间：${res.data.testHour}`
     time.value = dayjs(res.data.timestamp).format('HH:mm:ss')
     timeHour = setInterval(() => {
       time.value = updateCurrentTime(res.data.timestamp)
     }, 1000)
-
   })
 }
 
@@ -65,16 +65,9 @@ const init = () => {
   getLeastShortReport()
 }
 
-
 init()
 
 onMounted(() => {
-  // autofit.init({
-  //     designHeight: 1080,
-  //     designWidth: 1920,
-  //     renderDom: "#screen-view",
-  //     resize: true
-  //   })
   //每5s刷新数据
   timer = setInterval(() => {
     init()
@@ -107,8 +100,8 @@ onBeforeUnmount(() => {
     <div class="menu">
       <RouterLink to="/" class="item item1">智慧总控</RouterLink>
       <RouterLink to="/answer" class="item item2">专家问答</RouterLink>
-      <RouterLink to="/water-warn" class="item item3">智能分析</RouterLink>
-      <RouterLink to="/work-order" class="item item4">智能助手</RouterLink>
+      <RouterLink to="/water-warn" class="item item3">工艺管控</RouterLink>
+      <RouterLink to="/work" class="item item4">智能办公</RouterLink>
     </div>
     <div class="screen-container">
       <div class="screen-container-main">
@@ -119,6 +112,9 @@ onBeforeUnmount(() => {
         </div>
         <div class="middle">
           <middleBox :dataTime="dataTime"></middleBox>
+          <div class="img-card">
+            <img src="@/assets/images/home/water-work.png" alt="" />
+          </div>
         </div>
         <div class="right">
           <ControlHelper></ControlHelper>
@@ -127,9 +123,6 @@ onBeforeUnmount(() => {
         </div>
       </div>
     </div>
-    <div class="img-card">
-      <img src="@/assets/images/home/water-work.png" alt="" />
-    </div>
   </div>
 </template>
 
@@ -245,6 +238,7 @@ onBeforeUnmount(() => {
       }
 
       .middle {
+        position: relative;
         flex: 1;
       }
     }

src/views/screen/components/ControlHelper.vue

@@ -2,6 +2,7 @@
 import { ref, watch, onMounted, onUnmounted } from 'vue';
 import { screenApi } from '@/api/screen';
 import * as echarts from 'echarts';
+import dayjs from 'dayjs';
 import "echarts-gl";
 import { getPieOptions } from '../config/echartOption';
 
@@ -9,13 +10,15 @@ let echart = null;
 
 const echartRef = ref(null);
 const legendData = ref([]);
+const dateTime = ref();
+const dataSource = ref({});
 
 const windowResize = () => echart.resize();
 
 onMounted(async () => {
 
-  const { data: { DF, XNJF, CLF, TYF, QTYJF } } = await screenApi.getFee();
-
+  const res = await screenApi.getFee();
+  const { DF, XNJF, CLF, TYF, QTYJF, testDate } = res.data;
   const data = [
     { name: '电费', value: DF, color: "#00A0E9"},
     { name: '絮凝剂费', value: XNJF, color: "#00AB84"},
@@ -26,6 +29,11 @@ onMounted(async () => {
 
   legendData.value = data
 
+  dataSource.value = {
+    ...res.data,
+    dateTime: dayjs(testDate).format('YYYY-MM-DD')
+  }
+
   echart = echarts.init(echartRef.value, 'light');
 
   echart.setOption( getPieOptions(data) );
@@ -44,15 +52,15 @@ onUnmounted(() => {
     <div class="home-box-top">
       <div class="title">成本管控助手</div>
       <div>
-        <span class="text-[#1A2029] text-[1.4rem]">2024-06-08</span>
+        <span class="text-[#1A2029] text-[1.4rem]">{{ dataSource.dateTime }}</span>
       </div>
     </div>
     <div class="main">
       <ul class="flex justify-between items-center">
         <li class="text-[1.4rem] font-bold text-[#1A2029]">成本指标</li>
-        <li class="text-[1.2rem] text-[#415B73]">
-          <span>直接成本：￥4256元/天</span>
-          <span>单位成本：￥400元/千吨</span>
+        <li class="text-[1.2rem] text-[#415B73] space-x-[2rem]">
+          <span>直接成本：￥{{ dataSource.ZJCB }}元/天</span>
+          <span>单位成本：￥{{dataSource.DWCB}}元/千吨</span>
         </li>
       </ul>
       <div class="echart_inner">

src/views/screen/components/EchartBar.vue

@@ -15,11 +15,13 @@ const props = defineProps({
 
 watch(() => props.screenData, (currentVal) => {
   const { no3Hlj1Jqr, no3Hlj2Jqr, nh31Jqr, nh32Jqr, tpRccJqr } = currentVal;
-  chart.setOption( getBarOptions([ no3Hlj1Jqr, no3Hlj2Jqr, nh31Jqr, nh32Jqr, tpRccJqr ]) )
+  const options = [ no3Hlj1Jqr, no3Hlj2Jqr, nh31Jqr, nh32Jqr, tpRccJqr ].map(item => {
+    return item ? Number(item.toFixed(2)) : 0;
+  })
+  chart.setOption( getBarOptions(options) )
 })
 
 const windowResize = () => {
-  console.log( "resieze" );
   chart.resize();
 }
 

yarn.lock

@@ -364,10 +364,10 @@
   resolved "https://registry.npmmirror.com/@emotion/hash/-/hash-0.8.0.tgz"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@esbuild/win32-x64@0.20.2":
+"@esbuild/darwin-x64@0.20.2":
   version "0.20.2"
-  resolved "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz"
-  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
+  resolved "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
 "@iktakahiro/markdown-it-katex@^4.0.1":
   version "4.0.1"
@@ -465,10 +465,10 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
-"@rollup/rollup-win32-x64-msvc@4.18.0":
+"@rollup/rollup-darwin-x64@4.18.0":
   version "4.18.0"
-  resolved "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz"
-  integrity sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==
+  resolved "https://registry.npmmirror.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz"
+  integrity sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
@@ -1820,6 +1820,11 @@ fs-extra@^11.2.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"