优化公告和一些样式

src/assets/language/en.json

@@ -5,11 +5,11 @@
     "noMore": "No more"
   },
   "dateSelectList": {
-    "today": "today",
-    "yesterday": "yesterday",
+    "today": "Today",
+    "yesterday": "Yesterday",
     "thisWeek": "This week",
     "thisMonth": "This month",
-    "other": "other"
+    "other": "Other"
   },
   "typeSelectList": {
     "thisMerchant": "This Merchant",
@@ -565,14 +565,14 @@
     "theLatestMessageIsDisplayedHereYouHaveAMessageToRead": "这里显示最新的消息，您有一条消息待阅读",
     "totalEquipment": "totalEquipment",
     "running": "running",
-    "dataOverview": "dataOverview",
+    "dataOverview": "Data overview",
     "orderData": "orderData",
-    "totalIncome": "totalIncome",
+    "totalIncome": "Total income",
     "productNum": "Sales volume",
-    "numberOfOrders": "numberOfOrders",
+    "numberOfOrders": "Order quantity",
 	"salesAmount": "Sales amount",
     "commonTools": "commonTools",
-    "deviceManagement": "deviceManagement",
+    "deviceManagement": "Device management",
     "discountCode": "discountCode",
     "distributionSettings": "distributionSettings",
     "accountPermission": "accountPermission",
@@ -587,9 +587,9 @@
     "customLogo": "custom logo",
     "logMan": "Log Management",
     "notificationPop": {
-      "notification": "notification",
-      "nextTime": "nextTime",
-      "roger": "roger"
+      "notification": "Notification",
+      "nextTime": "See it next time",
+      "roger": "Do not show again"
     }
   },
   "joinpayMch": {
@@ -742,7 +742,7 @@
     "search": "search",
     "totalIncome": "Total income",
     "productNum": "Sales volume",
-    "numberOfOrders": "Number of orders",
+    "numberOfOrders": "Order quantity",
     "orderDetails": "order details",
     "exportToExcel": "Export to Excel",
     "equipmentNo": "Equipment No",
@@ -830,7 +830,7 @@
     "addRole": "Add Role",
     "pleaseSelectARole": "Please select a role",
     "pleaseSelectAPattern": "Please select a pattern",
-    "deviceManagement": "device management",
+    "deviceManagement": "Device management",
     "deviceView": "Device View",
     "distributionSettings": "Distribution Settings",
     "alarmHistory": "Alarm history",
@@ -1095,9 +1095,9 @@
   "robotRanking": {
     "machineSalesRanking": "Machine sales ranking",
     "dailySalesRanking": "Daily sales ranking",
-    "today": "today",
-    "yesterday": "yesterday",
-    "other": "other",
+    "today": "Today",
+    "yesterday": "Yesterday",
+    "other": "Other",
     "salesRankingThisWeek": "Sales ranking this week",
     "thisWeek": "This week",
     "lastWeek": "last week",
@@ -1105,8 +1105,8 @@
     "thisMonth": "This month",
     "lastMonth": "Last month",
     "salesRankingThisYear": "Sales ranking this year",
-    "thisYear": "this year",
-    "lastYear": "last year",
+    "thisYear": "This year",
+    "lastYear": "Last year",
     "yearPopTitle": "Please select a year",
     "changeType": "Statistical method",
     "changeTypePlace": "Please select statistics method",

src/assets/language/zh.json

@@ -591,7 +591,7 @@
     "notificationPop":{
       "notification":"通知",
       "nextTime":"下次再看",
-      "roger":"知道了"
+      "roger":"不再显示"
     }
   },
   "joinpayMch": {

src/views/home/index.vue

@@ -174,7 +174,7 @@ export default {
     const noticeContent = ref({});
     // 获取公告
     const getNotice = () => {
-      Api_getNotice({ id: user.id }).then((res) => {
+      Api_getNotice({ adminId: user.id }).then((res) => {
         console.log("res", res);
         noticeContent.value = res.data.data || {};
       });
@@ -191,7 +191,6 @@ export default {
       console.log(e, 2222);
       Api_getUpdateNotice({
         adminId: user.id,
-        noticeId: noticeContent.value.id,
       }).then((res) => {
         console.log("res", res);
         Toast(res.data.message);
@@ -314,7 +313,7 @@ export default {
               {
                 ...data.data.series[0],
                 type: "bar",
-                itemStyle: { color: "#4D6ADD" },
+                itemStyle: { color: "#E59A6D" },
 				name: t("home.productNum"),
                 label: {
                   show: true,
@@ -324,7 +323,7 @@ export default {
               {
                 ...data.data.series[1],
                 type: "bar",
-				itemStyle: { color: "#E59A6D" },
+				itemStyle: { color: "#4D6ADD" },
 				name: t("home.salesAmount"),
                 label: {
                   show: true,

src/views/orderCenter/index.less

@@ -447,6 +447,7 @@
 
             .word11 {
               height: 13px;
+			  width: auto;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
               font-size: 14px;
@@ -460,7 +461,7 @@
 
             .word13 {
               height: 14px;
-			  width: 50%;
+			  width: 4.375rem;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
               font-size: 14px;

src/views/robotRanking.vue

@@ -676,7 +676,7 @@ export default {
               {
                 ...data.data.series[0],
                 type: "bar",
-                itemStyle: { color: "#4D6ADD" },
+                itemStyle: { color: "#E59A6D" },
 				name: t("home.productNum"),
                 label: {
                   show: true,
@@ -686,7 +686,7 @@ export default {
               {
                 ...data.data.series[1],
                 type: "bar",
-                itemStyle: { color: "#E59A6D" },
+                itemStyle: { color: "#4D6ADD" },
 				name: t("home.salesAmount"),
                 label: {
                   show: true,