查询条件接入

src/router/index.js

@@ -333,6 +333,19 @@ export const powerRoutes=[
         },
         name:'yhtj',
         path:"yhtj"
+      },
+      {
+        component:'dangerManagement/yhslhz/index',
+        hidden:false,
+        meta:{
+          "title": "隐患数量汇总",
+          "icon": "",
+          "noCache": false,
+          "link": null,
+          "mkid":'test',
+        },
+        name:'yhslhz',
+        path:"yhslhz"
       }
     ]
   },

src/views/dangerManagement/dangerReviewRecord/index.vue

@@ -17,13 +17,19 @@
               <el-date-picker value-format="timestamp" v-model="queryParams.jsrq"></el-date-picker>
             </div>
         </el-col>
-        <el-col :span="6" class="search-col">
-             <div class="search-item">
-               <span class="search-span">班组:</span>
-               <RelSelect style="width: 100%;"  src='/jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
-             </div>
+        <el-col :span="4" class="search-col">
+            <div class="search-item">
+              <span class="search-span">公司:</span>
+               <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+            </div>
+        </el-col>
+        <el-col :span="4" class="search-col">
+            <div class="search-item">
+              <span class="search-span">班组:</span>
+               <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
+            </div>
         </el-col>
-        <el-col :span="6" class="search-col">
+        <el-col :span="4" class="search-col">
           <div class="search-item">
             <span class="search-span">隐患类型:</span>
             <RelSelect  src='aqgl/yhgl/yhfl/query' :match="{value:'id',label:'name'}" v-model='queryParams.flid' ></RelSelect>
@@ -37,6 +43,14 @@
             <!--</div>-->
        <!--</el-col>-->
 			</el-row>
+      	<el-row :gutter="20" class="search-row-1">
+          <el-col :span="6" class="search-col">
+               <div class="search-item">
+                 <span class="search-span">报告人:</span>
+                 <el-input  v-model="queryParams.sbr"></el-input>
+               </div>
+          </el-col>
+          </el-row>
 		</div>
 		<!-- 按钮操作-->
 		<el-row class="tool-bar">
@@ -101,7 +115,8 @@
 					ksrq: new Date().getTime()-1000*60*60*24*30,
 					jsrq: new Date().getTime(),
 					bmid:'',
