Merge branch 'li_huaweicloud'

protected/views/print/scan_detail.php

@@ -111,100 +111,10 @@
                         </span>
                     </div>
                 </div>
-                <div class="item">
-                    <div class="pic">
-                        <img src="/images/assist/icon_hgc_abnormal.svg" alt="">
-                    </div>
-                    <div class="data">
-                        <h3><?php echo $task['count']['abnormal']?></h3>
-                        <span>
-                云端异常总量
-                <strong>
-                  <img src="/images/assist/icon_hgc_notice.svg">
-                  <i>异常数量不是以“人”为单位，其包含了缺页、异常图像等异常数据</i>
-                </strong>
-              </span>
-                    </div>
-                </div>
-                <div class="item">
-                    <div class="pic">
-                        <img src="/images/assist/icon_hgc_surplus.svg" alt="">
-                    </div>
-                    <div class="data">
-                        <h3><?php echo $task['count']['surplus']?></h3>
-                        <span>
-                云端剩余异常
-                <strong>
-                  <img src="/images/assist/icon_hgc_notice.svg">
-                  <i>异常数量不是以“人”为单位，其包含了缺页、异常图像等异常数据</i>
-                </strong>
-              </span>
-                    </div>
-                </div>
+          
             </div>
         </div>
-        <div class="module artical">
-            <h2>
-                <span>云处理详情</span>
-                <div class="btns">
-                    <?php
-                    if(isset($task['scan_task'])){
-                        if($task['scan_task']==3 || $task['scan_task']==4){
-
-                            if($task['count']['surplus']==0){
-                                echo '<div class="hbtn disabled">重新发送云端处理</div>';
-                                echo '<div class="hbtn disabled">处理云端剩余异常</div>';
-                            }else{
-                                echo '<div class="hbtn resend">重新发送云端处理</div>';
-                                echo '<div class="hbtn startScan">处理云端剩余异常</div>';
-                            }
-                        }elseif($task['scan_task']==1 ){
-                            echo '<div class="hbtn cancel_btn">撤回云处理</div>';
-                        }elseif($task['scan_task']==2 ){
-                            echo '<div class="hbtn disabled">撤回云处理</div>';
-                        }
-                    }
-                    ?>
 
-                </div>
-            </h2>
-            <div class="content">
-                <?php
-                if(isset($task['scan_task']) && $task['count']['abnormal']>0) {
-                    ?>
-                    <span>发送时间：<?php echo date('Y-m-d H:i:s', $task['scan_task_create_time']) ?>
-                        <strong class="notice">
-                        <img src="/images/assist/icon_hgc_notice.svg">
-                        <i>
-                            <?php
-                            echo '首次：' . date('Y-m-d H:i:s', $task['scan_task_create_time']) . '<br>';
-                            echo '最新：' . date('Y-m-d H:i:s', $task['resend_time'])
-                            ?>
-                        </i>
-                  </strong>
-                </span>
-                    <span>状态：<i class="theme">
-                        <?php
-                        if ($task['scan_task'] == 1) {
-                            echo '排队中';
-                        } elseif ($task['scan_task'] == 2) {
-                            echo '受理中';
-                        } elseif ($task['scan_task'] == 3) {
-                            echo '已完成';
-                        } elseif ($task['scan_task'] == 4) {
-                            echo '已撤消';
-                        }
-                        ?>
-                    </i></span>
-                    <!--<span>受理专家：<?php echo $task['user'] ?></span>-->
-                    <span>用时：<?php echo $task['AstConsuming'] ?></span>
-                    <?php
-                }else{
-                    echo '<div style="text-align: center;width:100%;">本场考试无云端异常数据</div>';
-                }
-                ?>
-            </div>
-        </div>
     </div>
     <div class="hgc_dialog"  style="display: none">
         <div class="hgc_dialogContent">

protected/views/school/add2.php

@@ -511,6 +511,7 @@
         <?php } else { ?>
             <input type='hidden' name='actionsp' value='edit'>
         <?php } ?>
+        <!--
         <div class="step-five steps-choose show">
             <h3 style="padding-left: 20px">设置8K纸张</h3>
 
@@ -537,6 +538,7 @@
             </div>
 
         </div>
+        -->
         <div class="step-one steps-choose ">
             <h3 style="padding-left: 20px">基本信息</h3>
             <table class="table-hide" style="margin-top: 15px">
@@ -1106,6 +1108,7 @@
             </div>
         </div>
     </div>
+    <!--
     <div class="step-six steps-choose">
         <h3 style="padding-left: 20px">安全与隐私</h3>
         <table class="table-hide" style="margin-top: 15px;margin-left: 15px;">
@@ -1137,6 +1140,7 @@
             <div style="color:red">注：课堂平板学习防学生作弊，只能在一个设备上面登录一个账号。<br>修改登录设备：【学生管理】-【学生设置】-【学生端登录ID重置】</div>
         </div>
     </div>
+      -->
 </div>