更新大屏

src/main/resources/big.sql

@@ -89,6 +89,10 @@ WHERE statelabel != '结束'
 AND statelabel != '终止'
 AND statelabel IS NOT NULL
 
+#if(ITEM_TITLE2)
+AND e.ITEM_TITLE LIKE #para(ITEM_TITLE2, "like")
+#end
+
 #if(CREATED=='year')
 AND to_char(e.CREATED,'yyyy')=to_char(sysdate,'yyyy')
 #end
@@ -109,6 +113,11 @@ SELECT
 FROM
     tlk_examine e
 WHERE (e.statelabel = '结束' OR e.statelabel = '终止')
+
+#if(ITEM_TITLE1)
+AND e.ITEM_TITLE LIKE #para(ITEM_TITLE1, "like")
+#end
+
 #if(CREATED=='year')
 AND to_char(e.CREATED,'yyyy')=to_char(sysdate,'yyyy')
 #end

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

@@ -55,7 +55,7 @@
             </li>
             <li>
                 <!--样机信息-->
-                <div class="boxall" style="height: 4.2rem;">
+<!--                <div class="boxall" style="height: 4.2rem;">
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">样机信息</div>
@@ -68,23 +68,23 @@
                             <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>
                     </div>
-                        <!--样机数量-->
+                        &lt;!&ndash;样机数量&ndash;&gt;
                         <div class="las" style="margin-left: 0.1rem;margin-top: 0.1rem">
                             <div class="bag" style="background-color: rgb(33, 150, 243)"></div>
                             <span class="mgt" style="color: rgb(33, 150, 243);">样机数量</span>
                             <div class="clear"></div>
                         </div>
                         <div class="allnav" id="chart3" style="height: 1.5rem;"></div>
-                        <!--样机试验次数-->
+                        &lt;!&ndash;样机试验次数&ndash;&gt;
                         <div class="las" style="margin-left: 0.1rem">
                             <div class="bag" style="background-color:#4CAF50"></div>
                             <span class="mgt" style="color: #4CAF50;">样机试验次数</span>
                             <div class="clear"></div>
                         </div>
                         <div class="allnav" id="chart4" style="height: 1.6rem;"></div>
-                    </div>
+                    </div>-->
                 <!-- 样机改装信息-->
-                <div class="boxall" style="height: 2.4rem;">
+                <div class="boxall" style="height: 6.75rem;">
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">样机改装({{yj_data.length}})</div>
@@ -108,7 +108,7 @@
                             <div class="f omit cn" style="flex: 0.4;">序列号</div>
                             <div class="f omit cn" style="flex: 0.4;">变更次数</div>
                         </div>
-                        <div id="a3_marquee-view" class="marquee-view" style="height: 1.8rem;">
+                        <div id="a3_marquee-view" class="marquee-view" style="height: 5.8rem;">
                             <div id="a3_comment1">
                                 <div class="row" v-for="(item, index) in yj_data" :key="index">
                                     <span class="col omit tl">
@@ -196,6 +196,9 @@
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">待完成试验({{no_examine_list.length}})</div>
+                        <div class="inline">
+                            <el-input v-model="param.ITEM_TITLE2" placeholder="输入标题名称回车搜索" @keyup.enter.native="keydown('no_examine')" style="width: 2.3rem;" clearable></el-input>
+                        </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>
                         </div>
@@ -233,6 +236,9 @@
                     <div class="mvp">
                         <span class="bots"></span>
                         <div class="vtitle">已完成试验({{examine_list.length}})</div>
+                        <div class="inline">
+                            <el-input v-model="param.ITEM_TITLE1" placeholder="输入标题名称回车搜索" @keyup.enter.native="keydown('examine')" style="width: 2.3rem;" clearable></el-input>
+                        </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>
                         </div>
@@ -394,7 +400,7 @@
             this.examine(); //已完成试验
             this.cs(); //试验次数
             this.zc(); //设备资产
-            this.yj_xx(); //样机信息:(样机数量和样机试验次数)
+            //this.yj_xx(); //样机信息:(样机数量和样机试验次数)
         },
         methods: {
             //部门数据和产品线
@@ -535,6 +541,12 @@
                     }
                     this.yj2();
                 }
+                if(tag=='examine'){
+                    this.examine();
+                }
+                if(tag=='no_examine'){
+                    this.no_examine();
+                }
             },
             //选择日期范围
             picker(tag){