优化界面互动

src/assets/language/en.json

@@ -570,6 +570,7 @@
     "totalIncome": "totalIncome",
     "productNum": "Sales volume",
     "numberOfOrders": "numberOfOrders",
+	"salesAmount": "Sales amount",
     "commonTools": "commonTools",
     "deviceManagement": "deviceManagement",
     "discountCode": "discountCode",

src/assets/language/zh.json

@@ -572,6 +572,7 @@
     "totalIncome": "收入总额",
     "productNum": "销售量",
     "numberOfOrders": "订单数",
+	"salesAmount": "销售额",
     "commonTools": "常用工具",
     "deviceManagement": "设备管理",
     "discountCode": "优惠码",

src/common/js/utils.js

@@ -15,7 +15,7 @@ export const $M_Menus = {
   "M2":t("role.deviceView"),//设备查看
   // "M3":t("role.accountOperation"),//分销设置
   "M3":t("role.accountOperation"),//账户操作
-  "M4":t("role.alarmHistory"),//报警历史
+  "M4":t("role.orderData"),//报警历史
   "M5":t("role.advertisingManagement"),//广告管理
   "M6":t("role.taskMessage"),//任务消息
   "M7":t("role.discountCode"),//优惠码
@@ -26,7 +26,7 @@ export const $M_Menus = {
   // "M12":t("role.withdrawalAccountNo"),//提现账号
   // "M13":t("role.standbyWithdrawalAccountNo"),//备用提现账号
   "M14":t("role.dataOverview"),//数据概览
-  "M15":t("role.orderData"),//订单数据
+  "M15":t("role.alarmHistory"),//订单数据
   "M16":t("role.orderRefund"),//订单退款
   "M17":t("role.systemOffline"),//系统脱机
   // "M18":t("role.labelMan"),//标签管理

src/components/typeSelectList/index.less

@@ -15,6 +15,7 @@
       justify-content: center;
 	
 	  .txt4 {
+		  text-align: center;
 		  width: 80%;
 		  overflow: hidden;
 		  text-overflow: ellipsis;

src/views/device/index.vue

@@ -313,7 +313,7 @@ export default {
     const searchRef = ref(null);
     const oprRef = ref(null);
     const list = ref([]);
-    const loading = ref(false);
+    const loading = ref(true);
     const error = ref(false);
     const finished = ref(false);
     const router = useRouter();
@@ -392,7 +392,9 @@ export default {
     };
     // 搜索条件触发查询
     const search = (e) => {
-      searchParams.current = 0;
+	  list.value = [];
+	  loading.value = true;
+      searchParams.current = 1;
       searchParams = Object.assign(searchParams, e);
       getList();
     };

src/views/home/index.vue

@@ -314,7 +314,8 @@ export default {
               {
                 ...data.data.series[0],
                 type: "bar",
-                itemStyle: { color: "#E59A6D" },
+                itemStyle: { color: "#4D6ADD" },
+				name: t("home.productNum"),
                 label: {
                   show: true,
                   position: "top",
@@ -323,7 +324,8 @@ export default {
               {
                 ...data.data.series[1],
                 type: "bar",
-                itemStyle: { color: "#4D6ADD" },
+				itemStyle: { color: "#E59A6D" },
+				name: t("home.salesAmount"),
                 label: {
                   show: true,
                   position: "top",
@@ -435,7 +437,7 @@ export default {
 		  router.push({ path: "/accountOperation" }); // 账户操作
           break;
         case "M4":
-          router.push({ path: "/alarmHistory" }); // 报警历史
+          router.push({ path: "/orderCenter" }); // 报警历史
           break;
         case "M5":
           router.push({ path: "/advertManage" });
@@ -465,7 +467,7 @@ export default {
           router.push({ path: "/shandeMch" });
           break;
         case "M15":
-          router.push({ path: "/orderCenter" });
+          router.push({ path: "/alarmHistory" });
           break;
         case "M18":
           router.push({ path: "/labelMan" });

src/views/orderCenter/index.less

@@ -459,17 +459,21 @@
             }
 
             .word13 {
-              height: 13px;
+              height: 14px;
+			  width: 50%;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
               font-size: 14px;
               text-align: left;
-              white-space: nowrap;
+              // white-space: nowrap;
               line-height: 14px;
               display: block;
               margin-top: 30px;
               margin-bottom: 10px;
               margin-left: 20px;
+			  overflow: hidden;
+			  text-overflow: ellipsis;
+			  white-space: nowrap;
             }
 
             .main11 {

src/views/orderCenter/index.vue

@@ -322,7 +322,7 @@ export default {
     const searchRef = ref(null);
     const orderList = ref([]);
     const orderTotal = ref(0);
-    const loading = ref(false);
+    const loading = ref(true);
     const error = ref(false);
     const finished = ref(false);
     // 滚动加载
@@ -422,6 +422,8 @@ export default {
       searchParams = Object.assign(searchParams, data);
       // 这个会导致请求两次接口
       // finished.value = false;
+	  orderList.value = [];
+	  loading.value = true;
       searchParams.current = 1;
       getList();
     };

src/views/robotRanking.vue

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