更新

src/main/resources/big.sql

@@ -191,8 +191,8 @@ ORDER BY x ASC
 SELECT ITEM_NAME,ITEM_VERSION,ITEM_XL_NUM,CREATED
 FROM tlk_myjcs
 WHERE ITEM_UPBH IS NULL
-#if(ITEM_NAME)
-AND (ITEM_NAME ||ITEM_XL_NUM) LIKE #para(ITEM_NAME, "like")
+#if(ITEM_NAMES)
+AND (ITEM_NAME ||ITEM_XL_NUM) LIKE #para(ITEM_NAMES, "like")
 #end
 #if(begin)
 AND created BETWEEN to_date(#para(begin), 'yyyy-mm-dd hh24:mi:ss' )

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

@@ -29,7 +29,13 @@
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">试验次数</div>
-                        <el-form :inline="true" label-width="auto" class="inline">
+                        <div class="inline">
+                            <el-cascader ref="cs" v-model="param.value" :options="options" placeholder="部门"  class="els" :props="props" @change="handleChange" :show-all-levels="false"  clearable></el-cascader>
+                            <el-select placeholder="产品线" v-model="param.item_product" class="els" @change="change($event,'cs')" clearable>
+                                <el-option v-for="(item,index) in prouname" :key="index" :value="item.ITEM_DIC_PROUNAME" :label="item.ITEM_DIC_PROUNAME"></el-option>
+                            </el-select>
+                        </div>
+<!--                        <el-form :inline="true" label-width="auto" class="inline">
                             <el-form-item prop="state">
                                 <el-cascader ref="cs" v-model="param.value" :options="options" placeholder="部门"  class="els" :props="props" @change="handleChange" :show-all-levels="false"  clearable></el-cascader>
                             </el-form-item>
@@ -38,7 +44,7 @@
                                     <el-option v-for="(item,index) in prouname" :key="index" :value="item.ITEM_DIC_PROUNAME" :label="item.ITEM_DIC_PROUNAME"></el-option>
                                 </el-select>
                             </el-form-item>
-                        </el-form>
+                        </el-form>-->
                         <div class="serig">
                             <span class="sec" :class="{active:cs_index==index}" v-for="(item, index) in date" :key="index" @click="change_date('cs',item.value,cs_index=index,)">{{item.name}}</span>
                         </div>
@@ -63,13 +69,11 @@
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">样机信息</div>
-                        <el-form :inline="true" label-width="auto" class="inline">
-                            <el-form-item>
-                                <el-select placeholder="产品线" v-model="param.ITEM_PRO" class="els" @change="change($event,'xx')" clearable>
-                                    <el-option v-for="(item,index) in prouname" :key="index" :value="item.ITEM_DIC_PROUNAME" :label="item.ITEM_DIC_PROUNAME"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-form>
+                        <div class="inline">
+                            <el-select placeholder="产品线" v-model="param.ITEM_PRO" class="els" @change="change($event,'xx')" clearable>
+                                <el-option v-for="(item,index) in prouname" :key="index" :value="item.ITEM_DIC_PROUNAME" :label="item.ITEM_DIC_PROUNAME"></el-option>
+                            </el-select>
+                        </div>
                         <div class="serig">
                             <span class="sec" :class="{active:yj_index==index}" v-for="(item, index) in date" :key="index" @click="change_date('xx',item.value,yj_index=index,)">{{item.name}}</span>
                         </div>
@@ -94,23 +98,19 @@
                     <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>
-                                <el-input v-model="param.ITEM_NAME" placeholder="名称,序列号回车" @keyup.enter.native="keydown('yj')" style="width: 1.6rem;" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item style="margin-left: -0.1rem;">
-                                <el-date-picker
-                                        v-model="param.datetime"
-                                        style="width: 3.07rem;margin-top: 0.09rem;"
-                                        value-format="yyyy-MM-dd"
-                                        type="daterange"
-                                        range-separator="-"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        @change="picker('yj')"
-                                ></el-date-picker>
-                            </el-form-item>
-                        </el-form>
+                        <div class="inline">
+                            <el-input v-model="param.ITEM_NAME" placeholder="名称,序列号回车" @keyup.enter.native="keydown('yj')" style="width: 1.5rem;" clearable></el-input>
+                            <el-date-picker
+                                    class="dpk"
+                                    v-model="param.datetime"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                                    @change="picker('yj')">
+                            </el-date-picker>
+                        </div>
                     </div>
                     <div class="allnav">
                         <div class="flex bsd">
@@ -121,7 +121,13 @@
                         <div id="a3_marquee-view" class="marquee-view" style="height: 1.8rem;">
                             <div id="a3_comment1">
                                 <div class="row" v-for="(item, index) in yj_data" :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_XL_NUM}}</span>
                                     <span class="col omit cn" style="flex: 0.4;">{{item.num}}</span>
                                 </div>
