Dev yf'

src/views/riskProject/add/taskList.vue

@@ -177,6 +177,11 @@
               >
                 <van-col span="22" @click="toRiskDetail(item)">
                   <van-col span="5">
+                    <van-image
+                      width="46"
+                      height="46"
+                      src="https://img01.yzcdn.cn/vant/cat.jpeg"
+                    />
                     <van-image width="46" height="46" :src="item.avatar" />
                   </van-col>
                   <van-col span="17">
@@ -187,7 +192,11 @@
                   </van-col>
                 </van-col>
                 <van-col span="2">
-                  <van-row>
+                  <van-row
+                    :style="{
+                      color: '#03b615'
+                    }"
+                  >
                     <van-icon name="arrow" size="26px" @click="goColorDetail" />
                   </van-row>
                 </van-col>
@@ -338,6 +347,35 @@
         <div>删除任务</div>
       </div>
     </div>
+    <div
+      v-show="pathAuth == 'riskApprove' && status == 2"
+      style="display: flex;
+        justify-content: space-around;
+        background-color: #fff;
+        border-top: 1px solid #e3e3e3;
+        height: 1.5rem;
+        width: 100%;
+        text-align: center;
+        position: fixed;
+        bottom: 0;"
+    >
+      <div
+        @click="approveTask"
+        style="color: #4bced0;font-size: 14px;font-weight: 600;"
+      >
+        <div style="font-size: 22px;">
+          <van-icon name="success" />
+        </div>
+        <div>审批通过</div>
+      </div>
+      <div
+        @click="unApproveTask"
+        style="color: #ec808d;font-size: 14px;font-weight: 600;"
+      >
+        <div style="font-size: 22px;"><van-icon name="cross" /></div>
+        <div>审批否决</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -386,7 +424,7 @@ export default {
     var planId = this.$route.params.id || sessionStorage.getItem("planId");
     var buildingId =
       this.$route.params.buildingId || sessionStorage.getItem("buildingId");
-
+    this.pathAuth = sessionStorage.getItem("pathAuth");
     this.postList(planId, buildingId);
     this.getRiskTaskList(planId, buildingId);
   },
