调整导出功能

src/pages/components/In02.vue

@@ -1463,10 +1463,10 @@ export default {
             {name:'平方米克重',path:'/imp-07',title:'',code:"07"},
             {name:'纱线规格',path:'/imp-08',title:'',code:"08",type:"impWin"},
             {name:'送经量',path:'/imp-09',title:'',code:"09"},
-            {name:'生产绩效日报',path:'/imp-10',title:'',code:"10",type:"impWin"},
-            {name:'生产绩效月报',path:'/imp-11',title:'',code:"11",type:"impWin"},
-            {name:'车间能耗日报',path:'/imp-12',title:'',code:"12",type:"impWin"},
-            {name:'车间能耗月报',path:'/imp-13',title:'',code:"13",type:"impWin"},
+            //{name:'生产绩效日报',path:'/imp-10',title:'',code:"10",type:"impWin"},
+            //{name:'生产绩效月报',path:'/imp-11',title:'',code:"11",type:"impWin"},
+            //{name:'车间能耗日报',path:'/imp-12',title:'',code:"12",type:"impWin"},
+            //{name:'车间能耗月报',path:'/imp-13',title:'',code:"13",type:"impWin"},
             {name:'白坯布靶向预测',path:'/imp-14',title:'',code:"14",type:"impWin"},
             {name:'能耗统计报表',path:'/imp-15',title:'',code:"15",type:"impWin"},            
         ]);