-          sbr:''
+          sbr:'',
+          gsid:''
 				},
 				/* 表格标题对应参数*/
 			tableTitle:  [

src/views/dangerManagement/enterSafetyRecords/index.vue

@@ -36,6 +36,12 @@
           </el-col>
 				</el-row>
         	<el-row :gutter="20" class="search-row-1">
+            <el-col :span="6" class="search-col">
+                <div class="search-item">
+                  <span class="search-span">上报人:</span>
+                 <el-input v-model="queryParams.sbr" ></el-input>
+                </div>
+            </el-col>
           </el-row>
 			</div>
 			<!-- 按钮操作-->
@@ -98,6 +104,7 @@ this.$refs['TablePager'].pageQuery()
 				baseUrl: '/aqgl/yhgl/yhjl',
 				/* 查询参数*/
 				queryParams: {
+          sbr:'',
           gsid:'',
 				  queryType:'YHSB',
           flid:'',

src/views/dangerManagement/queryDangerRecords/index.vue

@@ -54,7 +54,8 @@
           <el-col :span="6" class="search-col">
               <div class="search-item">
                 <span class="search-span">风险点:</span>
-                <el-input v-model="queryParams.fxd"></el-input>
+                <!-- <el-input v-model="queryParams.fxd"></el-input> -->
+                 <RelSelect linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;"  src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.fxd' ></RelSelect>
               </div>
           </el-col>
         </el-row>

src/views/dangerManagement/safetyDisposalRecord/index.vue

@@ -45,14 +45,15 @@
 				</el-row>
 			</div>
 			<!-- 按钮操作-->
-			<el-row class="tool-bar">
-				<ViewButton ref="view" :app='app'></ViewButton>
-       <!-- <AttachFileButton  :app='app'  ></AttachFileButton> -->
-        <AttachFileButton_aqyh :params="{childPath:'',allowAddFile:'none'}" :app='this'></AttachFileButton_aqyh>
-        <el-button size='mini' @click="zdzrr" type="primary">指定责任人</el-button>
-				<!-- 权限-->
-
-			</el-row>
+      	<!-- 按钮操作-->
+      			<el-row class="tool-bar">
+      				<ViewButton ref="view" :app='app'></ViewButton>
+             <!-- <AttachFileButton  :app='app'  ></AttachFileButton> -->
+              <AttachFileButton_aqyh :params="{childPath:'',allowAddFile:'none'}" :app='this'></AttachFileButton_aqyh>
+              <el-button size='mini' @click="zdzrr" type="primary">指定责任人</el-button>
+      				<!-- 权限-->
+      
+      			</el-row>
 			<!-- 表格-->
 			<div class="tablePagers">
 				<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'

src/views/dangerManagement/yhslhz/index.vue

+<template>
+  <div>汇总，等待对接</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/dangerManagement/yhtj/index.vue

@@ -17,10 +17,16 @@
 				    </div>
 				</el-col>
 				<el-col :span="6" class="search-col">
-				     <div class="search-item">
-				       <span class="search-span">单位:</span>
-				       <RelSelect style="width: 100%;"  src='kzzx/bm/query'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
-				     </div>
+				    <div class="search-item">
+				      <span class="search-span">公司:</span>
+				       <RelSelect style="width: 100%;"  src='jcsj/common/bm/queryGs'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
+				    </div>
+				</el-col>
+				<el-col :span="6" class="search-col">
+				    <div class="search-item">
+				      <span class="search-span">班组:</span>
+				       <RelSelect linkage :linkParams="{pid:queryParams.gsid}" style="width: 100%;"  src='jcsj/common/bm/queryBz'  filterable clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
+				    </div>
 				</el-col>
 			</el-row>
 		</div>
@@ -83,6 +89,7 @@
 			baseUrl: '/aqgl/yhbzfl',
 			/* 查询参数*/
 			queryParams: {
+      gsid:'',
 			ksrq: new Date().getTime()-1000*60*60*24*30,
 			jsrq: new Date().getTime(),
       bmid:''

src/views/riskPrecontrol/maintenanceRiskTask/index.vue

 <template>
   <div class="min_full" style="height: 140vh;">
-
+   <Zdzrr :app='this' v-if="showDialog" ></Zdzrr>
     <div class="min_full" style="height: 40%;">
 
       <!-- 查询条件-->
@@ -15,15 +15,8 @@
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-               <span class="search-span">岗位:</span>
-                 <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
-                   <el-option
-                     v-for="item in doQueryScgw"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-                   </el-option>
-                 </el-select>
+               <span class="search-span">检查人员:</span>
+                 <el-input v-model="queryParams.jcr" ></el-input>
              </div>
           </el-col>
           <el-col :span="6" class="search-col">
@@ -51,6 +44,7 @@
         <AttachFileButton :app='app'></AttachFileButton>
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
+        <el-button size='mini' @click="zdzrr" type="primary">指定责任人</el-button>
         <!-- 额外按钮-->
         <!-- 表头设置 -->
 
@@ -81,7 +75,7 @@
 </template>
 
 <script>
-
+import Zdzrr from './zdzrr'
   /* 引入需要的接口*/
 	/* 引入需要的接口*/
 	import {
@@ -118,6 +112,9 @@
     },
     data() {
       return {
+        DialogTitle:'指定责任人',
+        /*需要的额外参数 */
+        showDialog:false,
         doQueryScgw:[],
         activeName: 'first',
         /*需要的额外参数 */
@@ -129,8 +126,8 @@
         baseUrl: '/aqgl/fxyk/fxpc',
         /* 查询参数*/
         queryParams: {
+          jcr:'',
           zt:'',
-          gwid:'',
           ksrq: new Date().getTime()-1000*60*60*24*30,
           jsrq: new Date().getTime()
         },
@@ -160,6 +157,13 @@
       }
     },
     methods: {
+      zdzrr(){
+        if (this.app.selectOne || this.app.clickOne) {
+        	this.showDialog = true
+        } else {
+        	this.$warning('请选中一行操作');
+        }
+      },
       getRow: function(e) {
         this.rowItem = e
         this.$refs.Details.queryParams.fxbzid=e.fxbzid
@@ -188,7 +192,8 @@
     components: {
       Edit,
       Details,
-      Content
+      Content,
+      Zdzrr
     }
 
 

src/views/riskPrecontrol/maintenanceRiskTask/zdzrr.vue

+<template>
+  <DefaultDialog :app='app'>
+     <el-form slot="form" ref="form" label-width="100px" >
+       <el-row :gutter="20">
+
+           <el-col :span="12">
+               <el-form-item label="责任人"  ref="zrr" prop="zrr">
+                 <personSelector :label="singleItem.zrrName||'暂无'" @selected='zrrSelected' ></personSelector>
+               </el-form-item>
+           </el-col>
+           <el-col :span="12">
+               <el-form-item label="复查人"  ref="fcr" prop="fcr">
+                   <!-- <el-input :readonly="readonly"  v-model="form.zrr" ></el-input> -->
+                    <personSelector :label="singleItem.fcrName||'暂无'" @selected='fcrSelected' ></personSelector>
+               </el-form-item>
+           </el-col>
+
+       </el-row>
+       </el-form>
+    <div slot="reFooter" class="refooter" >
+      <span slot="footer" class="dialog-footer" >
+        <el-button  @click="app.showDialog=false">取 消</el-button>
+        <el-button type="primary" @click="save()">保 存</el-button>
+      </span>
+     </div>
+  </DefaultDialog>
+</template>
+<script>
+  import {
+  	doFp
+  } from "@/api/dangerManagement/common.js"
+  export default {
+    props: {
+      app: {
+        type: Object,
+        default: {}
+      }
+    },
+    async mounted() {
+      this.singleItem=_.cloneDeep(this.app.singleItem)
+    },
+    name: 'role',
+    data() {
+      return {
+        singleItem:{
+          zrr:'',
+          zrrName:'',
+          fcr:'',
+          fcrName:''
+        },
+
+    }},
+    methods: {
+save(){
+  let params={
+    id:this.singleItem.id,
+    fcr:this.singleItem.fcr,
+    zrr:this.singleItem.zrr,
+  }
+  doFp(params).then(res=>{
+    if(res.success){
+      this.$success('分配成功')
+      this.app.$refs['TablePager'].reLoad()
+       this.app.$refs['TablePager'].clearSelected()
+      this.app.showDialog=false
+    }
+  })
+},
+ zrrSelected(row){
+          			  this.singleItem.zrr=row.id
+          	},
+ fcrSelected(row){
+          			  this.singleItem.fcr=row.id
+          	}
+    }
+  }
+</script>
+
+<style scoped>
+</style>

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -138,11 +138,13 @@
         /* 表格标题对应参数*/
         tableTitle:  [
           {label: "公司", prop: "gsName", fieldType: "ftString",width:192},
-				{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
-				{label: "车间", prop: "cjName", fieldType: "ftString",width:192},
+				// {label: "部门", prop: "bmName", fieldType: "ftString",width:192},
+				// {label: "车间", prop: "cjName", fieldType: "ftString",width:192},
 				{label: "岗位", prop: "gwName", fieldType: "ftString",width:192},
 				{label: "风险地点", prop: "fxpcdd", fieldType: "ftString",width:300},
-				{label: "风险点", prop: "fxd", fieldType: "ftString",width:300},
+				{label: "风险点", prop: "fxdName", fieldType: "ftString",width:300},
+        /* 检查部位 事故后果 固有风险等级 现有风险等级*/
+        
 				{label: "事故类型", prop: "sglx", fieldType: "ftString",width:192},
 				{label: "危险等级", prop: "wxdj", fieldType: "ftString",width:160,transform:{
           url:'/aqgl/fxyk/fxpc/init/wxdj',label:'name',value:'id'