Merge remote-tracking branch 'origin/master'

src/views/riskPrecontrol/screeningCriteria/index.vue

@@ -14,7 +14,7 @@
           <el-col :span="6" class="search-col">
             <div class="search-item">
               <span class="search-span">风险点:</span>
-               <RelSelect linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" clearable  src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.fxd' ></RelSelect>
+               <RelSelect linkage :linkParams="{gsid:queryParams.gsid}" style="width: 100%;" clearable  src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='queryParams.id' ></RelSelect>
             </div>
           </el-col>
           <el-col :span="6" class="search-col">
@@ -134,7 +134,7 @@
         queryParams: {
           gsid:'',
           gwid: '',
-          fxd: ''
+          id: ''
         },
         /* 表格标题对应参数*/
         tableTitle:  [