Ver código fonte

修改页面,调整

yanjie 4 anos atrás
pai
commit
a8b2444787

+ 1 - 1
mini/components/inner-device-card/index.wxml

xqd
@@ -1,7 +1,7 @@
 <!--components/inner-device-card/index.wxml-->
 <view class="sg-item sg-white-bg sg-pad sg-margin-bottom" bindtap="switchChecked" data-index="{{index}}">
   <view class="sg-top sg-flex sg-space-between sg-bottom-border sg-pad-bottom-sm sg-font-small sg-bold">
-    <view class="sg-name">{{item.device_name ? item.device_name.name : ''}} - {{item.inner_name ? item.inner_name : ''}}
+    <view class="sg-name">{{item.inner_name ? item.inner_name : ''}} - {{item.spec_name ? item.spec_name : ''}}
     </view>
     <view class="sg-flex sg-align-center">
       <view class="sg-status sg-flex sg-align-center" wx:if="{{showStatus}}">

+ 25 - 7
mini/pages/data/index.js

xqd xqd xqd xqd xqd xqd xqd
@@ -15,8 +15,11 @@ function initChart(canvas, width, height, dpr) {
     devicePixelRatio: dpr // new
   });
   canvas.setChart(chart);
-
+  chart.on('click',function(params){
+    console.log(params)
+  })
   option = {
+    color:["#5992fd"],
     legend: {
       data: []
     },
@@ -189,7 +192,8 @@ Page({
     var chartIndex = this.data.chartIndex
     if (chartIndex == 0) {
       option.xAxis = [{
-        type: 'value'
+        type: 'value',
+        show: false
       }]
 
       option.legend = {
@@ -203,7 +207,11 @@ Page({
       option.title = {
         text: title,
         left: 'center',
-        bottom: 20
+        bottom: 10,
+        textStyle: {
+          fontSize: 14,
+          color:"#5992fd"
+        },
       }
       option.yAxis = [{
         type: 'category',
@@ -239,7 +247,8 @@ Page({
       }
     } else if (chartIndex == 1) {
       option.xAxis = [{
-        type: 'value'
+        type: 'value',
+        show:false
       }]
 
       option.legend = {
@@ -253,7 +262,11 @@ Page({
       option.title = {
         text: title,
         left: 'center',
-        bottom: 20
+        bottom: 10,
+        textStyle: {
+          fontSize: 14,
+          color:"#5992fd"
+        },
       }
       option.yAxis = [{
         type: 'category',
@@ -290,7 +303,8 @@ Page({
       // chart.resize({width: '80vw', height: '80vh'})
     } else {
       option.xAxis = [{
-        type: 'value'
+        type: 'value',
+        show:false
       }]
 
       option.legend = {
@@ -301,7 +315,11 @@ Page({
       option.title = {
         text: title,
         left: 'center',
-        bottom: 20
+        bottom: 10,
+        textStyle: {
+          fontSize: 14,
+          color:"#5992fd"
+        },
       }
       option.yAxis = [{
         type: 'category',

+ 3 - 3
mini/pages/data/index.wxml

xqd
@@ -31,15 +31,15 @@
       <sg-date-picker bind:update="updateDate"></sg-date-picker>
       <view class="sg-flex sg-align-center condition">
         <view class="sg-flex sg-align-center" bindtap="navigate" data-url="/pages/data-center/index">
-          <van-icon name="search" class=" sg-index-color" style="font-size:1.3rem" bindtap="switchShow" data-name="dateShow"
-            data-show="{{true}}"></van-icon>
+          <van-icon name="search" class=" sg-index-color" style="font-size:1.3rem" bindtap="switchShow"
+            data-name="dateShow" data-show="{{true}}"></van-icon>
           <text class="sg-index-color" style="font-size:26rpx">条件查找</text>
         </view>
       </view>
     </view>
   </view>
   <view class="sg-white-bg sg-chart-box">
-    <view class="sg-flex sg-pad sg-align-center" style="justify-content: flex-end;">
+    <view class="sg-flex sg-pad sg-align-center" style="justify-content: flex-end;color: #5693FC;">
       <view wx:if="{{chartIndex == 0}}">
         <van-icon name="setting-o" class="sg-icon-lg" bindtap="switchShow" data-name="projectShow"
           data-show="{{true}}" />

+ 1 - 1
mini/pages/order-inner/index.wxml

xqd
@@ -11,7 +11,7 @@
     </view>
     <view class="sg-tabs sg-flex sg-align-center sg-white-bg sg-pad sg-bottom-border sg-top-border sg-font-small">
       <view wx:for="{{tabs}}" wx:key="index" class="sg-tab {{tabIndex == index ? 'sg-selected' : ''}}"
-        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||tabIndex==4&&index<4}}">{{ item }}</view>
+        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||type=='abnormal'&&index<4}}">{{ item }}</view>
     </view>
   </view>
   <view class="sg-list-box sg-pad">

+ 1 - 1
mini/pages/order/index.wxml

xqd
@@ -13,7 +13,7 @@
     </view>
     <view class="sg-tabs sg-flex sg-align-center sg-white-bg sg-pad sg-bottom-border sg-top-border sg-font-small">
       <view wx:for="{{tabs}}" wx:key="index" class="sg-tab {{tabIndex == index ? 'sg-selected' : ''}}"
-        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||tabIndex==4&&index<4}}">
+        bindtap="switchTab" data-index="{{index}}" hidden="{{ type=='check' && index > 2 ||type=='abnormal'&&index<4}}">
         {{ item }}
       </view>
     </view>

+ 2 - 2
mini/pages/project/index.js

xqd xqd
@@ -26,7 +26,7 @@ Page({
       img: 'http://t18.9026.com/mini/error-handle.png',
       title: '异常处理',
       desc: '订单流程变更审核处理',
-      url: '/pages/order/index?index=4'
+      url: '/pages/order/index?index=4&type=abnormal'
     }, {
       img: 'http://t18.9026.com/mini/all-order.png',
       title: '所有订单',
@@ -48,7 +48,7 @@ Page({
       img: 'http://t18.9026.com/mini/error-handle.png',
       title: '异常处理',
       desc: '订单流程变更审核处理',
-      url: '/pages/order-inner/index?index=4'
+      url: '/pages/order-inner/index?index=4&type=abnormal'
     }, {
       img: 'http://t18.9026.com/mini/all-order.png',
       title: '所有订单',