Merge branch 'master' of http://111.61.77.35:9999/gengdidi/zhengyuan-danger-chemistry-manage

danger-manage-web/src/views/entrance/index.vue

@@ -90,7 +90,7 @@
                     <div class="ent-b-car1">
                         <div class="a-car-out">
                             <div>人员出场</div>
-                            <div style="color: #c5c6c7;font-size: 14px;">出入记录</div>
+                            <!--<div style="color: #c5c6c7;font-size: 14px;">出入记录</div>-->
                         </div>
                         <div class="ent-div"></div>
                         <div class="ent-b-in">
@@ -120,14 +120,14 @@
                     <div class="ent-b-car1">
                         <div class="a-car-out">
                             <div>车辆出场</div>
-                            <div style="color: #c5c6c7;font-size: 14px;">出入记录</div>
+                            <!--<div style="color: #c5c6c7;font-size: 14px;">出入记录</div>-->
                         </div>
                         <div class="ent-div"></div>
                         <div class="ent-b-in">
                             <img src="../../assets/img/car.png" alt="">
                             <div>车辆类型：<span></span>{{lastExportCarData ? lastExportCarData.cName : "-"}}</div>
                             <div>车辆号牌：<span>{{lastExportCarData?lastExportCarData.plateNumber:"-"}}</span> </div>
-                            <div>入场时间：<span>{{lastExportCarData?changeDateFormat(lastExportCarData.outParkTime):"-"}}</span> </div>
+                            <div>出场时间：<span>{{lastExportCarData?changeDateFormat(lastExportCarData.outParkTime):"-"}}</span> </div>
                         </div>
                     </div>
                 </div>

danger-manage-web/src/views/login.vue

@@ -60,6 +60,7 @@
         style="margin: 0px 0px 25px 0px;color: #3db0ff;"
         >记住密码</el-checkbox
       >
+      <a class="certificateDownload" href="http://27.128.189.137:81/nginxService/v1/download/InstallRootCert.exe">下载证书</a>
       <el-form-item style="width: 100%;height: 40px;" class="zhanghaomima">
         <el-button
           :loading="loading"
@@ -254,4 +255,12 @@ export default {
 .login-code-img {
   height: 38px;
 }
+.certificateDownload{
+  color: #3e9ced;
+  float: right;
+  font-size: 14px;
+}
+.certificateDownload:hover{
+  color: #bfbfbf;
+}
 </style>