Accueil Explorer Aide
S'inscrire Connexion
hongshan
/
slibra-module-web
7
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

feat: 碳源投加问题修改

sunxiao il y a 5 mois
Parent
262aaa572b
commit
0bcf6d3b77
7 fichiers modifiés avec 53 ajouts et 49 suppressions
Vue séparée Afficher les stats Diff
  1. 1 1
      index.html
  2. 1 1
      src/components/Layout/TheLogo.vue
  3. 3 3
      src/components/Layout/TheMenu.vue
  4. 2 2
      src/router/index.js
  5. 29 24
      src/views/control/MedicinalView.vue
  6. 16 17
      src/views/control/components/TheResultPanel.vue
  7. 1 1
      src/views/login/LoginView.vue

+ 1 - 1
index.html
Voir le fichier 

@@ -5,7 +5,7 @@
 
   <meta charset="UTF-8">
 
   <link rel="icon" href="/favicon.ico">
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>LibraAI智能体运营平台</title>
 
+  <title>锡林浩特污水处理厂 - LibraAI智能体运营平台</title>
 
 </head>
 
 
 <body>

+ 1 - 1
src/components/Layout/TheLogo.vue
Voir le fichier 

@@ -21,7 +21,7 @@ const handleClick = () => router.push('/');
 
       <div class="w-[28px] h-[28px] flex-shrink-0">

         <SvgIcon name="common-logo" size="28"></SvgIcon>

       </div>

-      <span class="block w-full font-[10px] text-left">LibraAI智能体运营平台<br>锡林浩特水务集团</span>

+      <span class="block w-full font-[10px] text-left">LibraAI智能体运营平台<br>锡林浩特污水处理厂</span>

     </div>

     <!-- 图标 -->

     <div class="icon-group flex items-center justify-center"  @click="changeCollapse" v-show="!subMenuCollapse">

+ 3 - 3
src/components/Layout/TheMenu.vue
Voir le fichier 

