Commit b6065533 authored by 胡占生's avatar 胡占生 🇨🇳
Browse files

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

parents 15236232 52960c74

src/views/riskProject/add/addCurrent.vue

+6 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ export default { 
    created() {

        if (this.$route.params.inherentId) {

            this.inherentId = this.$route.params.inherentId

            this.buildingIds = this.$route.params.buildingIds

            this.buildingIds = this.$route.params.buildingId

            this.postReturnEcho();

        }

        // this.getList();
@@ -458,6 +458,11 @@ export default { 
                params: {

                    id: this.inherentId,

                    // planId:this.planId

                    buildingId:this.buildingId,

                    planId:this.inherentId,

                    floorId:this.form.floorId,

                    roomName:this.form.roomName,

                    roomId:this.form.roomId,

                },

            })

        },

src/views/riskProject/add/addPresent.vue

+7 −2
Original line number Diff line number Diff line 
<template>

    <div>

        <LHeader :text="text"></LHeader>

     

        <van-form

            @submit="onSubmit"

            :scroll-to-error="true"
@@ -466,11 +465,16 @@ export default { 
        var userInfo=getUserInfo()

        this.form.buildingIds=this.$route.params.id

        this.form.planId=this.$route.params.planId

        this.form.floorId = this.$route.params.floorId

        this.form.roomId = this.$route.params.roomId

        this.form.inherentId = this.$route.params.id

        this.form.roomName = this.$route.params.roomName

        this.form.buildingName = '1号楼'

        this.form.userId=userInfo.userId

        this.form.userName=userInfo.userName

        this.form.deptName=userInfo.dept.deptName

        this.form.projectId='测试项目'

        

    },

    methods: {

        seletFloor(name){
@@ -600,7 +604,8 @@ export default { 
        onSubmit(values) {

            // console.log('%c [ values ]-592', 'font-size:13px; background:pink; color:#bf2c9f;', values)

            var formDataJson=this.jsonToFormData(this.form)

            let url = "/risk/plan/inherent";

            // let url = "/risk/plan/inherent";

            let url = "/risk/plan/existing";

            values.hdPicture1.forEach((item) => {

                if (item.file) {

                    formDataJson.append("pictureFile[]", item.file);

src/views/riskProject/add/inherentRisks.vue

+6 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
              <div style="font-size: 0.45rem;padding: 5px 0;">

                {{ item.title }}

              </div>



              <van-row gutter="">

                <van-col span="17">

                  <van-row gutter="">
@@ -263,11 +262,16 @@ export default { 
    },

    // 详情

    goDetail(data) {

      sessionStorage.setItem('buildingId',this.buildingId)

      sessionStorage.setItem('planId',this.planId)

      sessionStorage.setItem('buildingName',this.buildingName)

      this.$router.push({

        name: "addCurrent",

        params: {

          inherentId: data.businessId || data.id,

          buildingIds: this.active

          planId: this.planId,

          buildingId:this.buildingId,

          buildingName:this.buildingName

        }

      });

      this.showIndex = null;

src/views/riskProject/add/taskList.vue

+118 −193
Original line number Diff line number Diff line
@@ -33,205 +33,105 @@ 
          </div>

        </van-grid-item>

      </van-grid>

      <van-steps

        :active="phase"

        active-icon="success"

        active-color="#38f"

        style="margin: 0.26rem 0;"

      >

      <van-steps :active="phase" active-icon="success" active-color="#38f" style="margin: 0.26rem 0;">

        <van-step name="1">任务发起</van-step>

        <van-step name="2">风险评估</van-step>

        <van-step name="3">评估审核</van-step>

        <van-step name="4">项目完成</van-step>

      </van-steps>

      <van-tabs

        v-model="active"

        color="#2980f7"

        animated

        :sticky="true"

        offset-top="2.93rem"

      >

      <van-tabs v-model="active" color="#2980f7" animated :sticky="true" offset-top="2.93rem">

        <van-tab title="任务详情">

          <van-form

            :scroll-to-error="true"

            :show-error="false"

            validate-trigger="onSubmit"

          >

            <van-field

              readonly

              name="createUserName"

              :value="form.createUserName"

              label="创建人员"

              input-align="right"

              :rules="[{ required: true, message: '创建人员不能为空' }]"

            />

            <van-field

              readonly

              name="createDeptName"

              :value="form.createDeptName"

              label="创建单位"

              input-align="right"

              :rules="[{ required: true, message: '创建单位不能为空' }]"

            />

            <van-field

              readonly

              name="projectName"

              :value="form.projectName"

              label="任务名称"

              input-align="right"

              :rules="[{ required: true, message: '任务名称不能为空' }]"

            />

          <van-form :scroll-to-error="true" :show-error="false" validate-trigger="onSubmit">

            <van-field readonly name="createUserName" :value="form.createUserName" label="创建人员" input-align="right"

              :rules="[{ required: true, message: '创建人员不能为空' }]" />

            <van-field readonly name="createDeptName" :value="form.createDeptName" label="创建单位" input-align="right"

              :rules="[{ required: true, message: '创建单位不能为空' }]" />

            <van-field readonly name="projectName" :value="form.projectName" label="任务名称" input-align="right"

              :rules="[{ required: true, message: '任务名称不能为空' }]" />



            <van-field

              readonly

              name="projectName"

              :value="form.projectName"

              label="关联项目"

              input-align="right"

              :rules="[{ required: true, message: '关联项目不能为空' }]"

            />

            <van-field readonly name="projectName" :value="form.projectName" label="关联项目" input-align="right"

              :rules="[{ required: true, message: '关联项目不能为空' }]" />



            <van-field

              readonly

              name="buildingNames"

              :value="form.buildingNames"

              label="评估楼栋"

              input-align="right"

              :rules="[{ required: true, message: '评估楼栋不能为空' }]"

            />

            <van-field readonly name="buildingNames" :value="form.buildingNames" label="评估楼栋" input-align="right"

              :rules="[{ required: true, message: '评估楼栋不能为空' }]" />



            <van-field

              readonly

              name="deptName"

              :value="form.deptName"

              label="评估小组选择"

              input-align="right"

              :rules="[{ required: true, message: '评估小组不能为空' }]"

            />

            <van-field readonly name="deptName" :value="form.deptName" label="评估小组选择" input-align="right"

              :rules="[{ required: true, message: '评估小组不能为空' }]" />



            <van-field

              readonly

              name="leaderUserName"

              :value="form.leaderUserName"

              label="评估小组组长"

              input-align="right"

              :rules="[{ required: true, message: '评估小组组长不能为空' }]"

            />

            <van-field readonly name="leaderUserName" :value="form.leaderUserName" label="评估小组组长" input-align="right"

              :rules="[{ required: true, message: '评估小组组长不能为空' }]" />



            <van-field

              clickable

              name="workUserNames"

              :value="form.workUserNames"

              label="评估成员"

              input-align="right"

              :rules="[{ required: true, message: '评估成员不能为空' }]"

            />

            <van-field clickable name="workUserNames" :value="form.workUserNames" label="评估成员" input-align="right"

              :rules="[{ required: true, message: '评估成员不能为空' }]" />



            <van-field

              v-model="form.startTime"

              readonly

              name="location"

              label="任务开始时间"

              input-align="right"

              :formatter="

                () => {

            <van-field v-model="form.startTime" readonly name="location" label="任务开始时间" input-align="right" :formatter="() => {

              return timestampToTimes(form.startTime);

            }

              "

              :rules="[{ required: true, message: '任务开始时间不能为空' }]"

            />

              " :rules="[{ required: true, message: '任务开始时间不能为空' }]" />



            <van-field

              v-model="form.endTime"

              readonly

              name="location"

              label="任务结束时间"

              :formatter="

                () => {

            <van-field v-model="form.endTime" readonly name="location" label="任务结束时间" :formatter="() => {

              return timestampToTimes(form.endTime);

            }

              "

              input-align="right"

              :rules="[{ required: true, message: '任务结束时间不能为空' }]"

            />

              " input-align="right" :rules="[{ required: true, message: '任务结束时间不能为空' }]" />

          </van-form>

        </van-tab>

        <van-tab title="风险清单">

          <!-- <van-row v-for="item in riskList" :key="item.id">

              <van-col span="24">

                  {{ item.name }}

          <van-sticky>

            <van-dropdown-menu>

              <van-dropdown-item v-model="value1" :options="option1" />

              <van-dropdown-item v-model="value2" :options="option2" />

              <van-dropdown-item v-model="value3" :options="option3" />

            </van-dropdown-menu>

          </van-sticky>

          <div style="overflow-y: auto;">

            <van-cell-group inset v-for="(item, index) in riskList" :key="index">

              <van-row type="flex" justify="space-between" style="margin-top:10px;">

                <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-col>

          </van-row> -->

          <van-cell-group

            inset

            v-for="(item, index) in riskList"

            :key="index"

          >

            <div style="font-size: 0.45rem;padding: 5px 0;">

              {{ item.title }}

            </div>

            <van-row gutter="">

                  <van-col span="17">

                    <van-row gutter="">

                      <van-col span="9">风险名称：</van-col>

                      <van-col span="15">{{ item.name }}</van-col>

                    </van-row>

                  </van-col>

              <van-col span="7">

                <van-row

                  :style="{

                    color: '#03b615'

                  }"

                >

                  {{ item.state }}

                </van-row>

                </van-col>

              <van-col span="7">

                <van-row

                  :style="{

                <van-col span="2">

                  <van-row :style="{

                    color: '#03b615'

                  }"

                >

                <van-button icon="plus" @click="goColorDetail"></van-button>

                  }">

                    <van-icon name="arrow" size="26px" @click="goColorDetail" />

                  </van-row>

                </van-col>

              </van-row>

            </van-cell-group>

          </div>



        </van-tab>

        <van-tab title="审核记录">

          <div class="journal-wrap">

            <van-cell-group inset>

              <van-steps

                direction="vertical"

                :active="99999"

                v-if="riskLogList.length > 0"

              >

              <van-steps direction="vertical" :active="99999" v-if="riskLogList.length > 0">

                <van-step v-for="(item, index) in riskLogList" :key="index">

                  <div class="step-wrap">

                    <van-row>

                      <van-col span="24"

                        ><div class="info-title">

                      <van-col span="24">

                        <div class="info-title">

                          {{ timestampToTimes(item.startTime) }}

                        </div></van-col

                      >

                        </div>

                      </van-col>

                    </van-row>

                    <van-row>

                      <van-col span="7"

                        ><span class="field-title">操作人：</span></van-col

                      >

                      <van-col span="7"><span class="field-title">操作人：</span></van-col>

                      <van-col span="17">{{ item.approvalUserName }}</van-col>

                    </van-row>

                    <van-row>

                      <van-col span="7"

                        ><span class="field-title">审批结果：</span></van-col

                      >

                      <van-col span="7"><span class="field-title">审批结果：</span></van-col>

                      <van-col span="17">{{ item.taskName }}</van-col>

                    </van-row>

                    <van-row>

                      <van-col span="7"

                        ><span class="field-title">岗位：</span></van-col

                      >

                      <van-col span="7"><span class="field-title">岗位：</span></van-col>

                      <van-col span="17">{{ item.taskResult }}</van-col>

                    </van-row>

                    <!-- <van-row>
@@ -250,15 +150,13 @@ 
          </div>

        </van-tab>

        <van-tab title="风险评估报告">

          <div

            style="height: 1.5rem;

          <div style="height: 1.5rem;

           background-color: #fff;

           border-bottom: 1px solid #97999a;

           display: flex;

           justify-content: space-between;

           line-height: 1.5rem;

           "

          >

           ">

            <div><van-icon name="column" size="26px" /></div>

            <div style="flex-grow:1;line-height: 0.6rem">

              <div>风险评估报告.PDF</div>
@@ -268,15 +166,13 @@ 
              <van-icon name="arrow" size="26px" />

            </div>

          </div>

          <div

            style="height: 1.5rem;

          <div style="height: 1.5rem;

           background-color: #fff;

           border-bottom: 1px solid #97999a;

           display: flex;

           justify-content: space-between;

           line-height: 1.5rem;

           "

          >

           ">

            <div><van-icon name="column" size="26px" /></div>

            <div style="flex-grow:1;line-height: 0.6rem">

              <div>风险评估报告.PDF</div>
@@ -289,8 +185,7 @@ 
        </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;
@@ -298,12 +193,8 @@ 
        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>
@@ -338,6 +229,21 @@ export default { 
      form: {},

      tabs: [],

      riskList: [],

      value1: 0,

      value2: 'a',

      value3: '1',

      option1: [

        { text: '楼栋', value: 0 },

        { text: '全部', value: 1 },

      ],

      option2: [

        { text: '楼层', value: 'a' },

        { text: '全部', value: 'b' },

      ],

      option3: [

        { text: '房间', value: '1' },

        { text: '全部', value: '2' },

      ],

    };

  },

  created() {
@@ -445,6 +351,16 @@ export default { 
        }

      })

    },

    //风险清单列表点击

    toRiskDetail(item) {

      console.log(item,'LLLL')

      this.$router.push({

          name:"taskDetail",

          params:{

            id:item.id

          }

        })

    }

  }

};

