更新

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

@@ -14,7 +14,7 @@
     </div>
     <!--头部-->
     <div class="head" style="background: url('#(path)/static/big-screen/images/head_bg.png') no-repeat center;background-size: 100% 100%;height: 0.8rem;">
-        <h1>柳工数字实验室</h1>
+        <h1 style="font-family: auto;">柳工数字实验室</h1>
         <div class="weather">
             <span class="iconfont icon-quanping_o" @click="fullScreen()" title="全屏"></span>
             <span id="showTime"></span>
@@ -252,7 +252,10 @@
                                         <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>
+                                    <span class="col cn" title="点击查看详情" @click="look(item.views)" style="overflow: hidden;">
+                                        <div class="omit" style="float: left;width: 80%;">{{item.ITEM_TEST_CONCLUSION}}</div>
+                                        <div style="float: right;width: 20%;text-align: right;color: #2ecd35;" v-if="item.ITEM_TEST_CONCLUSION">详情</div>
+                                    </span>
                                 </div>
                             </div>
                             <div id="a2_comment2"></div>
@@ -310,6 +313,10 @@
             </div>
         </div>
     </div>
+    <!--查看实验结论-->
+    <el-dialog title="查看实验结论" width="70%" :visible.sync="dialogVisible" append-to-body>
+      <div v-html="views" style="background-color: #f6f6f6;padding: 15px;border-radius: 5px;"></div>
+    </el-dialog>
 </div>
 <script type="text/javascript" src="#(path)/static/js/jquery.min.js"></script>
 <script type="text/javascript" src="#(path)/static/js/vue.js"></script>
@@ -324,6 +331,7 @@
     let vm = new Vue({
         el: "#app",
         data: {
+            dialogVisible:false,
             param: {
                 value: ['#(value)'],
                 CREATED:'year',
@@ -375,7 +383,8 @@
                 icon: '&#xe616;',
                 color: '#03A9F4',
                 show: true
-            }]
+            }],
+            views:{}//实验结论
         },
         mounted() {
             start_time();
@@ -464,6 +473,12 @@
                 sendAjax("#(path)/big/examine", this.param, res => {
                     cancelLoding();
                     vm.examine_list = res.data;
+                    vm.examine_list.forEach(item=>{
+                        if(item.ITEM_TEST_CONCLUSION){
+                            item.views=item.ITEM_TEST_CONCLUSION;
+                            item.ITEM_TEST_CONCLUSION=item.ITEM_TEST_CONCLUSION.replace(/<.*?>/g,"");
+                        }
+                    })
                 })
             },
             //样机改装信息
@@ -513,6 +528,7 @@
                     this.yj2();
                 }
             },
+            //选择日期范围
             picker(tag){
                 if(tag=='yj'){
                     this.param.begin = this.param.datetime[0];
@@ -525,6 +541,11 @@
                     this.yj2();
                 }
             },
+            //查看实验结论
+            look(item){
+              this.dialogVisible=true;
+              this.views=item;
+            },
             //设置全屏
             fullScreen() {
                 const element = document.documentElement