Merge branch 'sunzee-test' of http://112.74.63.148:3000/litianbiao/shenze-sysMan into sunzee-test

src/App.vue

@@ -4,10 +4,10 @@
       <transition :name="transitionName">
         <!-- 缓存组件，但是进入编辑页面就会有问题 -->
         <!-- <keep-alive include="device,deviceSet,role"><component :is="Component" /></keep-alive> -->
-        <component :is="Component" v-if="!$route.meta.keepAlive" />
+        <component :is="Component" :key="$route.name" v-if="!$route.meta.keepAlive" />
       </transition>
       <keep-alive>
-        <component :is="Component" v-if="$route.meta.keepAlive" />
+        <component :is="Component" :key="$route.name" v-if="$route.meta.keepAlive" />
       </keep-alive>
     </router-view>
     <nav-bar v-if="tabType"></nav-bar>
@@ -44,17 +44,17 @@ export default {
       }
       next();
     });
-    router.afterEach(()=>{
+    router.afterEach(() => {
       let currentRouteName = router.currentRoute.value.name;
       if (currentRouteName === 'home' || currentRouteName === 'device' || currentRouteName === 'robotranking' || currentRouteName === 'user') {
         tabType.value = true;
-      } else { 
+      } else {
         tabType.value = false;
       }
     })
-    
 
-    return { 
+
+    return {
       ...toRefs(state),
       tabType,
     };
@@ -85,20 +85,20 @@ export default {
   }
 
   // .van-field__body {
-    // border: 1px solid #dddde8;
-    // border-radius: 2px;
-    // height: 38px;
-    // line-height: 38px;
-    // padding-left: 6px;
-    // width: auto;
+  // border: 1px solid #dddde8;
+  // border-radius: 2px;
+  // height: 38px;
+  // line-height: 38px;
+  // padding-left: 6px;
+  // width: auto;
   // }
   .van-field__control {
-        height: 38px;
-        line-height: 38px;
-        padding: 6px;
-        border-radius: 1px;
-        border: 1px solid #dddde8;
-    }
+    height: 38px;
+    line-height: 38px;
+    padding: 6px;
+    border-radius: 1px;
+    border: 1px solid #dddde8;
+  }
 }
 
 // 下边框线条
@@ -118,6 +118,7 @@ p {
   // color: #333333;
   font-family: "Arial", sans-serif;
   font-size: 12px;
+
   // .van-dialog {
   //   font-size: 0.4rem;
   // }
@@ -128,13 +129,19 @@ p {
   .van-dialog {
     width: 85%;
   }
-  
+
   .van-dropdown-menu__title {
     font-size: 10px;
     color: #404d74;
     width: 70px;
     text-align: center;
   }
+
+  .van-nav-bar__title {
+    color: #404d74;
+    font-size: 15px;
+    font-weight: 600;
+  }
 }
 
 

src/assets/language/en.json

@@ -248,6 +248,8 @@
   "device": {
     "managementCenter": "Machine Management Center",
     "whole": "All",
+    "powerOn": "Open",
+    "abnormal": "Abnormalities",
     "group": "Group management",
     "addGroup": "Add Group",
     "setAlarm": "Set alarm",

src/assets/language/ja.json

@@ -248,6 +248,8 @@
     "device": {
         "managementCenter": "デバイス管理センター",
         "whole": "全体",
+        "powerOn": "営業中",
+        "abnormal": "異常",
         "group": "グループ管理",
         "addGroup": "グループの追加",
         "setAlarm": "アラーム設定",

src/assets/language/zh.json

@@ -253,6 +253,8 @@
   "device": {
     "managementCenter": "设备管理中心",
     "whole": "全部",
+    "powerOn": "营业中",
+    "abnormal": "异常",
     "group": "分组管理",
     "addGroup": "添加分组",
     "setAlarm": "设置闹钟",

src/components/NavBar.vue

@@ -37,7 +37,7 @@
     <van-tabbar-item replace to="/home" icon="home-o">{{ $t('navBar.homePage') }}</van-tabbar-item>
     <van-tabbar-item v-if="isDeviceData" replace to="/device" :dot="hasAlarm" icon="setting-o">{{
       $t('navBar.deviceInformation') }}</van-tabbar-item>
-    <van-tabbar-item replace to="/robotranking" icon="bar-chart-o">{{ $t('navBar.machineRanking') }}</van-tabbar-item>
+    <van-tabbar-item v-if="isRankingData" replace to="/robotranking" icon="bar-chart-o">{{ $t('navBar.machineRanking') }}</van-tabbar-item>
     <van-tabbar-item replace to="/user" icon="user-o">{{ $t('navBar.personalCenter') }}</van-tabbar-item>
   </van-tabbar>
   <!-- </div> -->
@@ -76,10 +76,17 @@ export default {
     const count = computed(() => {
       return store.state.cartCount;
     });
+    // 机器排行权限
+    const isRankingData = computed(() => {
+      return user.menuCodeList.some((item) => {
+        return item === "M11";
+      });
+    });
 
     return {
       count,
-      isDeviceData
+      isDeviceData,
+      isRankingData
     };
   },
 };

src/components/SimpleHeader.vue

@@ -1,13 +1,14 @@
 <template>
-  <div class="block">
+  <!-- <div class="block">
     <header class="simple-header van-hairline--bottom" :style="{ position: isFixed ? 'fixed' : 'relative' }">
       <i v-if="!isback" class="nbicon nbfanhui" @click="goBack"></i>
-      <!-- <i v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i> -->
       <i v-else></i>
       <div class="simple-header-name">{{ name }}</div>
       <i class="nbicon nbmore moreIcon"></i>
     </header>
-  </div>
+  </div> -->
+  <van-nav-bar v-if="!isback" :title="name" left-arrow @click-left="onClickLeft"/>
+  <van-nav-bar v-else :title="name" />
 </template>
 
 <script>
@@ -52,9 +53,12 @@ export default {
       }
       ctx.emit('callback')
     }
+
+    const onClickLeft = () => history.back();
     return {
       goBack,
-      isback
+      isback,
+      onClickLeft,
     }
   }
 }
@@ -83,6 +87,7 @@ export default {
   }
 }
 
