宇宙无敌M1处理器的MacBook Pro %!s(int64=4) %!d(string=hai) anos
pai
achega
a11798b517

+ 15 - 7
mini/pages/data-center/index.js

xqd xqd xqd
@@ -297,7 +297,6 @@ Page({
       //     formatter: '{b}\n{d}%'
       //   }
       // }]
-      option.xAxis.show = false
       option = {
         legend: {
           orient: "vertical",
@@ -308,18 +307,23 @@ Page({
           type: type,
           data: data.data,
           left: "center",
+          top:"30%"
         }],
         width: "70%",
-        xAxis: {},
-        yAxis: {},
+        xAxis: {
+          show:false
+        },
+        yAxis: {
+          show:false
+        },
         tooltip: {},
         grid: {},
       }
     } else if (type == 'radar') {
-      option.xAxis.show = false
       option = {
         legend: {
-          data: data.legends
+          data: data.legends,
+          bottom:0
         },
         radar: {
           // shape: 'circle',
@@ -329,8 +333,12 @@ Page({
           type: type,
           data: data.data
         }],
-        xAxis: {},
-        yAxis: {},
+        xAxis: {
+          show:false
+        },
+        yAxis: {
+          show:false
+        },
         tooltip: {},
       }
     } else if (type == 'line') {

+ 1 - 1
mini/pages/data/index.js

xqd
@@ -374,7 +374,7 @@ Page({
         bottom: 40
       }
       var title = '设备最大单价费用排行'
-      title = (data.info.length != 0 ? data.info[0] + '-' + data.info[1] + '-' + data.info[2] + '-' + data.info[3] : '') + '\n' + '\n' + title
+      title = (data.info.length != 0 ? (data.info[0] != null ? data.info[0] + '-' : '') + (data.info[1] != null ? data.info[1] + '-' : '') + (data.info[2] != null ? data.info[2] + '-' : '') + (data.info[3] != null ? data.info[3] : '') : '') + '\n' + '\n' + title
       console.log(data)
       option.title = {
         text: title,

+ 9 - 2
mini/pages/detailInfo/detailData.js

xqd xqd
@@ -42,7 +42,8 @@ Page({
         date: this.data.date,
         project_id: this.data.project_id,
         dates: this.data.dates,
-        order_sn: this.data.order_sn
+        order_sn: this.data.order_sn,
+        user_id:wx.getStorageSync('sg-userinfo').id
       },
       success: (res) => {
         console.log(res)
@@ -72,8 +73,14 @@ Page({
               if (re.code == 0) {
                 wx.showToast({
                   title: re.msg,
-                  icon: "none"
+                  icon: "none",
+                  duration:1000
                 })
+                setTimeout(()=>{
+                  wx.navigateBack({
+                    delta: 1,
+                  })
+                },1000)
               }
             }
           })

+ 1 - 2
mini/pages/detailInfo/detailinfo.js

xqd xqd
@@ -39,7 +39,6 @@ Page({
     this.setData({
       project_id: options.id - 0
     })
-    this.getYears()
   },
 
   /**
@@ -118,7 +117,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getYears()
   },
 
   /**