Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

.gitlab-ci.yml

+stages:
+  - build-develop
+build:
+  stage: build-develop
+  only: 
+    - develop
+    - master
+  allow_failure: true
+  script:
+    - chcp 65001
+    - cmd /c npm install
+    - cmd /c npm run build
+    - cmd /c npm run build
+    - cmd /c xcopy .\dist D:\BCDH-APP\nginx-1.18.0\html\dist /s /Y
+  tags:
+    - BCDH-APP
\ No newline at end of file

src/service/danger.js

@@ -265,6 +265,26 @@ export function delayEdit(url, data) {
     })
 }
 
+// 隐患整改
+export function list1(url="/rectification/list1", data) {
+    return request({
+        url,
+        method: 'post',
+        data
+    })
+}
+
+// 隐患整改已退回
+export function list2(url="/rectification/list2", data) {
+    return request({
+        url,
+        method: 'post',
+        data
+    })
+}
+
+// 隐患整改已退回
+
 
 
 

src/views/danger/addDanger/addDanger.vue

@@ -17,6 +17,7 @@
         label="退回原因"
         type="textarea"
       />
+      
 
       <van-field
         readonly

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -234,8 +234,8 @@ export default {
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
       formdata.append("endTime", values.endTime);
-      formdata.append("rectificationUser", this.rectificationUser);
-      formdata.append("rectificationReview", this.rectificationReview);
+      formdata.append("rectificationUser", values.rectificationUser);
+      formdata.append("rectificationReview", values.rectificationReview);
       formdata.append("confirmOpinion", values.confirmOpinion);
       this.$toast.loading({
         message: "提交中...",

src/views/danger/confirmeDanger/index.vue

@@ -2,7 +2,6 @@
   <div>
     <LHeader :text="text"></LHeader>
     <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
-
     <!-- 内容列表 -->
     <div class="con-list" @touchmove="showIndex = null">
       <van-cell-group

src/views/danger/majorDanger/majorSurvey.vue

@@ -69,7 +69,7 @@
         name="thinkHdLev"
         :value="thinkLevel"
         label="认定隐患级别"
-        placeholder="请选择"
+        placeholder="重大隐患"
         @click="showThinkLevel = true"
         :rules="[{ required: true, message: '认定隐患级别不能为空' }]"
       />
@@ -124,7 +124,7 @@ export default {
       text: "重大隐患审批",
       agreeOpinion: "",
       disagreeOpinion: "",
-      thinkLevel:'', //因为隐患级别
+      thinkLevel:'重大隐患', //因为隐患级别
       showThinkLevel: false,
       columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
 

src/views/danger/standBook/normalDetail.vue

@@ -187,7 +187,7 @@
                   <van-col span="5"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">{{['退回','合格'][item.isResult]}}</van-col>
+                  <van-col span="19">{{ item.isResult == 1 ? "通过" : "退回"}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"