+
 .block {
   width: 100%;
   height: 44px;

src/router/index.js

@@ -316,7 +316,7 @@ const router = createRouter({
       path: "/merchantManage",
       name: "merchantManage",
       component: () => import("@/views/merchantManage/index"),
-      meta: { index: 1 },
+      meta: { index: 1, keepAlive: true },
     },
     // 商户信息
     {

src/styles/device/index.less

@@ -380,13 +380,13 @@
                 background-size: 100%;
               }
 
-              .c-text-14 {
+              .c-text-12 {
                 display: inline-block;
                 /* 将行内文本转为块级元素 */
-                padding: 5px 10px;
+                padding: 8px 8px;
                 /* 添加内边距 */
                 background-color: #df5e4c;
-                border-radius: 0.5rem;
+                border-radius: 10px;
                 /* 添加圆角效果 */
                 color: #fff;
                 /* 设置文本颜色 */

src/styles/home/index.less

@@ -159,12 +159,12 @@
               // padding-right: 0.5rem;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 0.4rem;
+              font-size: 16px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 0.4rem;
-              margin-top: 0.25rem;
+              line-height: 16px;
+              margin-top: 3px;
               display: block;
             }
 
@@ -173,13 +173,13 @@
               // height: 30px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 0.6rem;
+              font-size: 22px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 0.6rem;
+              line-height: 22px;
               // margin-left: -20px;
-              margin-top: 0.1rem;
+              // margin-top: 0.1rem;
               display: block;
             }
           }
@@ -333,7 +333,7 @@
       // height: 54px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
-      padding: 0.2rem 0.5rem;
+      padding: 10px 20px;
 
       .main24 {
         // width: 100%;
@@ -341,7 +341,7 @@
         .ImageText10 {
           // height: 14px;
           // margin-left: 20px;
-          width: 2.5rem;
+          // width: 2.5rem;
 
           .wrap2 {
             // width: 78px;
@@ -350,9 +350,10 @@
             .outer10 {
               // z-index: 2;
               position: relative;
-              width: 0.35rem;
-              height: 0.45rem;
-              border: 2px rgba(128, 150, 236, 1);
+              width: 15px;
+              height: 15px;
+              margin-right: 5px;
+              // border: 2px rgba(128, 150, 236, 1);
               background: url("../../assets/home/machineSales.png") center no-repeat;
               background-size: 100%;
             }

src/styles/login/index.less

@@ -1,8 +1,8 @@
 .login {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    align-content: flex-start;
+    // display: flex;
+    // flex-wrap: wrap;
+    // flex-direction: row;
+    // align-content: flex-start;
 
     .loginLogoBox {
         width: 100%;

src/styles/merchantManage/index.less

@@ -3,9 +3,9 @@
 
     .merchantBox {
         width: 100%;
-        height: calc(100% - 44px);
-        overflow: auto;
-        overflow-x: hidden;
+        // height: calc(100% - 44px);
+        // overflow: scroll;
+        // overflow-x: hidden;
 
         .searchRow {
             width: 90%;
@@ -79,7 +79,7 @@
                 box-shadow: 1px 1px 4px 2px rgba(70, 95, 198, 0.14);
                 background-color: rgba(255, 255, 255, 1);
                 border-radius: 4px;
-                height: 250px;
+                // height: 250px;
                 margin: 0 10px;
                 margin-bottom: 20px;
                 // width: 100%;
@@ -90,18 +90,18 @@
 
                     .box2 {
                         width: 100%;
-                        height: 14px;
+                        // height: 14px;
 
                         .word3 {
                             width: 202px;
-                            height: 13px;
+                            // height: 13px;
                             overflow-wrap: break-word;
                             color: rgba(64, 77, 116, 1);
                             font-size: 14px;
                             font-family: PingFangSC-Semibold;
                             text-align: left;
-                            white-space: nowrap;
-                            line-height: 14px;
+                            // white-space: nowrap;
+                            line-height: 20px;
                             display: block;
                         }
 

src/styles/orderCenter/index.less

@@ -79,12 +79,12 @@
               // padding-right: 0.5rem;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 15px;
+              font-size: 16px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 15px;
-              margin-top: 10px;
+              line-height: 16px;
+              margin-top: 3px;
               display: block;
             }
 
@@ -93,13 +93,13 @@
               // height: 30px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
-              font-size: 20px;
+              font-size: 22px;
               font-family: PingFangSC-Semibold;
               text-align: center;
               white-space: nowrap;
-              line-height: 20px;
+              line-height: 22px;
               // margin-left: -20px;
-              margin-top: 5px;
+              // margin-top: 5px;
               display: block;
             }
           }
@@ -331,7 +331,7 @@
           // height: 0.325rem;
           overflow-wrap: break-word;
           color: rgba(229, 154, 109, 1);
-          font-size: 11px;
+          font-size: 12px;
           font-family: PingFangSC-Medium;
           text-align: left;
           white-space: nowrap;

src/styles/user/index.less

@@ -6,8 +6,8 @@
     // padding-bottom: 50px;
 
 
-    .simple-header {
-        background: transparent !important;
+    .van-nav-bar {
+        background: transparent;
     }
 
     .userPageBox {

src/views/device/index.vue

@@ -53,6 +53,10 @@
           <van-tabs v-model:active="active" @click-tab="clickLabel" class="tabs2 o-pb-15">
             <van-tab :title="$t('device.whole')" name="">
             </van-tab>
+            <van-tab :title="$t('device.powerOn')" name="ON">
+            </van-tab>
+            <van-tab :title="$t('device.abnormal')" name="ABNORMAL">
+            </van-tab>
             <van-tab v-for="item in labelList" :name="item.id" :key="item" :title="item.name">
             </van-tab>
           </van-tabs>
@@ -79,7 +83,8 @@
                 </span>
                 <!-- 温湿度 -->
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
-                  class="txt1 o-mt-10">
+                  class="txt1 o-mt-10" :style="{ color: item.furnaceTm <= 100 && item.eqeStatus == 1  ? '#ff0033' : '', 
+                  fontSize: item.furnaceTm <= 100 && item.eqeStatus == 1 ? '18px' : '' }">
                   {{ $t("device.furnaceHeadTemperature") + '：' +
                     item.furnaceTm
                     + $t("device.degree") }}
@@ -108,7 +113,6 @@
                 </span>
                 <img v-if="item.checkType" class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                 <div class="contentBottomCon" v-if="item.checkType">
-
                   <!-- 所属商家 -->
                   <!-- <span class="txt1 o-mt-10">{{ $t("device.affiliatedMerchants") }}：{{ item.adminUserName }}</span> -->
                   <div v-if="user.type < 2" class="contentWord kBordBott">{{ $t("device.affiliatedMerchants") }}：{{
@@ -165,32 +169,6 @@
                     <span class="word">{{ $t("device.position") }}：</span>
                     <a class="clickable-link" @click="viewPosiClk(item)">{{ item.fullName }}</a>
                   </span>
-
-                  <!-- 机器参数 -->
-                  <!-- <van-row class="layer5 kBordBott" justify="space-between"
-                    v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'">
-                    <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}：{{
-        item.furnaceTm
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.temperatureInCabinet") }}：{{
-        item.cabinetTm
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.humidityInCabinet") }}：{{
-        item.cabinetHd
-      }}{{ $t("device.humidity") }}</van-col>
-                  </van-row> -->
-
-
-                  <!-- <van-row class="layer5 kBordBott" justify="space-between" v-if="item.machineType == '1'">
-                    <van-col class="word5">{{ $t("device.cornGeneratorTemperature") }}：{{
-        item.cabinetTm
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.stirringTemperature") }}：{{
-        item.cabinetHd
-      }}{{ $t("device.degree") }}</van-col>
-                    <van-col class="word5">{{ $t("device.cupQuantity") }}：{{ item.furnaceTm
-                      }}</van-col>
-                  </van-row> -->
                   <template v-if="item.isMaterialUse === '1' && (item.machineType == '0' || item.machineType == null)">
                     <van-row justify="space-between" class="sugarTxt kBordBott">
                       <van-col>
@@ -257,7 +235,7 @@
                   <div class="editDeviceBtnCon l-flex-center o-mt-10">
                     <!-- 详细信息 -->
                     <div class="l-flex-RC" @click="deviceSet(item)">
-                      <span class="c-text-14">{{
+                      <span class="c-text-12">{{
                         $t("device.editDevice")
                       }}</span>
                       <div class="box2 flex-col"></div>
@@ -265,7 +243,7 @@
 
                     <!-- 远程操作 -->
                     <div class="l-flex-RC" @click="deviceOprShow(item)">
-                      <span class="c-text-14">{{
+                      <span class="c-text-12">{{
                         $t("device.commonOperations")
                       }}</span>
                       <div class="box2 flex-col"></div>
@@ -639,7 +617,7 @@ export default {
     // 点击标签
     const active = ref("");
     const clickLabel = (item) => {
-      // console.log(item);
+      console.log(item);
       list.value = [];
       searchParams.current = 1;
       searchParams.labelId = item.name;

src/views/home/index.vue

@@ -42,10 +42,10 @@
           </div>
           <div class="salesDataBox flex-row">
             <div class="dataGroup flex-col">
-              <div class="dataGroupBox flex-row justify-center">
+              <div class="dataGroupBox l-flex-RC justify-center">
                 <!-- 首页 - 订单数据 - 收入总额￥ -->
                 <!-- <span class="word8">&yen;</span> -->
-                <span class="currencySymbol">{{ currencySymbol }}</span>
+                <span class="currencySymbol o-pr-2">{{ currencySymbol }}</span>
                 <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
               </div>
               <span class="dataText">{{ $t("home.totalIncome") }}</span>
@@ -86,9 +86,9 @@
       <!-- 常用工具 -->
       <div v-if="user.type === 0">
         <div class="outer9 flex-col justify-center">
-          <div class="main24 flex-col justify-between">
+          <div class="main24 flex-col ">
             <div class="ImageText10 flex-col">
-              <div class="wrap2 flex-row justify-between">
+              <div class="wrap2 flex-row l-flex-RC">
                 <div class="outer10 flex-col"></div>
                 <div class="TextGroup13 flex-col">
                   <span class="txt13">{{ $t("home.commonTools") }}</span>

src/views/merchantManage/index.vue

@@ -23,6 +23,12 @@
           </div>
         </div>
         <div class="main4 flex-col">
+          <van-tabs v-model:active="active" @click-tab="clickLabel" class="tabs2 o-pb-15" v-if="user.type < 2">
+            <van-tab title="商户" name="2">
+            </van-tab>
+            <van-tab title="子账号" name="3">
+            </van-tab>
+          </van-tabs>
           <div class="bd1 flex-col" v-for="(item, index) in adminList" :key="index">
             <div class="outer2 flex-col">
               <div class="box2 flex-row justify-between">
@@ -40,16 +46,17 @@
               <span class="txt2"
                 v-html="`${$t('merchantManage.managementSystemId')}：` + (item.managerId == null ? '' : item.managerId)"></span>
               <div class="box3 flex-col">
-                <span class="txt3" v-html="`${$t('merchantManage.creationTime')}：` + Format_time(item.createDate)"></span>
+                <span class="txt3"
+                  v-html="`${$t('merchantManage.creationTime')}：` + Format_time(item.createDate)"></span>
               </div>
               <div class="button-container">
                 <van-button v-if="user.type < 2" class="btn1" round type="success"
                   @click="autoLogin(item.id)">切换登陆</van-button>
-                <van-button class="btn1" round type="primary" @click="merchantSet(item)">详细信息</van-button>
+                <van-button v-if="active == 2" class="btn1" round type="primary" @click="merchantSet(item)">详细信息</van-button>
               </div>
             </div>
           </div>
-          <van-back-top right="3vw" bottom="5vh" />
+          <van-back-top @click="backTop" right="3vw" bottom="5vh" />
         </div>
       </van-list>
     </div>
@@ -57,13 +64,13 @@
   </div>
 </template>
 <script>
-import { onMounted, reactive, ref } from "vue";
+import { onMounted, reactive, ref, onActivated } from "vue";
 import sHeader from "../../components/SimpleHeader";
 import { getAdminList, autoLoginMerchant } from '../../service/merchantManage';
 import { getLoginUser, Format_time, styleUrl, setLocal } from "../../common/js/utils";
 import { showFailToast, showSuccessToast, showConfirmDialog } from 'vant';
 import merchantSearch from './merchantSearch.vue';
-import { useRouter } from "vue-router";
+import { useRouter, onBeforeRouteLeave } from "vue-router";
 import { useI18n } from "vue-i18n";
 
 
@@ -79,10 +86,36 @@ export default {
     const loading = ref(false); // 加载状态
     const error = ref(false); // 错误状态
     const finished = ref(false); // 结束翻页状态
+    const verticalScrollPosition = ref(0);
+    // 点击标签
+    const active = ref("");
+
+    // 返回顶部
+    const backTop = () => {
+      window.scrollY = 0;
+    }
+
+    onActivated(() => {
+      // 当组件被激活时，可能是从 keep-alive 缓存中激活的
+      // 这时重新添加滚动事件监听器
+      // console.log("进入时的位置", verticalScrollPosition.value);
+      document.documentElement.scrollTop = verticalScrollPosition.value;
+      document.body.scrollTop = verticalScrollPosition.value;
+      window.scrollY = verticalScrollPosition.value;
+      // window.addEventListener('scroll', handleScroll);
+    });
+
+
+    onBeforeRouteLeave(() => {
+      verticalScrollPosition.value = document.documentElement.scrollTop || document.body.scrollTop || window.scrollY;
+      // console.log("离开时的位置", verticalScrollPosition.value);
+    })
+
     let searchParams = reactive({
       id: user.id,
       current: 1, // 页数
       size: 20, // 页大小
+      type: "2",
     });
     onMounted(async () => {
       // 加载样式
@@ -95,6 +128,13 @@ export default {
       searchParams.current = 1;
       getList();
     }
+
+    const clickLabel = (item) => {
+      adminList.value = [];
+      searchParams.current = 1;
+      searchParams.type = item.name;
+      getList();
+    }
     // 滚动加载
     const onLoad = () => { if (!finished.value) { searchParams.current = searchParams.current + 1; getList(); } };
     // 获取设备列表数据
@@ -165,6 +205,9 @@ export default {
       autoLogin,
       Format_time,
       user,
+      backTop,
+      active,
+      clickLabel,
     };
   },
 };

src/views/orderCenter/index.vue

@@ -32,10 +32,10 @@
           <div class="salesData flex-col">
             <div class="salesDataBox flex-row">
               <div class="dataGroup flex-col">
-                <div class="dataGroupBox flex-row justify-center">
+                <div class="dataGroupBox l-flex-RC justify-center">
                   <!-- 订单中心 - 收入总额￥ -->
                   <!-- <span class="word8">&yen;</span> -->
-                  <span class="currencySymbol">{{ currencySymbol }}</span>
+                  <span class="currencySymbol o-pr-2">{{ currencySymbol }}</span>
                   <span class="dataNum">{{ salesVolume.toFixed(2) }}</span>
                 </div>
                 <span class="dataText">{{ $t("home.totalIncome") }}</span>
@@ -104,7 +104,7 @@
                     <span class="payType">{{ item.statusText }}：
                     </span>
                     <!-- 订单明细 - 线下支付 ￥ -->
-                    <span class="currencySymbol">{{ currencySymbol }}</span>
+                    <span class="currencySymbol o-pr-2">{{ currencySymbol }}</span>
                     <span class="orderPrice" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
                     <span class="orderPrice" v-else>
                       {{ item.refundAmount == null ? item.price.toFixed(2) : (item.price - item.refundAmount).toFixed(2)

src/views/robotRanking.vue

@@ -158,7 +158,7 @@
     </van-popup>
     <!-- <nav-bar></nav-bar> -->
   </div>
-  <div v-else class="noPermission" style="display: flex; justify-content: center;">
+  <div v-else class="noPermission" style="justify-content: center;">
     <div class="box1 flex-col" style="text-align: center;">
       <s-header :name="$t('robotRanking.machineSalesRanking')" :noback="true" :isFixed="false"></s-header>
       <view>

src/views/taskMessage/proportion/index.vue

@@ -101,7 +101,7 @@
               <div class="itemRow" style="display: flex; justify-content: flex-end">
                 <span v-if="item.checkType === '0' && user.type > 1" style="color: #FFA500"> {{ $t('taskMessage.toBeApproved') }}</span>
                 <span v-if="item.checkType === '1'" style="color: #1989fa"> {{ $t('taskMessage.adopt') }}</span>
-                <span v-if="item.checkType === '2'" style="color: #ff0000"> {{ $t('taskMessage.cancel') }}</span>
+                <span v-if="item.checkType === '2'" style="color: #ff0033"> {{ $t('taskMessage.cancel') }}</span>
                 <span v-if="item.checkType === '3'" style="color: #ff0000"> {{ $t('taskMessage.fail') }}</span>
               </div>
             </div>