更新

src/main/resources/big.sql

@@ -96,7 +96,7 @@ AND to_char(e.CREATED,'q')=to_char(sysdate,'q') AND to_char(e.CREATED,'yy')=to_c
 #if(CREATED=='month')
 AND to_char(e.CREATED,'yyyy-mm')=to_char(sysdate,'yyyy-mm')
 #end
-
+ORDER BY e.CREATED DESC
 #end
 
 ###已完成试验
@@ -117,7 +117,7 @@ AND to_char(e.CREATED,'q')=to_char(sysdate,'q') AND to_char(e.CREATED,'yy')=to_c
 #if(CREATED=='month')
 AND to_char(e.CREATED,'yyyy-mm')=to_char(sysdate,'yyyy-mm')
 #end
-
+ORDER BY e.CREATED DESC
 #end
 
 

src/main/webapp/WEB-INF/view/big-screen/index.html

@@ -27,6 +27,7 @@
                 <!--试验次数-->
                 <div class="boxall panel" style="height: 3.3rem;">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">试验次数</div>
                         <el-form :inline="true" label-width="auto" class="inline">
                             <el-form-item prop="state">
@@ -47,6 +48,7 @@
                 <!--试验完成率-->
                 <div class="boxall" style="height: 3.3rem">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">试验完成率</div>
                         <div class="serig">
                             <span class="sec" :class="{active:finish_s_index==index}" v-for="(item, index) in date" :key="index" @click="change_date('finish_s',item.value,finish_s_index=index,)">{{item.name}}</span>
@@ -59,6 +61,7 @@
                 <!--样机信息-->
                 <div class="boxall" style="height: 4.2rem;">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">样机信息</div>
                         <el-form :inline="true" label-width="auto" class="inline">
                             <el-form-item>
@@ -89,6 +92,7 @@
                 <!-- 样机改装信息-->
                 <div class="boxall" style="height: 2.4rem;">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">样机改装({{yj_data.length}})</div>
                         <el-form :inline="true" label-width="auto" @submit.native.prevent class="inline">
                             <el-form-item>
@@ -130,7 +134,7 @@
             <li>
                 <!--设备资产-->
                 <div class="boxall" style="height:6.75rem">
-                    <div class="mvp">设备资产</div>
+                    <div class="mvp"> <span class="bots"></span>设备资产</div>
                     <div class="navboxall">
                         <div class="sycm">
                             <ul class="clearfix">
@@ -194,6 +198,7 @@
             <div class="f">
                 <div class="boxall" style="height:3.3rem">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">待完成试验({{no_examine_list.length}})</div>
                         <div class="serig">
                             <span class="sec" :class="{active:no_examine_index==index}" v-for="(item, index) in date" :key="index" @click="change_date('no_examine',item.value,no_examine_index=index,)">{{item.name}}</span>
@@ -201,18 +206,24 @@
                     </div>
                     <div class="allnav">
                         <div class="flex bsd">
-                            <div class="f omit tl">标题</div>
+                            <div class="f omit tl">标题名称</div>
                             <div class="f omit cn" style="flex: 0.4;">当前处理人</div>
                             <div class="f omit cn" style="flex: 0.4;">流程状态</div>
-                            <div class="f omit cn" style="flex: 0.4;">当前流程耗时</div>
+                            <div class="f omit cn" style="flex: 0.45;">当前流程耗时</div>
                         </div>
                         <div id="marquee-view" class="marquee-view">
                             <div id="comment1">
                                 <div class="row" v-for="(item, index) in no_examine_list" :key="index">
-                                    <span class="col omit tl">{{item.ITEM_TITLE}}</span>
-                                    <span class="col omit cn" style="flex: 0.4;">{{item.AUDITORNAMES}}</span>
+                                    <span class="col omit tl">
+                                        <span class="pm" style="background: #ed405d;" v-if="index==0">{{index+1}}</span>
+										<span class="pm" style="background: #f78c44;" v-else-if="index==1">{{index+1}}</span>
+										<span class="pm" style="background: #49bcf7;" v-else-if="index==2">{{index+1}}</span>
+                                        <span class="pm" v-else>{{index+1}}</span>
+                                        <span :title="item.ITEM_TITLE">{{item.ITEM_TITLE}}</span>
+                                    </span>
+                                    <span class="col omit cn" :title="item.AUDITORNAMES" style="flex: 0.4;">{{item.AUDITORNAMES}}</span>
                                     <span class="col omit cn" style="flex: 0.4;">{{item.STATELABEL}}</span>
-                                    <span class="col omit cn" style="flex: 0.4;">{{item.ITEM_VTIME}}</span>
+                                    <span class="col omit cn" style="flex: 0.45;">{{(item.ITEM_VTIME / 60).toFixed(0)}}小时</span>
                                 </div>
                             </div>
                             <div id="comment2"></div>
@@ -224,6 +235,7 @@
             <div class="f">
                 <div class="boxall" style="height:3.3rem">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">已完成试验({{examine_list.length}})</div>
                         <div class="serig">
                             <span class="sec" :class="{active:examine_index==index}" v-for="(item, index) in date" :key="index" @click="change_date('examine',item.value,examine_index=index,)">{{item.name}}</span>
@@ -231,13 +243,19 @@
                     </div>
                     <div class="allnav">
                         <div class="flex bsd">
-                            <div class="f omit tl">标题</div>
+                            <div class="f omit tl">标题名称</div>
                             <div class="f omit cn">试验结论</div>
                         </div>
                         <div id="a2_marquee-view" class="marquee-view">
                             <div id="a2_comment1">
                                 <div class="row" v-for="(item, index) in examine_list" :key="index">