@@ -394,6 +432,7 @@ export default {
     timestampToTimes(time) {
       return timestampToTime(new Date(time), "DT2", true);
     },
+    //执行任务
     performTasks() {
       sessionStorage.setItem(
         "buildingId",
@@ -416,10 +455,22 @@ export default {
     //修改任务
     editTask() {
       //TODO 修改任务
+      console.log("修改任务");
     },
     //删除任务
     delTask() {
       //TODO 删除任务
+      console.log("删除任务");
+    },
+    //审批通过
+    approveTask() {
+      //TODO 审批通过
+      console.log("审批通过");
+    },
+    //审批否决
+    unApproveTask() {
+      //TODO 审批否决
+      console.log("审批否决");
     },
     handadd() {
       this.$router.push({

src/views/riskProject/approve/index.vue

@@ -175,6 +175,7 @@ export default {
           // buildingId: item.buildingId
         }
       });
+      sessionStorage.setItem("pathAuth", "riskApprove");
       sessionStorage.setItem("planId", item.id);
       sessionStorage.setItem("buildingId", "");
     }

src/views/riskProject/assess/index.vue

@@ -278,6 +278,7 @@ export default {
         }
       });
       sessionStorage.setItem("planId", item.id);
+      sessionStorage.setItem("pathAuth", "riskAssess");
       sessionStorage.setItem("buildingId", item.buildingId);
       this.showIndex = false;
     },

src/views/riskProject/manage/index.vue

@@ -40,20 +40,24 @@
             :key="index"
             @click="touchstart(index, item)"
           >
-             <div style="font-size: 0.45rem;padding: 5px 0;">{{item.name}}</div>
+            <div style="font-size: 0.45rem;padding: 5px 0;">
+              {{ item.name }}
+            </div>
 
             <van-row gutter="">
               <van-col span="17">
                 <van-row gutter="">
                   <van-col span="9">发起时间：</van-col>
-                        <van-col span="15">{{timestampToTimes(item.startTime)||item.startTime }}</van-col>
+                  <van-col span="15">{{
+                    timestampToTimes(item.startTime) || item.startTime
+                  }}</van-col>
                 </van-row>
                 <van-row gutter="">
                   <van-col span="9">处理人员：</van-col>
                   <van-col span="15">{{ item.leaderUserName }}</van-col>
                 </van-row>
               </van-col>
-                <van-col span="7" :style="{'color':'#03b615'}">
+              <van-col span="7" :style="{ color: '#03b615' }">
                 {{ item.state }}
               </van-col>
             </van-row>
@@ -67,7 +71,6 @@
             <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="info" @click="goConfirm(item)" v-show="active==0"
@@ -84,86 +87,87 @@
               position: fixed;
               top: 30%;
             "
-            v-if="messageList['length']==0"
+            v-if="messageList['length'] == 0"
           >
             暂无数据
           </div>
         </div>
         <!-- 暂无数据 -->
         <!-- {{messageList}} -->
-          
       </van-tab>
     </van-tabs>
-           <div style="width: 60px;position: fixed;right: 5%;top: 80%;" @click="handadd">
-             <img src="@/assets/accidentIcon/add.svg" alt="" width="100%" >
+    <div
+      style="width: 60px;position: fixed;right: 5%;top: 80%;"
+      @click="handadd"
+    >
+      <img src="@/assets/accidentIcon/add.svg" alt="" width="100%" />
     </div>
   </div>
-  </template>
+</template>
 
-  <script>
-  import LHeader from "@/components/header.vue";
-  import { timestampToTime, generateId } from "@/utils/format";
-  import { getFun, postFun } from "@/service/table.js";
+<script>
+import LHeader from "@/components/header.vue";
+import { timestampToTime, generateId } from "@/utils/format";
+import { getFun, postFun } from "@/service/table.js";
 //   import { postriskConList } from "@/service/risk";
-  export default {
-    name:'risk-confirme',
+export default {
+  name: "risk-confirme",
   components: {
-      LHeader,
+    LHeader
   },
   data() {
     return {
       text: "任务管理",
       searchValue: "",
       isHaveNews: false,
-        messageList: [
-        ],
+      messageList: [],
       Loop: "", // 定时器
       showIndex: null, // 是否显示遮罩层,
       active: 0,
       tabs: [
         {
           title: "待执行",
-            api: "/risk/plan/create/list?status=wait",
+          api: "/risk/plan/create/list?status=wait"
         },
         {
           title: "执行中",
-            api: "/risk/plan/create/list?status=running",
+          api: "/risk/plan/create/list?status=running"
         },
         {
           title: "已执行",
-            api: "/risk/plan/create/list?status=finish",
-          },
-        ],
+          api: "/risk/plan/create/list?status=finish"
+        }
+      ]
     };
   },
   created() {
     this.postList();
   },
   methods: {
-      timestampToTimes(time){        
-        return  timestampToTime(new Date(time),"DT1", true)
+    timestampToTimes(time) {
+      return timestampToTime(new Date(time), "DT1", true);
     },
-        handadd(){
+    handadd() {
       this.$router.push({
         name: "riskAdd",
         params: {
-                    title:'新增'
-                },
-            })
+          title: "新增"
+        }
+      });
     },
     postList(select = "") {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-          duration: 0,
+        duration: 0
       });
       // let formdata = new FormData();
       // formdata.append("select", select);
-        getFun(this.tabs[this.active]['api'])
-          .then((res) => {
+      getFun(this.tabs[this.active]["api"])
+        .then(res => {
           this.$toast.clear();
-            this.messageList =res.data||res.rows;
+          this.messageList = res.data || res.rows;
           // 判断有无数据返回
           if (this.messageList.length == 0) {
             this.isHaveNews = true;
@@ -191,10 +195,11 @@
       this.$router.push({
         name: "riskTaskList",
         params: {
-            id: data.businessId ||data.id,
-          },
+          id: data.businessId || data.id
+        }
       });
-        sessionStorage.setItem('planId',data.id)
+      sessionStorage.setItem("pathAuth", "riskManage");
+      sessionStorage.setItem("planId", data.id);
       this.showIndex = null;
     },
     // 确认
@@ -202,22 +207,21 @@
       this.$router.push({
         name: "risk-affirm",
         params: {
-            data: data,
-          },
+          data: data
+        }
       });
       this.showIndex = null;
-      },
-    },
-  };
-  </script>
-  
-  <style lang="less" scoped>
+    }
+  }
+};
+</script>
 
-  #app {
+<style lang="less" scoped>
+#app {
   font-family: "";
   color: #2c3e50;
-  }
-  .con-list {
+}
+.con-list {
   padding: 0;
   background-color: #f0f1f5;
   .van-cell-group--inset {
@@ -245,9 +249,8 @@
       }
     }
   }
-  }
-  /deep/.van-tab__pane{
+}
+/deep/.van-tab__pane {
   min-height: 8rem;
-  }
-  </style>
-  
+}
+</style>
\ No newline at end of file