</script>
@@ -453,9 +369,11 @@ export default { 
  font-family: "";

  color: #2c3e50;

}



.cell-wrap {

  position: relative;

}



p {

  font-size: 0.4rem;

  font-weight: none;
@@ -463,31 +381,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;

src/views/riskProject/taskLedger/taskDetail.vue

+74 −6
Original line number Diff line number Diff line
@@ -3,26 +3,88 @@ 
    <van-sticky offset-top="0">

      <LHeader :text="text"></LHeader>

    </van-sticky>

    <div class="section">

      <van-tabs v-model="activeName" color="#2980f7" animated >

        <van-tab title="固有风险信息" name="a">



        </van-tab>

        <van-tab title="现状风险" name="b">

          <van-cell-group

            inset

            v-for="(item, index) in quoRiskList"

            :key="index"

          >

            <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">{{ item.leaderUserName }}</van-col>

                </van-row>

                <van-row gutter="">

                  <van-col span="9">发起时间：</van-col>

                  <van-col span="15">{{

                    timestampToTimes(item.startTime)

                  }}</van-col>

                </van-row>

              </van-col>

              <van-col span="7">

                <van-row>

                  {{ item.state }}

                </van-row>

                <van-row>

                  <van-button

                    type="info"

                    size="mini"

                    @click="todetail(index, item)"

                    >{{ active == 2 ? "去处理" : "去审批" }}</van-button

                  >

                </van-row>

              </van-col>

            </van-row>

          </van-cell-group>

        </van-tab>

        <van-tab title="四色图" name="c">

          <drawCanvas/>

        </van-tab>

      </van-tabs>

    </div>

  </div>

</template>



<script type="text/ecmascript-6">

import LHeader from "@/components/header.vue";

import drawCanvas from '@/views/drawCanvas/riskView.vue'

import { getFun, postFun } from "@/service/table.js";

export default {

  name: 'taskDetail',

  data() {

    return {

      text: "固有风险列表",

      activeName: 'a',

      quoRiskList:[],//现状风险列表

      InherentRisk:[],//固有风险

      inherentId:''

    }

  },

  components: {

    LHeader,

    drawCanvas

  },

  created(){

    this.inherentId = this.$route.params.id

  },

  mounted() {

    

    this.getQuoRiskList(this.$route.params.id)

  },

  methods: {

    

    getQuoRiskList(inherentId){

      getFun(`/risk/plan/existing/list/${inherentId}`).then(res=>{

        this.quoRiskList = res.data

      })

    }

  },

}

</script>
@@ -32,4 +94,10 @@ export default { 
  height: 100vh;

  width: 100vw;

}



.section {

  width: 100%;

  height: 100%;

  overflow-y: auto;

}

</style>