commit

src/main.js

@@ -8,7 +8,7 @@ import './permission'
 import Cookies from 'js-cookie'
 import util from './api/util.js'
 import {DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar,DatetimePicker,
-Step, Steps  } from 'vant'
+Step, Steps } from 'vant'
 import 'lib-flexible/flexible'
 import vueEsign from 'vue-esign'
 Vue.use(vueEsign)

src/views/riskProject/add/inherentRisks.vue

@@ -8,26 +8,11 @@
       <van-tabs v-model="active" @change="tabList" color="#2980f7" animated>
         <van-tab :title="buildingName">
           <van-dropdown-menu z-index="1000">
-            <van-dropdown-item
-              v-model="value1"
-              @change="changeFloor"
-              :options="option1"
-              get-container="body"
-            />
-            <van-dropdown-item
-              v-model="value2"
-              @change="changeRoom"
-              :options="option2"
-              get-container="body"
-            />
+            <van-dropdown-item v-model="value1" @change="changeFloor" :options="option1" get-container="body" />
+            <van-dropdown-item v-model="value2" @change="changeRoom" :options="option2" get-container="body" />
           </van-dropdown-menu>
           <div class="con-list">
-            <van-cell-group
-              inset
-              v-for="(item, index) in messageList"
-              :key="index"
-              @click="touchstart(index, item)"
-            >
+            <van-cell-group inset v-for="(item, index) in messageList" :key="index" @click="touchstart(index, item)">
               <div style="font-size: 0.45rem;padding: 5px 0;">
                 {{ item.title }}
               </div>
@@ -49,42 +34,33 @@
                     <van-col span="15">{{ item.roomName }}</van-col>
                   </van-row>
                 </van-col>
-                <van-col
-                  span="7"
-                  :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }"
-                >
+                <van-col span="7" :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }">
                   {{ "●待审批" }}
                 </van-col>
               </van-row>
               <van-overlay :show="showIndex == index">
                 <div class="wrapper" @click.stop="showIndex = null">
-                  <van-button round type="primary" @click="goDetail(item)"
-                    >编辑</van-button
-                  >
+                  <van-button round type="primary" @click="goDetail(item)">编辑</van-button>
                   <!-- <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
                     >确认</van-button
                   > -->
                 </div>
               </van-overlay>
             </van-cell-group>
-            <div
-              style="
+            <div style="
               width: 100%;
               text-align: center;
               font-size: 0.48rem;
               position: fixed;
               top: 30%;
-            "
-              v-if="messageList['length'] == 0"
-            >
+            " v-if="messageList['length'] == 0">
               暂无数据
             </div>
           </div>
         </van-tab>
       </van-tabs>
     </div>
-    <div
-      style="display: flex;
+    <div style="display: flex;
         justify-content: space-around;
         background-color: #fff;
         border-top: 1px solid #e3e3e3;
@@ -92,19 +68,12 @@
         width: 100%;
         text-align: center;
         position: fixed;
-        bottom: 0;"
-    >
-      <div
-        @click="performTasks"
-        style="color: #4bced0;font-size: 14px;font-weight: 600;"
-      >
+        bottom: 0;">
+      <div @click="performTasks" style="color: #4bced0;font-size: 14px;font-weight: 600;">
         <div style="font-size: 22px;"><van-icon name="plus" /></div>
         <div>新增固有风险</div>
       </div>
-      <div
-        @click="endTasks"
-        style="color: #D9001B;font-size: 14px;font-weight: 600;"
-      >
+      <div @click="endTasks" style="color: #D9001B;font-size: 14px;font-weight: 600;">
         <div style="font-size: 22px;"><van-icon name="cross" /></div>
         <div>任务执行结束</div>
       </div>
@@ -113,13 +82,14 @@
 </template>
 
 <script>
+import { Dialog } from 'vant';
 import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime, generateId } from "@/utils/format";
 export default {
   name: "risk-confirme",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -177,6 +147,19 @@ export default {
     //任务执行结束
     endTasks() {
       //toDo
+      postFun(
+        `/risk/plan/submit/${this.planId}/${this.buildingId}`
+      ).then(res => {
+        console.log(res.msg,'lllll')
+        Dialog.alert({
+          title: '任务执行结束',
+          message: res.msg,
+        }).then(() => {
+          this.$router.push({
+            name:'riskAssess'
+          })
+        });
+      })
     },
     handadd() {
       this.$router.push({
@@ -300,9 +283,11 @@ export default {
   font-family: "";
   color: #2c3e50;
 }
+
 .cell-wrap {
   position: relative;
 }
+
 p {
   font-size: 0.4rem;
   font-weight: none;
@@ -310,31 +295,38 @@ p {
   margin: 0.186667rem 0;
   color: #7f7f7f;
 }
+
 .van-cell-group--inset {
   margin: 0;
   margin-bottom: 10px;
   padding: 10px;
   font-size: 13px;
   position: relative;
+
   .van-row {
     margin-bottom: 0.133333rem;
     line-height: 0.64rem;
   }
 }
+
 .journal-wrap {
   position: relative;
 }
+
 .supervise-wrap {
   position: relative;
 }
+
 .info-title {
   color: #2980f7;
   font-weight: none;
 }
+
 .field-title {
   color: black;
   font-weight: none;
 }
+
 .more {
   position: absolute;
   bottom: 0.32rem;
@@ -343,10 +335,12 @@ p {
   font-weight: none;
   z-index: 99;
 }
+
 .con-list {
   padding: 0;
   min-height: 10rem;
   background-color: #f0f1f5;
+
   .van-cell-group--inset {
     margin: 0;
     margin-bottom: 0.26667rem;
@@ -357,13 +351,16 @@ p {
     box-shadow: 0px 0px 10px 2px #f3f3f3;
     width: 90%;
     margin: 0.4rem auto;
+
     .van-row {
       font-size: 0.4rem;
       line-height: 0.8rem;
       margin-bottom: 0;
     }
+
     .van-overlay {
       position: absolute;
+
       .wrapper {
         display: flex;
         align-items: center;

src/views/riskProject/assess/index.vue

@@ -170,7 +170,7 @@ import { timestampToTime, generateId } from "@/utils/format";
 export default {
   name: "risk-execution",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {