Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly

src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL002.xml

@@ -126,7 +126,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                ID DESC
+                RECEIPT_DATE DESC
             </isEmpty>
         </dynamic>
     </sql>

src/main/webapp/HP/BI/HPBI004.jsp

@@ -151,6 +151,7 @@
                                     placeholder="选择日期"
                                     @change="handledataPicker"
                                     value-format="yyyyMMdd"
+                                    :picker-options='pickerOptions'
                                     style="width: 11vw"
                             >
                             </el-date-picker>
@@ -202,9 +203,9 @@
                                 <div class="device-echarts-background">
                                     <manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts>
                                 </div>
-                                <div class="device-echarts-background">
-                                    <manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts>
-                                </div>
+<%--                                <div class="device-echarts-background">--%>
+<%--                                    <manage-echarts :option="lineOption1" :width="17" :height="24"></manage-echarts>--%>
+<%--                                </div>--%>
                             </div>
                             <div class="left-device device" style="margin-left: 2vw;">
                                 <div v-for="(item,index) in querySbNoList"
@@ -214,9 +215,9 @@
                                 <div class="device-echarts-background">
                                     <manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts>
                                 </div>
-                                <div class="device-echarts-background">
-                                    <manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts>
-                                </div>
+<%--                                <div class="device-echarts-background">--%>
+<%--                                    <manage-echarts :option="lineOption2" :width="17" :height="24"></manage-echarts>--%>
+<%--                                </div>--%>
                             </div>
                         </div>
                     </el-main>
@@ -257,7 +258,12 @@
                 currentTime:dayjs().format("YYYY-MM-DD HH:mm:ss"),
                 lineOption1:'',
                 lineOption2:'',
-                timer: ''
+                timer: '',
+                pickerOptions:{
+                    disabledDate(time) {
+                        return time.getTime() > Date.now();
+                    }
+                }
             };
         },
         mounted() {
@@ -266,9 +272,6 @@
                 this.currentTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             }, 1000);
             this.queryCompanyInfo();
-
-            this.setOption();
-            this.setOption2();
             this.getYesterdayDateFormatted();
             this.initPage();
             this.onSetInterval();
@@ -327,11 +330,6 @@
                               _this.queryBySbStatusList = res.extAttr.result;
                             }
                             _this.queryBySbStatusList.push({
-                                deviceName:'切割机',
-                                status:'3',
-                                deviceModel:'MZ-1250',
-                            })
-                            _this.queryBySbStatusList.push({
                                 deviceName:'焊接机',
                                 status:'3',
                                 deviceModel:'H8760',
@@ -351,10 +349,10 @@
                 inInfo.set('inqu_status-0-date',this.dataPicker)
                 IPLAT.EiCommunicator.send('HPBI003', 'querySbYes', inInfo, {
                         onSuccess: function (res) {
-                            if(undefined != res.extAttr.result[0]){
+                            if( res.extAttr.result.length){
                                 const dataList = res.extAttr.result;
                                 _this.querySbYesDate = res.extAttr.date;
-
+                                _this.setOption()
                                 _this.querySbYesList = dataList.map((item, index) => {
                                     const getChartOptionByIndex = (index) => {
                                         return {
@@ -441,6 +439,7 @@
                             if(undefined != res.extAttr.result[0]){
                                 const dataList = res.extAttr.result;
                                 _this.querySbNODate = res.extAttr.date;
+                                _this.setOption2()
                                 _this.querySbNoList = dataList.map((item, index) => {
                                     const getChartOptionByIndex = (index) => {
                                         return {
@@ -582,7 +581,7 @@
                     },
                     xAxis: {
                         type: 'category',
-                        data: this.querySbYesDate,
+                        data: this.querySbNODate,
                         axisLabel: {
                             textStyle: {
                                 color: '#ffffff' // 设置y轴标签字体颜色为白色