-                                    <span class="col omit tl">{{item.ITEM_TITLE}}</span>
+                                    <span class="col omit tl">
+                                        <span class="pm" style="background: #ed405d;" v-if="index==0">{{index+1}}</span>
+										<span class="pm" style="background: #f78c44;" v-else-if="index==1">{{index+1}}</span>
+										<span class="pm" style="background: #49bcf7;" v-else-if="index==2">{{index+1}}</span>
+                                        <span class="pm" v-else>{{index+1}}</span>
+                                        <span :title="item.ITEM_TITLE">{{item.ITEM_TITLE}}</span>
+                                    </span>
                                     <span class="col omit cn">{{item.ITEM_TEST_CONCLUSION}}</span>
                                 </div>
                             </div>
@@ -251,6 +269,7 @@
                 <!--样机列表-->
                 <div class="boxall" style="height: 3.3rem;">
                     <div class="mvp">
+                        <span class="bots"></span>
                         <div class="vtitle">样机列表({{yj_list.length}})</div>
                         <el-form :inline="true" label-width="auto" @submit.native.prevent class="inline">
                             <el-form-item>
@@ -280,7 +299,13 @@
                         <div class="marquee-view">
                             <div>
                                 <div class="row" v-for="(item, index) in yj_list" :key="index">
-                                    <span class="col omit tl">{{item.ITEM_NAME}}</span>
+                                    <span class="col omit tl">
+                                        <span class="pm" style="background: #ed405d;" v-if="index==0">{{index+1}}</span>
+                                        <span class="pm" style="background: #f78c44;" v-else-if="index==1">{{index+1}}</span>
+										<span class="pm" style="background: #49bcf7;" v-else-if="index==2">{{index+1}}</span>
+                                        <span class="pm" v-else>{{index+1}}</span>
+                                        <span :title="item.ITEM_NAME">{{item.ITEM_NAME}}</span>
+                                    </span>
                                     <span class="col omit cn" style="flex: 0.4;">{{item.ITEM_VERSION}}</span>
                                     <span class="col omit cn" style="flex: 0.6;">{{item.ITEM_XL_NUM}}</span>
                                     <span class="col omit cn" style="flex: 0.6;">{{item.CREATED}}</span>
@@ -361,14 +386,14 @@
             }]
         },
         mounted() {
-            //this.finish_s();//实验完成率
-            //this.yj();//样机改装信息
-            //this.no_examine();//待完成试验
-            //this.yj2();//样机列表
-            //this.examine(); //已完成试验
-           // this.cs(); //试验次数
-            //this.zc(); //设备资产
-            //this.yj_xx(); //样机信息:(样机数量和样机试验次数)
+/*            this.finish_s();//实验完成率
+            this.yj();//样机改装信息
+            this.no_examine();//待完成试验
+            this.yj2();//样机列表
+            this.examine(); //已完成试验
+            this.cs(); //试验次数
+            this.zc(); //设备资产
+            this.yj_xx(); //样机信息:(样机数量和样机试验次数)*/
         },
         methods: {
             change_date(tag,value){

src/main/webapp/static/big-screen/css/comon0.css

@@ -87,8 +87,8 @@ a:hover{ color:#06c; text-decoration: none!important}
 .bf{color: white;text-align: center;padding: 0.1rem;}
 .cn{text-align:center;}
 .vtitle{color: white;}
-.inline{float: left;margin-top: -30px;margin-left: 1.25rem}
-.serig{float: right;margin-top: -21px;color: rgba(255,255,255,.6)}
+.inline{float: left;margin-top: -0.38rem!important;margin-left: 1.25rem}
+.serig{float: right;margin-top: -0.25rem;color: rgba(255,255,255,.6)}
 .sec{padding: 3px 10px;cursor: pointer;border-radius: 3px;}
 .sec.active{background-color: #000d4a;}
 .el-input__inner{height: 27px!important;}
@@ -160,14 +160,17 @@ a:hover{ color:#06c; text-decoration: none!important}
 	color: white;
 }
 .pm{
-	    width: 0.3rem;
-	    height: 0.3rem;
-	    border-radius: 53px;
-	    display: block;
-	    background: #878787;
-	    color: #fff;
-	    line-height: 0.3rem;
-	    text-align: center;
+	width: 0.25rem;
+	height: 0.25rem;
+	border-radius: 50%;
+	display: block;
+	background: #878787;
+	color: #fff;
+	line-height: 0.25rem;
+	text-align: center;
+	float: left;
+	margin-right: 0.1rem;
+	font-size:0.1rem ;
 }
 .gundong::-webkit-scrollbar {
 	display: none
@@ -209,16 +212,16 @@ body::-webkit-scrollbar {
 	margin-top:-0.1rem;
 }
 .mvp{
-   color: white;
-   font-size: 15px;
-   font-weight: bold;
-   position: relative;
-   margin-top: -0.48rem;
-   background-color: rgba(101,132,226,.15);
-   background-size: contain;
-   padding: 0.1rem;
+	color: rgba(255,255,255,.6);
+    font-weight: bold;
+    position: relative;
+	margin-top: -0.5rem;
+    background-size: contain;
+    padding: 0.1rem;
 	height: 0.48rem;
 	overflow: hidden;
+	font-size: 0.2rem;
+	background-color: rgba(101,132,226,.15);
 }
 .m3{
 	margin-top: -0.3rem;
@@ -289,4 +292,14 @@ font-weight: bold;!important;
 	float: left;
 	margin-top: 7px;
 	margin-right: 6px;
+}
+.bots {
+	float: left;
+	height: 0.3rem;
+	width: 0.08rem;
+	background-color: #008efb;
+	font-size: 0.25rem;
+	border-radius: 5px;
+	margin-right: 0.05rem;
+	margin-left: -0.1rem;
 }