@@ -32,7 +32,7 @@ function renderLabel (val, url) {
 
 
 const menuOptions = [
 
   {
 
-    label: () => renderLabel('数据报表分析'),
 
+    label: () => renderLabel('数据分析智能体'),
 
     icon: renderIcon({ name: 'menu-xiht-analyse' }),
 
     key: '/'
 
   },
 
@@ -42,12 +42,12 @@ const menuOptions = [
 
     key: '/medicinal',
 
   },
 
   {
 
-    label: () => renderLabel('预测报表'),
 
+    label: () => renderLabel('预测分析智能体'),
 
     icon: renderIcon({ name: 'menu-answers' }),
 
     key: '/calculate',
 
   },
 
   {
 
-    label: () => renderLabel('用户中心'),
 
+    label: () => renderLabel('系统设置'),
 
     icon: renderIcon({ name: 'menu-user' }),
 
     key: '/user',
 
   },

+ 2 - 2
src/router/index.js
Voir le fichier 

@@ -23,7 +23,7 @@ const constantRouterMap = [
 
         name: "AnalyseView",
 
         component: () => import("@/views/xlht/AnalyseView.vue"),
 
         meta: {
 
-          title: "数据报表分析",
 
+          title: "数据分析智能体",
 
         },
 
       },
 
       {
 
@@ -54,7 +54,7 @@ const constantRouterMap = [
 
         name: 'User',
 
         component: () => import('@/views/user/index.vue'),
 
         meta: {
 
-          title: '用户中心'
 
+          title: '系统设置'
 
         }
 
       },
 
     ]

+ 29 - 24
src/views/control/MedicinalView.vue
Voir le fichier 

@@ -17,6 +17,10 @@ const isVisibleBtn = ref(true);
 
 const isVisibleUpdateInfo = ref(false);
 
 const zuTaiStatus = ref({});
 
 const minAndMaxValue = ref({});
 
+const setting = ref({
 
+  isVisibleBtnOne: true,
 
+  isVisibleBtnTwo: true
 
+})
 
 let msgReactive = '';
 
 let timer1 = '';
 
 let timer2 = '';
 
@@ -134,9 +138,9 @@ const transformData = (list) => {
 
 }
 
 
 // 编辑系数 - confirm
 
-const onEditConfirm = () => {
 
-  isVisibleBtn.value = true;
 
-  
+const onEditConfirm = (source) => {
 
+  setting.value['isVisibleBtn' + source] = true;
 
+
 
   transformData(southColumnData.value);
 
   transformData(northColumnData.value);
 
 
@@ -144,8 +148,9 @@ const onEditConfirm = () => {
 
 }
 
 
 // 编辑系数 - cancel
 
-const onEditCancel = () => {
 
-  isVisibleBtn.value = true;
 
+const onEditCancel = (source) => {
 
+  setting.value['isVisibleBtn' + source] = true;
 
+
 
   Object.keys(dataSourceParams.value).forEach((key) => {
 
     southColumnData.value.map((item) => {
 
       if (item.key === key) {
 
@@ -163,6 +168,8 @@ const onEditCancel = () => {
 
 // 切换tabs
 
 const onUpdateTab = (index) => {
 
   dataSourceParams.value.autoType = index;
 
+  onEditCancel('One');
 
+  onEditCancel('Two');
 
   // setTimeout(() => handleMedicateAmount())
 
 }
 
 
@@ -670,7 +677,7 @@ onUnmounted(() => {
 
                           <template #titleRight>
 
                             <div>
 
                               <div class="flex items-center space-x-[4px] cursor-pointer text-[#2454FF] text-[13px]"
 
-                                v-show="isVisibleBtn" @click="isVisibleBtn = false">
 
+                                v-show="setting.isVisibleBtnOne" @click="setting.isVisibleBtnOne = false">
 
                                 <svg width="16" height="16" viewBox="0 0 16 16" fill="none"
 
                                   xmlns="http://www.w3.org/2000/svg">
 
                                   <path d="M2.33337 14H14.3334" stroke="#2454FF" stroke-linecap="round"
 
@@ -681,20 +688,20 @@ onUnmounted(() => {
 
                                 <span>编辑</span>
 
                               </div>
 
                               <ul class="flex items-center text-[13px] space-x-[8px] cursor-pointer"
 
-                                v-show="!isVisibleBtn">
 
-                                <li class="cursor-pointer" @click="onEditConfirm" style="color: #2454FF">确定</li>
 
-                                <li class="cursor-pointer text-[#B0B7C0]" @click="onEditCancel">取消</li>
 
+                                v-show="!setting.isVisibleBtnOne">
 
+                                <li class="cursor-pointer" @click="onEditConfirm('One')" style="color: #2454FF">确定</li>
 
+                                <li class="cursor-pointer text-[#B0B7C0]" @click="onEditCancel('One')">取消</li>
 
                               </ul>
 
                             </div>
 
                           </template>
 
                           <ul class="data-source-list space-y-[12px]">
 
                             <li class="data-soruce-item" v-for="item, index in southColumnData">
 
                               <span>{{ item.label }}:</span>
 
-                              <span class="unit" v-show="isVisibleBtn">
 
+                              <span class="unit" v-show="setting.isVisibleBtnOne">
 
                                 {{ dataSourceParams[item.key] }}
 
                                 {{ index === 0 ? 'mg/L' : '' }}
 
                               </span>
 
-                              <div style="width: 140px;" v-show="!isVisibleBtn">
 
+                              <div style="width: 140px;" v-show="!setting.isVisibleBtnOne">
 
                                 <BaseInput
 
                                   :unit="index === 0 ? 'mg/L' : ''"
 
                                   size='small'
 
@@ -778,7 +785,7 @@ onUnmounted(() => {
 
                             :btn-group="[
 
                               { label: '手动', value1: '', value2: '' },
 
                               { label: '化验', value1: waterConfigParams.hyXsyHYTwo },
 
-                              { label: '预测', value1: waterConfigParams.hyXsyYCOne }
 
+                              { label: '预测', value1: waterConfigParams.hyXsyYCTwo }
 
                             ]"></BaseChooseItem>
 
                           <BaseChooseItem
 
                             tab-key="south" 
@@ -790,7 +797,7 @@ onUnmounted(() => {
 
                             :btn-group="[
 
                               { label: '手动', value1: '', value2: '' },
 
                               { label: '化验', value1: waterConfigParams.qyXsyHYTwo},
 
-                              { label: '预测', value1: waterConfigParams.qyXsyYCOne }
 
+                              { label: '预测', value1: waterConfigParams.qyXsyYCTwo }
 
                             ]"></BaseChooseItem>
 
                           <BaseChooseItem
 
                             tab-key="south"
 
@@ -802,7 +809,7 @@ onUnmounted(() => {
 
                             :btn-group="[
 
                               { label: '手动', value1: '', value2: '' },
 
                               { label: '化验', value1: waterConfigParams.qyAdHYTwo},
 
-                              { label: '预测', value1: waterConfigParams.qyAdYCOne }
 
+                              { label: '预测', value1: waterConfigParams.qyAdYCTwo}
 
                             ]"></BaseChooseItem>
 
                           <BaseChooseItem
 
                             tab-key="south"
 
@@ -820,7 +827,7 @@ onUnmounted(() => {
 
                           <template #titleRight>
 
                             <div>
 
                               <div class="flex items-center space-x-[4px] cursor-pointer text-[#2454FF] text-[13px]"
 
-                                v-show="isVisibleBtn" @click="isVisibleBtn = false">
 
+                                v-show="setting.isVisibleBtnTwo" @click="setting.isVisibleBtnTwo = false">
 
                                 <svg width="16" height="16" viewBox="0 0 16 16" fill="none"
 
                                   xmlns="http://www.w3.org/2000/svg">
 
                                   <path d="M2.33337 14H14.3334" stroke="#2454FF" stroke-linecap="round"
 
@@ -831,20 +838,20 @@ onUnmounted(() => {
 
                                 <span>编辑</span>
 
                               </div>
 
                               <ul class="flex items-center text-[13px] space-x-[8px] cursor-pointer"
 
-                                v-show="!isVisibleBtn">
 
-                                <li class="cursor-pointer" @click="onEditConfirm" style="color: #2454FF">确定</li>
 
-                                <li class="cursor-pointer text-[#B0B7C0]" @click="onEditCancel">取消</li>
 
+                                v-show="!setting.isVisibleBtnTwo">
 
+                                <li class="cursor-pointer" @click="onEditConfirm('Two')" style="color: #2454FF">确定</li>
 
+                                <li class="cursor-pointer text-[#B0B7C0]" @click="onEditCancel('Two')">取消</li>
 
                               </ul>
 
                             </div>
 
                           </template>
 
                           <ul class="data-source-list space-y-[12px]">
 
                             <li class="data-soruce-item" v-for="item, index in northColumnData">
 
                               <span>{{ item.label }}:</span>
 
-                              <span class="unit" v-show="isVisibleBtn">
 
+                              <span class="unit" v-show="setting.isVisibleBtnTwo">
 
                                 {{ dataSourceParams[item.key] }}
 
                                 {{ index === 0 ? 'mg/L' : '' }}
 
                               </span>
 
-                              <div style="width: 140px;" v-show="!isVisibleBtn">
 
+                              <div style="width: 140px;" v-show="!setting.isVisibleBtnTwo">
 
                                 <BaseInput
 
                                   isCenter
 
                                   placeholder=""
 
@@ -853,8 +860,6 @@ onUnmounted(() => {
 
                                   :unit="index === 0 ? 'mg/L' : ''"
 
                                   :isNeedFlotBtn="false"
 
                                   :readonly="index === northColumnData.length - 1"
 
-                                  :min="minAndMaxValue.minAddAmount"
 
-                                  :max="minAndMaxValue.maxAddAmount"
 
                                 >
 
                                 </BaseInput>
 
                               </div>
 
@@ -878,9 +883,9 @@ onUnmounted(() => {
 
           </div>
 
           <div class="right-section">
 
             <BaseTitle title="智能投加计算结果" type="second">
 
-              <template #right>
 
+              <!-- <template #right>
 
                 <div class="warning-btn" @click="onSystemWarning" v-show="warningList.length">查看系统警报</div>
 
-              </template>
 
+              </template> -->
 
             </BaseTitle>
 
             <div class="right-section-content">
 
               <TheResultPanel

+ 16 - 17
src/views/control/components/TheResultPanel.vue
Voir le fichier 

@@ -41,10 +41,9 @@ const flowData = computed(() => {
 
     data.doseNum = props.activeType === 0 ? props.nums.doseNum1 : props.nums.doseNum2;
 
     data.flowNum = props.activeType === 0 ? props.nums.flowNum1 : props.nums.flowNum2;
 
   } else {
 
-    data.doseNum = props.nums.doseNum1 >= props.nums.doseNum2 ? props.nums.doseNum2 : props.nums.doseNum1;
 
-    data.flowNum = props.nums.doseNum1 >= props.nums.doseNum2 ? props.nums.flowNum2 : props.nums.flowNum1;
 
+    data.doseNum = props.nums.doseNum1 >= props.nums.doseNum2 ? props.nums.doseNum1 : props.nums.doseNum2;
 
+    data.flowNum = props.nums.doseNum1 >= props.nums.doseNum2 ? props.nums.flowNum1 : props.nums.flowNum2;
 
   }
 
-
 
   return data;
 
 })
 
 
@@ -99,23 +98,23 @@ const getPositionText = computed(() => {
 
 
 const emitEvent = (type) => {
 
 
-  const name = type == 'one' ? '西池' : '东池';
 
+  // const name = type == 'one' ? '西池' : '东池';
 
 
-  if ( type == 'one' ) {
 
-    if ( modelSystemStatus.activeOne != 1 ) {
 
-      return message.warning('在组态投放下无法启动', {duration: 5 * 1000});
 
-    }
 
-    systemStatus.value.activeOne = systemStatus.value.activeOne === 1 ? 0 : 1;
 
-  } else {
 
-    if ( modelSystemStatus.activeTwo != 1 ) {
 
-      return message.warning('在组态投放下无法启动', {duration: 5 * 1000});
 
-    }
 
-    systemStatus.value.activeTwo = systemStatus.value.activeTwo === 1 ? 0 : 1;
 
-  }
 
+  // if ( type == 'one' ) {
 
+  //   if ( modelSystemStatus.activeOne != 1 ) {
 
+  //     return message.warning('在组态投放下无法启动', {duration: 5 * 1000});
 
+  //   }
 
+  //   systemStatus.value.activeOne = systemStatus.value.activeOne === 1 ? 0 : 1;
 
+  // } else {
 
+  //   if ( modelSystemStatus.activeTwo != 1 ) {
 
+  //     return message.warning('在组态投放下无法启动', {duration: 5 * 1000});
 
+  //   }
 
+  //   systemStatus.value.activeTwo = systemStatus.value.activeTwo === 1 ? 0 : 1;
 
+  // }
 
 
-  controlApi.putSystemStatus({ ...systemStatus.value });
 
+  // controlApi.putSystemStatus({ ...systemStatus.value });
 
 
-  message.success(`${name}投药状态更改成功`);
 
+  // message.success(`${name}投药状态更改成功`);
 
 };
 
 const emitUpdate = async () => {
 
   emit('on-update');

+ 1 - 1
src/views/login/LoginView.vue
Voir le fichier 

@@ -68,7 +68,7 @@ const handleSubmit = async () => {
 
 
     <div class="tips-wrapper">
 
       <ul class="tips-inner">
 
-        <li class="title">LibraAI 智能体运营平台<br />锡林浩特水务集团</li>
 
+        <li class="title">LibraAI 智能体运营平台<br />锡林浩特污水处理厂</li>
 
         <li class="sub-title">使命重在担当，实干铸就未来</li>
 
       </ul>
 
     </div>