fix：“放开DIY花型功能，修复机器年排行功能失效问题”

src/views/device/deviceOper.vue

@@ -132,8 +132,7 @@
         <div class="operText">{{ $t("device.showGoods") }}</div>
       </div>
       <!-- DIY花型 -->
-      <!-- v-if="device.equimentType == 'MG320' || device.equimentType == 'MG330'" -->
-      <div class="operItem" v-if="user.type < 1" @click="diyFlowerClk()">
+      <div class="operItem" v-if="device.equimentType == 'MG320' || device.equimentType == 'MG330'" @click="diyFlowerClk()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/diyFlower.png" />
         </div>

src/views/robotRanking.vue

@@ -5,21 +5,21 @@
       <div class="box3 flex-col">
         <div class="main1 flex-col">
           <div class="mod1 flex-col">
-              <div class="section1 flex-row justify-between">
-                <div class="ImageText1 flex-col">
-                  <div class="group4 flex-row justify-between">
-                    <div class="layer3 flex-col"></div>
-                      <span class="word3 flex-col">
-                        {{ $t("robotRanking.machineSalesRanking") }}
-                      </span>
-                  </div>
+            <div class="section1 flex-row justify-between">
+              <div class="ImageText1 flex-col">
+                <div class="group4 flex-row justify-between">
+                  <div class="layer3 flex-col"></div>
+                  <span class="word3 flex-col">
+                    {{ $t("robotRanking.machineSalesRanking") }}
+                  </span>
                 </div>
-                <div class="flex-col">
-                  <div @click="noticeClk" class="main5 flex-row justify-between">
-                    <img class="label2" src="@/assets/device/searchIcon.png" />
-                  </div>
+              </div>
+              <div class="flex-col">
+                <div @click="noticeClk" class="main5 flex-row justify-between">
+                  <img class="label2" src="@/assets/device/searchIcon.png" />
                 </div>
               </div>
+            </div>
           </div>
           <img class="img1" referrerpolicy="no-referrer" src="../assets/line.png" />
           <div class="l-f l-flex-e o-plr-15">
@@ -277,19 +277,20 @@ export default {
     };
     // 年的日期选择弹窗
     // 点击确定
-    const yearPopConfirm = (e) => {
-      // console.log("e的值是11", e);
-      const year = e.id;
+    const yearPopConfirm = ({ selectedOptions }) => {
+      const year = selectedOptions[0].id;
       const startDate =
         moment().year(year).startOf("year").format("YYYY-MM-DD") + " 00:00:00";
       const endDate =
         moment().year(year).endOf("year").format("YYYY-MM-DD") + " 23:59:59";
+      console.log("startDate", startDate);
+      console.log("endDate", endDate);
       getEquipRankList("year", startDate, endDate);
       yearShow.value = false;
     };
     // 获取当前年前4年后1年
     let yearPopList = [];
-    for (let i = -1; i < 5; i++) {
+    for (let i = 0; i < 4; i++) {
       const year = moment().subtract(i, "years").format("YYYY");
       yearPopList.push({
         name: year,

src/views/taskMessage/proportion/index.vue

@@ -99,7 +99,7 @@
                 </van-button>
               </div>
               <div class="itemRow" style="display: flex; justify-content: flex-end">
-                <span v-if="item.checkType === '0'" style="color: #FFA500"> {{ $t('taskMessage.toBeApproved') }}</span>
+                <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 === '3'" style="color: #ff0000"> {{ $t('taskMessage.fail') }}</span>
@@ -310,6 +310,7 @@ export default {
       busiPopFieldName,
       reviewedClk,
       isOper,
+      user,
     };
   },
 };