Merge remote-tracking branch 'origin/master'

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/QuestionList.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2023-01-13 16:26:33
+ * @LastEditTime: 2023-01-31 14:03:36
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -293,10 +293,10 @@ export default {
       // 如果有一个没写，就不允许保存
       if (
         !(
-          this.bottomFrom.singleChoiceScore > 0 &&
-          this.bottomFrom.multipleChoiceScore > 0 &&
-          this.bottomFrom.judgmentScore > 0 &&
-          this.fobottomFromrm.qualifiedNum > 0
+          this.bottomFrom.singleChoiceScore >= 0 &&
+          this.bottomFrom.multipleChoiceScore >= 0 &&
+          this.bottomFrom.judgmentScore >= 0 &&
+          this.bottomFrom.qualifiedNum >= 0
         )
       ) {
         this.$message({

danger-manage-web/src/views/educationPlanExam/textPaper/components/QuestionList.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2023-01-13 16:26:00
+ * @LastEditTime: 2023-01-31 14:04:09
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -297,10 +297,10 @@ export default {
       // }
       if (
         !(
-          this.bottomFrom.singleChoiceScore > 0 &&
-          this.bottomFrom.multipleChoiceScore > 0 &&
-          this.bottomFrom.judgmentScore > 0 &&
-          this.bottomFrom.qualifiedNum > 0
+          this.bottomFrom.singleChoiceScore >= 0 &&
+          this.bottomFrom.multipleChoiceScore >= 0 &&
+          this.bottomFrom.judgmentScore >= 0 &&
+          this.bottomFrom.qualifiedNum >= 0
         )
       ) {
         this.$message({

danger-manage-web/src/views/educationPlanExam/visitorProgram/visitorAdd.vue

@@ -50,15 +50,11 @@
           :label="'选项' + (index + 1)"
           :key="question.key"
           :prop="'questions.' + index + '.value'"
-          :rules="
-            index === 0
-              ? {
-                  required: true,
-                  message: '第一项不能为空不能为空',
-                  trigger: 'blur',
-                }
-              : {}
-          "
+          :rules="{
+            required: true,
+            message: '第一项不能为空不能为空',
+            trigger: 'blur',
+          }"
         >
           <div class="add-select flex">
             <el-input
@@ -128,7 +124,10 @@
           </div>
         </el-form-item> -->
         <div style="padding-left: 55px" v-if="form.topicType != 3">
-          <el-button size="mini" type="primary" @click.prevent="add(addValue)"
+          <el-button
+            size="mini"
+            style="background: #0bab0c; color: #fff; border: 1px solid #0bab0c"
+            @click.prevent="add(addValue)"
             >新增选项</el-button
           >
         </div>

danger-manage-web/src/views/educationPlanExam/visitorProgram/visitorQuestion.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2023-01-29 10:44:36
+ * @LastEditTime: 2023-01-31 14:06:08
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -417,10 +417,10 @@ export default {
       // }
       if (
         !(
-          this.bottomFrom.singleChoiceScore > 0 &&
-          this.bottomFrom.multipleChoiceScore > 0 &&
-          this.bottomFrom.judgmentScore > 0 &&
-          this.bottomFrom.qualifiedNum > 0
+          this.bottomFrom.singleChoiceScore >= 0 &&
+          this.bottomFrom.multipleChoiceScore >= 0 &&
+          this.bottomFrom.judgmentScore >= 0 &&
+          this.bottomFrom.qualifiedNum >= 0
         )
       ) {
         this.$message({

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>

danger-manage-web/src/views/safetyManagement/laws/index.vue

@@ -83,18 +83,17 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />
+<!--      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" width="120px" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.status == '0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
-          <el-button
+          <!--<el-button
             v-if="scope.row.status == '0'"
             size="mini"
             type="text"
@@ -114,9 +113,8 @@
             type="text"
             icon="el-icon-edit"
             @click="handleInvalid(scope.row)"
-          >作废</el-button>
+          >作废</el-button>-->
           <el-button
-            v-if="scope.row.status == '0'"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -191,10 +189,10 @@
               </span>
               <span v-else>-</span>
             </el-form-item>
-            <el-form-item v-show="operate" label="审批" prop="status">
+            <!--<el-form-item v-show="operate" label="审批" prop="status">
               <el-radio v-model="form.status" label="2">通过</el-radio>
               <el-radio v-model="form.status" label="0">驳回</el-radio>
-            </el-form-item>
+            </el-form-item>-->
           </div>
           <div style="width: 58%;margin-left: 2%">
             <div class="dialogTitle">法律法规内容</div>

danger-manage-web/src/views/visitorExam/EnterInformation.vue

 <template>
-  <el-form  ref="form" :rules="rules" :model="form" label-width="80px">
+  <div style="padding:10px 0 0 20px">
+    <el-form ref="form" :rules="rules" :model="form" label-width="80px">
+      <h3>个人信息录入</h3>
+      <el-form-item label="单位" prop="beyondUnit">
+        <el-input
+          style="width: 70%"
+          placeholder="请输入单位"
+          v-model="form.beyondUnit"
+          maxlength="30"
+          clearable
+        >
+        </el-input>
+      </el-form-item>
 
-<h3>个人信息录入</h3>
-    <el-form-item label="单位"  prop="beyondUnit">
-    <el-input
-      style="width: 70%;"
-      placeholder="请输入单位"
-      v-model="form.beyondUnit"
-      maxlength="30"
-      clearable>
-    </el-input>
-    </el-form-item>
-
-    <el-form-item label="姓名">
-      <el-input
-        style="width: 70%;"
-        placeholder="请输入姓名"
-        v-model="form.name"
-        maxlength="11"
-        clearable>
-      </el-input>
-    </el-form-item>
-
-    <el-form-item label="性别">
-      <el-radio-group v-model="form.sex">
-        <el-radio label="0">男</el-radio>
-        <el-radio label="1">女</el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-    <el-form-item label="手机号">
-      <el-input
-        style="width: 70%;"
-        placeholder="手机号"
-        v-model="form.phoneNum"
-        type="number"
-        maxlength="11"
-        clearable>
-      </el-input>
-    </el-form-item>
-
-    <el-form-item>
-      <el-button  @click="onSubmit" type="primary" >下一步</el-button>
-      <el-button>取消</el-button>
-    </el-form-item>
-  </el-form>
+      <el-form-item label="姓名">
+        <el-input
+          style="width: 70%"
+          placeholder="请输入姓名"
+          v-model="form.name"
+          maxlength="11"
+          clearable
+        >
+        </el-input>
+      </el-form-item>
 
+      <el-form-item label="性别">
+        <el-radio-group v-model="form.sex">
+          <el-radio label="0">男</el-radio>
+          <el-radio label="1">女</el-radio>
+        </el-radio-group>
+      </el-form-item>
 
+      <el-form-item label="手机号">
+        <el-input
+          style="width: 70%"
+          placeholder="手机号"
+          v-model="form.phoneNum"
+          type="number"
+          maxlength="11"
+          clearable
+        >
+        </el-input>
+      </el-form-item>
 
+      <el-form-item>
+        <el-button @click="onSubmit" type="primary">下一步</el-button>
+        <el-button>取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 
 <script>
-    export default {
-      name: "EnterInformation",
-      data() {
-        return {
-          form: {
-            beyondUnit: null,
-            name: null,
-            sex: null,
-            phoneNum: null,
-            testBeginTime:null,
-          },
-        }
+export default {
+  name: "EnterInformation",
+  data() {
+    return {
+      form: {
+        beyondUnit: null,
+        name: null,
+        sex: null,
+        phoneNum: null,
+        testBeginTime: null,
       },
-      methods: {
-        /**
-         * 获取当前时间
-         */
-        currentTime() {
-          var date = new Date();
-          var year = date.getFullYear(); //月份从0~11，所以加一
-          let month = date.getMonth();
-          var dateArr = [
-            date.getMonth() + 1,
-            date.getDate(),
-            date.getHours(),
-            date.getMinutes(),
-            date.getSeconds(),
-          ];
-          //如果格式是MM则需要此步骤，如果是M格式则此循环注释掉
-          for (var i = 0; i < dateArr.length; i++) {
-            if (dateArr[i] >= 1 && dateArr[i] <= 9) {
-              dateArr[i] = "0" + dateArr[i];
-            }
-          }
-          var strDate =
-            year +
-            "/" +
-            dateArr[0] +
-            "/" +
-            dateArr[1] +
-            " " +
-            dateArr[2] +
-            ":" +
-            dateArr[3] +
-            ":" +
-            dateArr[4];
-          //此处可以拿外部的变量接收  strDate:2022-05-01 13:25:30
-          //this.date = strDate;
-           this.form.testBeginTime=strDate;
-        },
-
-        onSubmit() {
-          this.currentTime();
-          // let params = this.form;
-          let params =  JSON.stringify(this.form);
-          console.log(this.form.beyondUnit)
-          if (!this.form.beyondUnit){
-            console.log(params.beyondUnit)
-            this.$message('请输入单位');
-          }else if (!this.form.name){
-            this.$message('请输入姓名');
-          }else if (!this.form.sex){
-            this.$message('请选择性别');
-          }else if (!this.form.phoneNum){
-            this.$message('请输入手机号');
-          }else if (this.form.phoneNum.length>11){
-            this.$message('长度超出11位');
-          } else {
-            const routeData = this.$router.resolve({
-              path: '/trainingMaterials',      //跳转目标窗口的地址
-              query: {
-                params    //括号内是要传递给新窗口的参数
-              }
-            })
-            window.open(routeData.href, "_search");
-          }
-
-        },
-        next() {
-          if (this.active++ > 2) this.active = 0;
+    };
+  },
+  methods: {
+    /**
+     * 获取当前时间
+     */
+    currentTime() {
+      var date = new Date();
+      var year = date.getFullYear(); //月份从0~11，所以加一
+      let month = date.getMonth();
+      var dateArr = [
+        date.getMonth() + 1,
+        date.getDate(),
+        date.getHours(),
+        date.getMinutes(),
+        date.getSeconds(),
+      ];
+      //如果格式是MM则需要此步骤，如果是M格式则此循环注释掉
+      for (var i = 0; i < dateArr.length; i++) {
+        if (dateArr[i] >= 1 && dateArr[i] <= 9) {
+          dateArr[i] = "0" + dateArr[i];
         }
       }
-    }
+      var strDate =
+        year +
+        "/" +
+        dateArr[0] +
+        "/" +
+        dateArr[1] +
+        " " +
+        dateArr[2] +
+        ":" +
+        dateArr[3] +
+        ":" +
+        dateArr[4];
+      //此处可以拿外部的变量接收  strDate:2022-05-01 13:25:30
+      //this.date = strDate;
+      this.form.testBeginTime = strDate;
+    },
+
+    onSubmit() {
+      this.currentTime();
+      // let params = this.form;
+      let params = JSON.stringify(this.form);
+      console.log(this.form.beyondUnit);
+      if (!this.form.beyondUnit) {
+        console.log(params.beyondUnit);
+        this.$message("请输入单位");
+      } else if (!this.form.name) {
+        this.$message("请输入姓名");
+      } else if (!this.form.sex) {
+        this.$message("请选择性别");
+      } else if (!this.form.phoneNum) {
+        this.$message("请输入手机号");
+      } else if (this.form.phoneNum.length > 11) {
+        this.$message("长度超出11位");
+      } else {
+        const routeData = this.$router.resolve({
+          path: "/trainingMaterials", //跳转目标窗口的地址
+          query: {
+            params, //括号内是要传递给新窗口的参数
+          },
+        });
+        window.open(routeData.href, "_search");
+      }
+    },
+    next() {
+      if (this.active++ > 2) this.active = 0;
+    },
+  },
+};
 </script>
 
 <style>
-
 </style>