@@ -271,23 +277,19 @@
                     <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>
-                                <el-input v-model="param.ITEM_NAME" placeholder="名称,序列号回车" @keyup.enter.native="keydown('yj2')" style="width: 1.6rem;" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item style="margin-left: -0.1rem;">
-                                <el-date-picker
-                                        v-model="param.datetime2"
-                                        style="width: 3.07rem;margin-top: 0.09rem;"
-                                        value-format="yyyy-MM-dd"
-                                        type="daterange"
-                                        range-separator="-"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        @change="picker('yj2')"
-                                ></el-date-picker>
-                            </el-form-item>
-                        </el-form>
+                        <div class="inline">
+                            <el-input v-model="param.ITEM_NAMES" placeholder="名称,序列号回车" @keyup.enter.native="keydown('yj2')" style="width: 1.5rem;" clearable></el-input>
+                            <el-date-picker
+                                    class="dpk"
+                                    v-model="param.datetime2"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                                    @change="picker('yj2')">
+                            </el-date-picker>
+                        </div>
                     </div>
                     <div class="allnav">
                         <div class="flex bsd">
@@ -386,14 +388,14 @@
             }]
         },
         mounted() {
-/*            this.finish_s();//实验完成率
+            this.finish_s();//实验完成率
             this.yj();//样机改装信息
             this.no_examine();//待完成试验
             this.yj2();//样机列表
             this.examine(); //已完成试验
             this.cs(); //试验次数
             this.zc(); //设备资产
-            this.yj_xx(); //样机信息:(样机数量和样机试验次数)*/
+            this.yj_xx(); //样机信息:(样机数量和样机试验次数)
         },
         methods: {
             change_date(tag,value){
@@ -478,6 +480,7 @@
                 sendAjax("#(path)/big/yj", this.param, res => {
                     cancelLoding();
                     vm.yj_data=res.data;
+                    vm.yj_data = vm.yj_data.sort((a,b)=>{return b.num-a.num});
                 })
             },
             //样机列表

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

@@ -86,13 +86,38 @@ 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: -0.38rem!important;margin-left: 1.25rem}
-.serig{float: right;margin-top: -0.25rem;color: rgba(255,255,255,.6)}
+.vtitle{color: rgba(255,255,255,.6);;float: left;}
+.inline{
+	float: left;
+	overflow: hidden;
+	margin-left: 0.25rem;
+	height: 0.3rem;
+}
+.serig{float: right;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;}
-.els{width: 100px;}
+.els{width: 1.2rem;height: 0.3rem;}
+.el-cascader{
+	font-size: 0.1rem!important;
+	line-height: 0rem!important;
+}
+.el-form-item{
+	margin-bottom: 0px!important;
+}
+.el-form--inline .el-form-item{
+	margin-top: -0.1rem;
+}
+.el-input{height: 0.3rem!important;overflow: hidden;font-size: 0.1rem!important;}
+.el-input__inner{
+	background-color: #1f2b57 !important;
+	border: 1px solid #1c2b67 !important;
+	color: white!important;
+	padding: 0.05rem!important;
+	height: 0.3rem!important;
+	font-size: 0.1rem!important;
+}
+.el-input__icon{font-size: 0.1rem!important;line-height: 0rem!important;}
+.el-range__icon{line-height: 0.27rem!important;}
 .col {
 	flex: 1;
 	padding: 10px;
@@ -216,9 +241,7 @@ body::-webkit-scrollbar {
     font-weight: bold;
     position: relative;
 	margin-top: -0.5rem;
-    background-size: contain;
-    padding: 0.1rem;
-	height: 0.48rem;
+    padding: 0.15rem 0.08rem 0.1rem 0.08rem;
 	overflow: hidden;
 	font-size: 0.2rem;
 	background-color: rgba(101,132,226,.15);
@@ -226,17 +249,13 @@ body::-webkit-scrollbar {
 .m3{
 	margin-top: -0.3rem;
 }
+.dpk{width: 3.07rem!important;float: right!important;;margin-left: 0.1rem!important;;}
 .chart{height: 5.1rem;}
-.el-input__inner{
-	background-color: #1f2b57 !important;
-	border: 1px solid #1c2b67 !important;
-	color: white!important;
-	padding: 0 10px!important;
-}
 .el-range-editor .el-range-input{
 	background-color: #1f2b57 !important;
 	color: white!important;
 	margin-left: 0.05rem!important;
+	font-size: 0.1rem!important;
 }
 .el-date-editor .el-range__icon{
 	margin-top: -0.08rem!important;
@@ -245,8 +264,9 @@ body::-webkit-scrollbar {
 	margin-top: -0.08rem!important;
 }
 .el-date-editor .el-range-separator{
-	margin-top: -0.08rem!important;
 	color: white!important;
+	line-height:0.17rem!important;
+	font-size: 0.1rem!important;
 }
 .navboxall{
 	margin-top: 0.2rem;