Merge branch 'xjchen' into 'develop'

固有风险和现状风险详情20230802

See merge request !6

src/api/risk/plan.js

@@ -20,7 +20,7 @@ export function getPlan(id) {
 // 新增风险计划
 export function addPlan(data) {
   return request({
-    url: 'app-api/risk/plan',
+    url: '/app-api/risk/plan',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPlan(data) {
 // 修改风险计划
 export function updatePlan(data) {
   return request({
-    url: '/system/risk/plan',
+    url: '/app-api/risk/plan',
     method: 'put',
     data: data
   })
@@ -89,6 +89,31 @@ export function getUserListByDeptId(deptId) {
   })
 }
 
+//根据固有风险id查看固有风险信息
 
+export function getInherentById(inherentId) {
+  return request({
+    url: '/app-api/risk/plan/inherent/details/'+inherentId,
+    method: 'get',
+  })
+}
+
+//风险现有风险清单
+export function getExsitingList(query) {
+  return request({
+    url: '/system/risk/existing/list/',
+    method: 'get',
+    params: query
+  })
+}
+
+//根据固有风险id查看固有风险信息
+
+export function getExistingById(exsitingId) {
+  return request({
+    url: '/app-api/risk/plan/existing/details/'+exsitingId,
+    method: 'get',
+  })
+}
 
 

src/router/index.js

@@ -148,6 +148,34 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/risk/plan/inherentdata',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:id(\\d+)',
+        component: () => import('@/views/risk/plan/inherentdata'),
+        name: 'inherentdata',
+        meta: { title: '固有风险详情', activeMenu: '/risk/plan/inherentdata' }
+      }
+    ]
+  },
+  {
+    path: '/risk/plan/existingdata',
+    component: Layout,
+    hidden: true,
+    permissions: ['system:dict:list'],
+    children: [
+      {
+        path: 'index/:id(\\d+)',
+        component: () => import('@/views/risk/plan/existingdata'),
+        name: 'existingdata',
+        meta: { title: '现状风险详情', activeMenu: '/risk/plan/existingdata' }
+      }
+    ]
+  },
   {
     path: '/risk/drawCanvas/index',
     component: Layout,

src/views/risk/plan/existingdata.vue

+<template>
+  <div class="wrapper">
+    <el-descriptions :title="InfoList.name" class="margin-top" :column="3" :size="size" border>
+      <el-descriptions-item label="所属项目">{{
+        InfoList.projectName
+      }}</el-descriptions-item>
+      <el-descriptions-item label="所属楼栋">{{
+        InfoList.buildingName
+      }}</el-descriptions-item>
+      <el-descriptions-item label="所属楼层">{{
+        InfoList.floorName
+      }}</el-descriptions-item>
+      <el-descriptions-item label="所属房间">{{
+        InfoList.roomName
+      }}</el-descriptions-item>
+
+      <el-descriptions-item label="风险因素">{{
+        InfoList.factor
+      }}</el-descriptions-item>
+      <el-descriptions-item label="风险类型">{{
+        InfoList.type
+      }}</el-descriptions-item>
+      <el-descriptions-item label="存在部位">{{
+        InfoList.presenceLocation
+      }}</el-descriptions-item>
+      <el-descriptions-item label="评估人">{{
+        InfoList.userName
+      }}</el-descriptions-item>
+      <el-descriptions-item label="评估时间">{{
+        InfoList.createTime
+      }}</el-descriptions-item>
+
+    </el-descriptions>
+    <el-tabs v-model="activeName" type="border-card" style="margin-top: 10px">
+      <el-tab-pane label="风险管控信息" name="first">
+        <el-tabs tab-position="left">
+          <el-tab-pane label="风险图片">
+            <template>
+              <div v-if="InfoList.pictureFile!=null">
+                <el-carousel style="height: 500px;width:500px;position: relative;left: 34%;">
+                  <el-carousel-item v-for="item in InfoList.pictureFile" :key="item">
+
+                    <img :src="item.filePath" style="height: 400px; " />
+
+                  </el-carousel-item>
+                </el-carousel>
+              </div>
+              <div v-else>
+                <el-empty description="暂无图片"></el-empty>
+              </div>
+
+            </template>
+
+
+          </el-tab-pane>
+          <el-tab-pane label="已采取的管控措施">
+            <div class="approveResult">
+              <div class="approveL">
+                <span style="font-weight: bold;">技术措施</span>
+                <p>{{InfoList.measuresProject}}</p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">技术措施附件</span>
+                <p>
+                <template>
+                  <div v-if="InfoList.measuresProjectFile!=null">
+                    <div v-for="item in InfoList.measuresProjectFile" :key="item">
+                      <span> <el-link type="primary" icon="el-icon-document"
+                          :href="item.filePath">{{item.fileName}}</el-link></span>
+                    </div>
+                  </div>
+                  <div v-else>
+                    <el-empty description="暂无附件"></el-empty>
+                  </div>
+
+                </template>
+                </p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">管理措施</span>
+                <p>{{InfoList.measuresAdministration}}</p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">管理措施附件</span>
+
+                <p>
+                <template>
+                  <div v-if="InfoList.measuresAdministrationFile!=null">
+                    <div v-for="item in InfoList.measuresAdministrationFile" :key="item">
+                      <span> <el-link type="primary" icon="el-icon-document"
+                          :href="item.filePath">{{item.fileName}}</el-link></span>
+                    </div>
+                  </div>
+                  <div v-else>
+                    <el-empty description="暂无附件"></el-empty>
+                  </div>
+
+                </template>
+                </p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">应急措施</span>
+                <p>{{InfoList.measuresEmergency}}</p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">应急措施附件</span>
+                
+                <p>
+                <template>
+                  <div v-if="InfoList.measuresEmergencyFile!=null">
+                    <div v-for="item in InfoList.measuresEmergencyFile" :key="item">
+                      <span> <el-link type="primary" icon="el-icon-document"
+                          :href="item.filePath">{{item.fileName}}</el-link></span>
+                    </div>
+                  </div>
+                  <div v-else>
+                    <el-empty description="暂无附件"></el-empty>
+                  </div>
+
+                </template>
+                </p>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">管控责任单位:</span><span>{{InfoList.measuresDeptName}}</span>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">管控责任人:</span><span>{{InfoList.measuresUserName}}</span>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">管控责任人联系方式:</span><span>{{InfoList.measuresUserPhone}}</span>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">判断依据:</span><span>{{InfoList.referenceBasis}}</span>
+                <el-divider></el-divider>
+                <span style="font-weight: bold;">风险等级:</span><span>{{InfoList.level}}</span>
+
+              </div>
+            </div>
+          </el-tab-pane>
+
+        </el-tabs>
+
+      </el-tab-pane>
+
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+  import {
+    getExistingById
+  } from "@/api/risk/plan";
+  export default {
+    data() {
+      return {
+        activeNames: ['1'],
+        activeName: "first",
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 现有风险清单库表格数据
+        listList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          inherentId: null,
+          code: null,
+          name: null,
+          type: null,
+          describe: null,
+          evaluationModel: null,
+          evaluationRange: null,
+          level: null,
+          factor: null,
+          measuresProject: null,
+          measuresProjectFileIds: null,
+          measuresAdministration: null,
+          measuresAdministrationFileIds: null,
+          measuresEmergency: null,
+          measuresEmergencyFileIds: null,
+          referenceBasis: null,
+          planId: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {},
+        reportList: [],
+        InfoList: {},
+      };
+    },
+    created() {
+
+    },
+    mounted() {
+      // console.log(this.$route.params, 'lll')
+      this.getInfo(this.$route.params.id);
+    },
+    methods: {
+      handleChange(val) {
+        console.log(val);
+      },
+      downList(planId) {
+        this.download("/system/risk/plan/exportExcel/InherentList/" + planId, {});
+      },
+      showDrawCanvas(floorId) {
+        this.$router.push({
+          name: "drawCanvas",
+          params: {
+            floorId: floorId,
+          },
+        });
+      },
+      getInfo(id) {
+        getExistingById(id).then((res) => {
+          this.InfoList = res.data;
+          console.log(this.InfoList);
+        });
+      },
+
+      exportList(id) {
+        console.log(id, "kkkk");
+        this.download("system/risk/plan/exportWord/riskNotification/" + id, {});
+      },
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        inherentId: null,
+        code: null,
+        name: null,
+        type: null,
+        describe: null,
+        evaluationModel: null,
+        evaluationRange: null,
+        level: null,
+        factor: null,
+        measuresProject: null,
+        measuresProjectFileIds: null,
+        measuresAdministration: null,
+        measuresAdministrationFileIds: null,
+        measuresEmergency: null,
+        measuresEmergencyFileIds: null,
+        referenceBasis: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleSelectionChange() {},
+  };
+</script>
+
+<style lang="scss" scoped>
+  .wrapper {
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+  }
+
+  ::v-deep .el-tabs__content {
+    height: calc(100vh - 334px) !important;
+  }
+
+  .titles {
+    position: relative;
+    font-size: 18px;
+    font-weight: bold;
+    margin: 10px 0 10px 20px;
+    color: #666666;
+  }
+
+  .titles::before {
+    content: "";
+    width: 8px;
+    height: 20px;
+    background: #3f9eff;
+    position: absolute;
+    left: -14px;
+    top: 0;
+  }
+
+  .approveResult {
+    flex: 1;
+    width: 100%;
+    height: calc(100vh - 360px) !important;
+    overflow-y: auto;
+    display: flex;
+    justify-content: space-between;
+
+    .approveL {
+      flex: 3;
+      width: 100%;
+    }
+
+    .approveR {
+      flex: 7;
+      width: 100%;
+      padding: 0 0 0 30px;
+      border-left: 1px solid #d7d7d7d7;
+    }
+  }
+</style>

src/views/risk/plan/index.vue

@@ -135,10 +135,10 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="创建人员" prop="createUserId">
-          <el-input v-model="user.nickName" placeholder="请输入创建人员" required="true" />
+          <el-input v-model="user.nickName" placeholder="请输入创建人员"  disabled/>
         </el-form-item>
         <el-form-item label="创建单位" prop="createDeptId">
-          <el-input v-model="user.dept.deptName" placeholder="请输入创建单位" />
+          <el-input v-model="user.dept.deptName" placeholder="请输入创建单位" disabled/>
         </el-form-item>
         <el-form-item label="任务名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入任务名称" />
@@ -147,7 +147,7 @@
           <el-input v-model="form.projectIdV" placeholder="请输入任务名称" />
         </el-form-item>
         <el-form-item label="关联项目" prop="projectId">
-          <el-select v-model="form.projectId" @change="getBuildingList(form.projectId)" filterable remote
+          <el-select v-model="form.projectId" size="medium" @change="getBuildingList(form.projectId,'change')" filterable remote
             reserve-keyword placeholder="请输入项目关键词" :remote-method="remoteMethod" :loading="loading">
             <el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
@@ -161,7 +161,7 @@
           <!-- <el-input v-model="form.buildingIds" placeholder="请输入评估楼栋" /> -->
         </el-form-item>
         <el-form-item label="评估小组选择" prop="deptId">
-          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" @select="handleNodeClick" placeholder="请选择归属部门" />
           <!-- <el-input v-model="user.dept.deptName" placeholder="请输评估小组选择" /> -->
         </el-form-item>
         <el-form-item label="评估小组组长" prop="leaderUserId">
@@ -397,12 +397,19 @@
         getUserProfile().then(response => {
 
           this.user = response.data;
-          console.log(this.user)
+          //console.log(this.user)
           this.form.deptId = response.data.deptId;
           this.getUserListByDeptId(this.user.dept.deptId);
         });
       },
-      getBuildingList(projectId) {
+      getBuildingList(projectId,type) {
+
+        console.log("changeme");
+        if(type=='change'){
+          this.form.buildingIds=null;
+          this.form.projectIdV=projectId;
+        }
+
         getBuildingList(projectId).then(response => {
           this.buildingOption = response.data;
         });
@@ -432,9 +439,12 @@
       // 节点单击事件
       handleNodeClick(data) {
         console.log(" handleNodeClick");
-        this.queryParams.deptId = data.id;
-        this.handleQuery();
-        // this.form.deptId=data.id;
+        // console.log(data);
+        // this.queryParams.deptId = data.id;
+        // this.handleQuery();
+        //更新组长和成员人员列表
+        this.getUserListByDeptId(data.id);
+        this.form.deptId=data.id;
       },
       // 取消按钮
       cancel() {
@@ -495,7 +505,7 @@
         getPlan(id).then(response => {
           this.form = response.data;
           var projectIdV=response.data.projectId;
-          this.getBuildingList(response.data.projectId);
+          this.getBuildingList(response.data.projectId,"edit");
           //执行人员
           var workUserArr=[];
           response.data.workUserIds.split(',').forEach(item=>{
@@ -523,8 +533,9 @@
 
              this.form.buildingIds=this.form.buildingIds.join();
              this.form.workUserIds=this.form.workUserIds.join();
-             this.form.projectId=this.form.projectIdV;
+
             if (this.form.id != null) {
+              this.form.projectId=this.form.projectIdV;
               updatePlan(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;

src/views/risk/plan/ledgerdata.vue

@@ -131,6 +131,10 @@
                       @click="showDrawCanvas(scope.row.floorId)"
                       >查看四色图</el-button
                     >
+                    <router-link :to="'/risk/plan/inherentdata/index/' + scope.row.id" class="link-type">
+                      <el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
+                    </router-link>
+                    
                   </div>
                 </template>
               </el-table-column>