ソースを参照

feat: 1.菜单修改 2.设定参数分别控制 3.报警增加新的限制

sunxiao 5 ヶ月 前
コミット
ca5cd061b0

+ 1 - 1
index.html

@@ -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

@@ -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">

+ 2 - 2
src/components/Layout/TheMenu.vue

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

+ 2 - 2
src/router/index.js

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

+ 30 - 23
src/views/control/MedicinalView.vue

@@ -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,8 +138,9 @@ const transformData = (list) => {
 }
 
 // 编辑系数 - confirm
-const onEditConfirm = () => {
-  isVisibleBtn.value = true;
+const onEditConfirm = (source) => {
+  setting.value['isVisibleBtn' + source] = true;
+  // isVisibleBtn.value = true;
   
   transformData(southColumnData.value);
   transformData(northColumnData.value);
@@ -144,7 +149,8 @@ const onEditConfirm = () => {
 }
 
 // 编辑系数 - cancel
-const onEditCancel = () => {
+const onEditCancel = (source) => {
+  setting.value['isVisibleBtn' + source] = true;
   isVisibleBtn.value = true;
   Object.keys(dataSourceParams.value).forEach((key) => {
     southColumnData.value.map((item) => {
@@ -163,6 +169,8 @@ const onEditCancel = () => {
 // 切换tabs
 const onUpdateTab = (index) => {
   dataSourceParams.value.type = index;
+  onEditCancel('One');
+  onEditCancel('Two');
   // setTimeout(() => handleMedicateAmount())
 }
 
@@ -382,13 +390,13 @@ const waringTips = () => {
     }
   }
 
-  if ( isEmpty(addDifferenceOne) && isEmpty(jylpybjz) && isEmpty(minAddAmount)) {
+  if ( isEmpty(addDifferenceOne) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeOne == 1) {
     if (addDifferenceOne > minAddAmount && addDifferenceOne > jylpybjz) {
       result.threeTips.push('北池');
     }
   }
  
-  if ( isEmpty(addDifferenceTwo) && isEmpty(jylpybjz) && isEmpty(minAddAmount)) {
+  if ( isEmpty(addDifferenceTwo) && isEmpty(jylpybjz) && isEmpty(minAddAmount) && zuTaiStatus.value.activeTwo == 1) {
     if (addDifferenceTwo > minAddAmount && addDifferenceTwo > jylpybjz) {
       result.threeTips.push('南池');
     }
@@ -518,8 +526,7 @@ onMounted(async () => {
   })
  
   // 获取实时数据
-  controlApi.getNumValue().then(({ data }) => {
-
+  await controlApi.getNumValue().then(({ data }) => {
     // water实时数据
     waterConfigParams.value = data;
   
@@ -541,10 +548,10 @@ onMounted(async () => {
   })
 
   // 获取是否允许投药开关 - 锡林浩特
-  // controlApi.getSystemStatus().then(({ data }) => {
-    // 0不允许  1允许
-    // 系统 未投放  系统 投放中
-    // systemStatus.value = { ...data };
+  // await controlApi.getSystemStatus().then(({ data }) => {
+  //   // 0不允许  1允许
+  //   // 系统 未投放  系统 投放中
+  //   systemStatus.value = { ...data };
   // });
 })
 
@@ -658,7 +665,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"
@@ -669,20 +676,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'
@@ -808,7 +815,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"
@@ -819,20 +826,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=""

+ 1 - 1
src/views/login/LoginView.vue

@@ -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>