Merge branch 'master' of https://gitee.com/huangsanjia/qua-vocs.com

application/admin/controller/Entrust.php

@@ -269,7 +269,7 @@ class Entrust extends Backend
     public function submit(){
         if (false === $this->request->isPost()) {
             $id = input('id');
-            $judgeData = Db::name('item_judge')->column('id,name');
+            $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
 
             $this->view->assign('judgeData', $judgeData);
             $this->view->assign('id', $id);
@@ -371,6 +371,10 @@ class Entrust extends Backend
         }
         $params['entrust_no'] = $entrust['no'];
         $params['entrust_id'] = $entrust['id'];
+        $params['machine'] = 'GCMS';
+        if ($gather_tab = 'gather_txt_check_gc'){
+            $params['machine'] = 'GC';
+        }
         $params['name'] = $entrust['name'];
         $params['bach'] = $entrust['bach'];
         $params['sample_no'] = $entrust['sample_no'];

application/admin/view/index/login.html

@@ -95,7 +95,7 @@
                     <img src="__CDN__/assets/img/login-head.png" style="width:100%;"/>
                 </div>
                 <div class="login-form">
-                    <img id="profile-img" class="profile-img-card" src="__CDN__/assets/img/avatar.png"/>
+                    <img id="profile-img" class="profile-img-card" src="/assets/img/avatar.png"/>
                     <p id="profile-name" class="profile-name-card"></p>
 
                     <form action="" method="post" id="login-form">