@@ -1945,7 +1945,7 @@ export default {
             //player.Native.Camera.moveToAabbWithDistance([calcInfo.localAabb.min, calcInfo.localAabb.max], 0.2, 21, 4);
             api.GetDeviceInfo(name).then((res)=>{
                 console.log(res)
-                if (res.code!=0) {
+                if (res==null || res.code!=0) {
                     //NoneDevice(name)
                     return
                 }
@@ -1986,7 +1986,7 @@ export default {
             })
             */
             api.GetDeviceInfo(name ,{week:1}).then(res=> {
-                if (res.code!=0) {
+                if (res==null || res.code!=0) {
                     //NoneDevice(name)
                     return
                 }
@@ -2927,7 +2927,7 @@ export default {
         function OpenMaoGaoWin(){
             isShowMaogaoWin.value = true;
             api.GetMaoGao().then(res=>{
-                if(res.code!=0){
+                if(res==null ||res.code!=0){
                     return;
                 }
                 maogaoData.value = res.data;
@@ -2942,7 +2942,7 @@ export default {
         function OpenMaoGaoDetailWin(item){
             maogaoDetailHeight = item.height //当前查看详细的比重
             api.GetMaoGaoDetail(maogaoDetailHeight).then(res=>{
-                if(res.code!=0){
+                if(res==null ||res.code!=0){
                     return;
                 }
                 isShowMaogaoDetailWin.value = true;

src/pages/imp/imp01.vue

@@ -2,7 +2,9 @@
     <div  class="impDiv"  @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker format="YYYY-MM-DD" v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+                <span> 到 </span>
+                <el-date-picker format="YYYY-MM-DD" v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
                 <el-button style="margin-left:10px;display:none;" @click="impquery">查询</el-button>
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
@@ -75,7 +77,7 @@
             }
         },
         setup(props,{emit}){      
-            const width=ref(300);
+            const width=ref(500);
             let startDate=ref('');
             let endDate = ref('');
             let datalist = ref([]);
@@ -84,14 +86,14 @@
             }
 
             function impdata(){
-                if(startDate.value=='' || startDate.value==null ){
+                if(startDate.value=='' || startDate.value==null || endDate.value=='' || endate.value==null ){
                     ElMessage({
                         message: "未选择正确的日期",
                         type: "error"
                     })
                     return;
                 }
-                window.open(ApiServer + "/api/export/production?start="+startDate.value+"&end="+startDate.value)
+                window.open(ApiServer + "/api/export/production?start="+startDate.value+"&end="+endDate.value)
             }
 
             onMounted(()=>{
@@ -101,15 +103,9 @@
                 }else{
                     day=day.setDate(day.getDate()-1);
                 }
-                var day1 = new Date().setDate(new Date(day).getDate());
-                startDate.value = new Date(day1).Format("yyyy-MM-dd");
-                //endDate.value  =new Date(day).Format("yyyy-MM-dd");
-                datalist.value=[{
-                    "devname":"123号",
-                    "dt":"2025-01-31",
-                    "length":0,
-                    "weight":0
-                }]
+                var day1 = new Date().setDate(new Date(day).getDate()-7);
+                startDate.value = new Date(day1);
+                endDate.value  =new Date(day);
             })
 
             return{

src/pages/imp/imp02.vue

@@ -2,10 +2,10 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <span> 到 </span>
-                <el-date-picker v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="endDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-select style="width: 100px;" v-model="endH"><el-option v-for="item in endHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <el-button style="margin:10px" @click="impdata">导出</el-button>
             </span>                

src/pages/imp/imp03.vue

@@ -2,7 +2,7 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
         </div>

src/pages/imp/imp04.vue

@@ -2,9 +2,9 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <span> 到 </span>
-                <el-date-picker v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="endDate" type="date" format="YYYY-MM-DD" placeholder="选择日期"></el-date-picker>
                 <span> 时间 </span>
                 <el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <span> 到 </span>

src/pages/imp/imp05.vue

@@ -2,9 +2,9 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <span> 到 </span>
-                <el-date-picker v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="endDate" type="date" format="YYYY-MM-DD" placeholder="选择日期"></el-date-picker>
                 <span> 时间 </span>
                 <el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <span> 到 </span>

src/pages/imp/imp06.vue

@@ -2,10 +2,10 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <span> 到 </span>
-                <el-date-picker v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
+                <el-date-picker v-model="endDate" type="date" format="YYYY-MM-DD" placeholder="选择日期"></el-date-picker>
                 <el-select style="width: 100px;" v-model="endH"><el-option v-for="item in endHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
                 <el-button style="margin:10px" @click="impdata">导出</el-button>
             </span>                

src/pages/imp/imp10.vue

@@ -2,7 +2,7 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>                
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>                
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
         </div>

src/pages/imp/imp11.vue

@@ -2,7 +2,7 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
         </div>

src/pages/imp/imp12.vue

@@ -2,7 +2,7 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期" style="z-index:100000"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期" style="z-index:100000"></el-date-picker>
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
         </div>

src/pages/imp/imp13.vue

@@ -2,7 +2,7 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" format="YYYY-MM-DD" type="date" placeholder="选择日期"></el-date-picker>
                 <el-button style="margin-left:10px" @click="impdata">导出</el-button>
             </span>                
         </div>

src/pages/imp/imp14.vue

@@ -2,11 +2,11 @@
     <div  class="impDiv" @click.stop="void(0)" :style="{width:width+'px',top:xy.top+'px',left:xy.left-width+'px'}">
         <div class="triangle"></div>
         <div class="abs" style="text-align: center;margin-top:0%;width: 100%;letter-spacing: 5px;color: #cdd2fb;font-size: 18px;">
-            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期"></el-date-picker>
-                <el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
+            <span style="position: relative;">日期<el-date-picker v-model="startDate" type="date" placeholder="选择日期" format="YYYY-MM-DD"></el-date-picker>
+                <!--<el-select style="width: 100px;" v-model="startH"><el-option v-for="item in startHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>-->
                 <span> 到 </span>
-                <el-date-picker v-model="endDate" type="date" placeholder="选择日期"></el-date-picker>
-                <el-select style="width: 100px;" v-model="endH"><el-option v-for="item in endHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>
+                <el-date-picker v-model="endDate" type="date" placeholder="选择日期" format="YYYY-MM-DD"></el-date-picker>
+                <!--<el-select style="width: 100px;" v-model="endH"><el-option v-for="item in endHourList" :key="item.code" :label="item.name" :value="item.code"></el-option> </el-select>-->
                 <el-button style="margin:10px" @click="impdata">导出</el-button>
             </span>                
         </div>
@@ -44,7 +44,7 @@
 
         },
         setup(props,{emit}){
-            const width=ref(700)
+            const width=ref(500)
             let startDate=ref('');
             let endDate = ref('');
             let startH = ref(7);
@@ -64,8 +64,8 @@
                     })
                     return;
                 }
-                let s1 = startDate.value +" "+startH.value+":00:00";
-                let s2 = endDate.value +" "+endH.value+":00:00";
+                let s1 = startDate.value ;// +" "+startH.value+":00:00";
+                let s2 = endDate.value;// +" "+endH.value+":00:00";
                 window.open(ApiServer + "/api/export/order?start="+s1+"&end="+s2)
             }
 
@@ -79,6 +79,7 @@
                 var day1 = new Date().setDate(new Date(day).getDate() - 7);
                 startDate.value = new Date(day1).Format("yyyy-MM-dd");
                 endDate.value  =new Date(day).Format("yyyy-MM-dd");
+                /*
                 var hour1Opts = [];
                 var hour2Opts = [];
                 //var nowHour = new Date().Format("h");
@@ -88,6 +89,7 @@
                 }
                 startHourList.value = hour1Opts;
                 endHourList.value = hour2Opts;
+                */
             })
 
             return{

src/pages/stock/stock_trend.vue

@@ -94,6 +94,7 @@
     import { ref,onMounted,watch } from 'vue';
     import api from "@/api/system";
     import * as echarts from 'echarts';
+    import { ElMessage } from 'element-plus';
     export default {
         props:{
 
@@ -221,15 +222,26 @@
             onMounted(()=>{
                 let typecode = window.location.hash.replace("#","");
                 unit.value = StockTypeUnit[typecode]
-                api.GetFacData().then((res)=>{                    
+                let msg = ElMessage({
+                    message:"正在加载数据",
+                    type:"info",
+                    duration:0,
+                })
+                api.GetFacData().then((res)=>{       
+                    msg.close();             
                     if (res == null || res[typecode]==null) {
                         return
                     }
                     stockData.value = res[typecode];
                     var datalist = res[typecode]['trend'];
                     if(datalist!=null) showTrend(datalist);
-                    var indatalst = res[typecode]['in'];
-                    var outdatalst = res[typecode]['out'];
+                    //var indatalst = res[typecode]['in'];
+                    //var outdatalst = res[typecode]['out'];
+                }).catch(()=>{
+                    ElMessage({
+                        message:"数据获取失败！",
+                        type:"error",
+                    });
                 });
             });
             return{

src/styles/main.css

@@ -18,14 +18,14 @@
         height: 32px;
         font-size: 16px;
     }
-    tbody>tr:hover{
+    table:not(.el-date-table) tbody>tr:hover{
         background-color:rgb(75, 112, 163) !important;
     }
-    tbody>tr:nth-child(odd) {
+    table:not(.el-date-table) tbody>tr:nth-child(odd) {
         background-color:rgb(25 57 103 / 75%); /* 奇数行 */
     }
      
-    tbody>tr:nth-child(even) {
+    table:not(.el-date-table) tbody>tr:nth-child(even) {
         background-color: rgb(25 57 103 / 85%); /* 偶数行 */
     }
     td{
@@ -98,7 +98,7 @@
     .impDiv{
         padding:15px;
         position:absolute;
-        z-index:100000;
+        z-index:100;
         top:0;
         left:0;
         width:780px;
@@ -180,7 +180,7 @@
     #imp_item{
         position: absolute;
         width: 160px;
-        height: 480px;
+        height: auto;
         background: rgba(19, 47, 95, 0.8);
         box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.2);
         border-radius: 2px 2px 2px 2px;