guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#3) from dev into main 

Reviewed-on: #3
main
guoyuepeng 2023-11-23 09:10:22 +08:00
parent afc00331cd 7509986666
commit ac317e5ac4
15 changed files with 93 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/OutSourced/index.vue
View File

@ -7,11 +7,11 @@
<el-input v-model="CORP_NAME" placeholder="搜索企业名字" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="重点工程名称">
<el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
</el-form-item>
</el-col>
<!-- <el-col :span="5">-->
<!-- <el-form-item label="重点工程名称">-->
<!-- <el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -51,17 +51,22 @@
</span>
</template>
</el-table-column>
<el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
<el-table-column prop="INDUSTRYALL" label="所属行业" show-overflow-tooltip >
<template slot-scope="{row}">
<span v-if="row.CORPINFO_ID !='1'">
{{ row.INDUSTRY_NAME }}
{{ row.INDUSTRYALL }}
</span>
<span v-else>
交通运输、仓储和邮政业
</span>
</template>
</el-table-column>
<el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
<el-table-column prop="OUTSOURCED_COUNT" label="重点工程创建数量" />
<el-table-column v-if="otherShow" prop="CHECK_COUNT" label="检查次数" />
<el-table-column v-if="otherShow" prop="HIDDEN_COUNT" label="发现隐患数量" />
<el-table-column v-if="otherShow" prop="PUNISH_COUNT" label="违约处罚次数" />
<el-table-column v-if="otherShow" prop="AMOUT_SUM" label="违约处罚金额(元)" />
<el-table-column v-if="otherShow" prop="VIDEO_COUNT" label="包含视频监控数" />
<el-table-column label="操作" align="center" width="100">
<template slot-scope="{row}">
<el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button>
@ -87,6 +92,10 @@ export default {
activeName: {
type: String,
default: ''
},
otherShow: {
type: Boolean,
default: false
}
},

8
src/views/corpInfo/corpinfodept/components/indexList.vue
View File

@ -62,10 +62,10 @@
<!-- <span v-if="row.villageName"> &#45;&#45; {{ row.villageName }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="INDUSTRY" label="所属行业">
<template slot-scope="{row}">
{{ translate(industryList,row.INDUSTRY) }}
</template>
<el-table-column prop="INDUSTRYALL" label="所属行业">
<!-- <template slot-scope="{row}">-->
<!-- {{ translate(industryList,row.INDUSTRY) }}-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="changCount" label="厂级部门数" />
<el-table-column prop="keCount" label="科/队部门数" />

8
src/views/corpInfo/corpinfouser/components/indexList.vue
View File

@ -48,10 +48,10 @@
<span v-if="row.villageName"> -- {{ row.villageName }}</span>
</template>
</el-table-column>
<el-table-column prop="INDUSTRY" label="所属行业">
<template slot-scope="{row}">
{{ translate(industryList,row.INDUSTRY) }}
</template>
<el-table-column prop="INDUSTRYALL" label="所属行业">
<!-- <template slot-scope="{row}">-->
<!-- {{ translate(industryList,row.INDUSTRY) }}-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="count" label="人数"/>
<el-table-column prop="CORP_STATE" label="分公司状态">

16
src/views/corpInfo/retrieval/components/indexList.vue
View File

@ -7,13 +7,13 @@
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属行业">
<el-select v-model="KEYQYLX" clearable placeholder="请选择类型" style="width: 100%;" >
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <el-form-item label="所属行业">-->
<!-- <el-select v-model="KEYQYLX" clearable placeholder="请选择类型" style="width: 100%;" >-->
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="4">
<el-form-item label="隶属关系">
<el-select v-model="KEYLS" clearable placeholder="请选隶属关系" style="width: 100%;" @click.native="getDicForClick('lsgxList','1a13f574d4c44cd2ac2034f8e3259f9b')" >
@ -496,7 +496,7 @@
<span v-if="row.villageName"> -- {{ row.villageName }}</span>
</template>
</el-table-column>
<el-table-column prop="INDUSTRY_NAME" label="所属行业" />
<el-table-column prop="INDUSTRYALL" label="所属行业" />
<el-table-column prop="corpStateName" label="分公司状态" />
<el-table-column label="状态" >
<template slot-scope="{row}">

2
src/views/hidden/commonly/ignore/components/companyList.vue
View File

@ -58,7 +58,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="CORP_NAME" label="分公司名称"/>
<el-table-column prop="NAME" label="所属行业"/>
<el-table-column prop="INDUSTRYALL" label="所属行业"/>
<el-table-column label="属地">
<template slot-scope="{row}">
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}

2
src/views/hidden/major/corpmajornum/components/companyList.vue
View File

@ -55,7 +55,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="CORP_NAME" label="分公司名称"/>
<el-table-column prop="NAME" label="分公司行业类型"/>
<el-table-column prop="INDUSTRYALL" label="分公司行业类型"/>
<el-table-column label="属地">
<template slot-scope="{row}">
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}

9
src/views/keyprojects/aiwarning/components/list.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<el-page-header content="AI报警" @back="back"/>
<div class="level-title mt-20"/>
<el-form label-width="100px">
<el-row>
<el-col :span="5">
@ -231,6 +233,10 @@ export default {
AIWARNING_PEOPLE: '' // 报警处置人
}
},
back() {
this.$parent.CORPINFO_ID = ''
this.$parent.activeName = 'OutSourced'
},
// 搜索
getQuery() {
this.$refs.multipleTable.clearSelection()
@ -257,7 +263,8 @@ export default {
requestFN(
'/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS
KEYWORDS: this.KEYWORDS,
CORPINFO_ID: this.$parent.CORPINFO_ID
}
).then((data) => {
this.listLoading = false

10
src/views/keyprojects/aiwarning/index.vue
View File

@ -1,6 +1,10 @@
<template>
<div>
<component :is="activeName"/>
<OutSourced v-if="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
<List v-if="activeName=='List'" />
<Info v-if="activeName=='Info'" />
<recordList v-if="activeName=='recordList'"/>
<!-- <component :is="activeName"/>-->
</div>
</template>
@ -8,16 +12,18 @@
import List from './components/list'
import Info from './components/info'
import recordList from './components/record-list'
import OutSourced from '@/components/OutSourced/index'
export default {
components: {
List: List,
OutSourced: OutSourced,
Info: Info,
recordList: recordList
},
data() {
return {
activeName: 'List',
activeName: 'OutSourced',
OUTSOURCED_ID: '',
AIWARNING_ID: ''
}

2
src/views/keyprojects/outsourced/components/list.vue
View File

@ -154,7 +154,7 @@
</el-table>
<div class="page-btn-group">
<div>
<el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button v-show="add && $parent.CORPINFO_ID == '1'" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<!--<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>-->
<!-- <el-button type="primary" plain @click="erweiCode">重点项目登录页</el-button>-->
</div>

9
src/views/keyprojects/videomanager/components/list.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<el-page-header content="查看详情" @back="goBack"/>
<div class="level-title mt-20"/>
<el-form label-width="100px">
<el-row>
<el-col :span="5">
@ -102,6 +104,10 @@ export default {
getRowKey(row) {
return row.OUTSOURCED_ID
},
goBack() {
this.$parent.activeName = 'OutSourced'
this.$parent.OUTSOURCED_ID = ''
},
// 搜索
getQuery() {
this.$refs.multipleTable.clearSelection()
@ -117,7 +123,8 @@ export default {
requestFN(
'/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
KEYWORDS: this.KEYWORDS
KEYWORDS: this.KEYWORDS,
CORPINFO_ID: this.$parent.CORPINFO_ID
}
).then((data) => {
this.listLoading = false

10
src/views/keyprojects/videomanager/index.vue
View File

@ -1,21 +1,27 @@
<template>
<div>
<component :is="activeName"/>
<OutSourced v-if="activeName=='OutSourced'" ref="outSourced" :other-show="true" active-name="List"/>
<List v-if="activeName=='List'" ref="list" />
<videoList v-if="activeName=='videoList'" />
<!-- <component :is="activeName"/>-->
</div>
</template>
<script>
import OutSourced from '@/components/OutSourced/index'
import List from './components/list'
import videoList from './components/video-list'
export default {
components: {
List: List,
OutSourced: OutSourced,
videoList: videoList
},
data() {
return {
activeName: 'List',
activeName: 'OutSourced',
UNITS_ID: '',
OUTSOURCED_ID: ''
}

2
src/views/map/bubble/index.vue
View File

@ -35,7 +35,7 @@
<div class="data-li">
<div class="data-label textColor">所属行业：</div>
<div class="data-value">
<span class="label-num textColor line-3">{{ pd.INDUSTRY_NAME }}</span>
<span class="label-num textColor line-3">{{ pd.INDUSTRY_ALL }}</span>
</div>
</div>
<div class="data-li">

18
src/views/risk/corpinfo/components/corpInfo.vue
View File

@ -6,14 +6,13 @@
<el-form-item label="企业名称">
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属行业">
<el-select v-model="CORP_OF_TYPE2" placeholder="类型" clearable style="width: 100%">
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>
</el-select>
</el-form-item>
</el-col>
</el-col><!-- <el-col :span="4">-->
<!-- <el-form-item label="所属行业">-->
<!-- <el-select v-model="CORP_OF_TYPE2" placeholder="类型" clearable style="width: 100%">-->
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- <el-form-item label="属地">-->
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@ -58,7 +57,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CORP_NAME" label="企业名称" />
<el-table-column prop="TYPE_NAME" label="企业类型" />
<el-table-column prop="INDUSTRYALL" label="行业类型" />
<el-table-column label="属地" >
<template slot-scope="{row}">
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}
@ -120,7 +119,6 @@ export default {
countryList: [],
industryList: [],
COUNTRY: '',
panelData: '',
villageList: [],
VILLAGE: '',
varList: [],

16
src/views/risk/four/components/corpInfo.vue
View File

@ -7,13 +7,13 @@
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属行业">
<el-select v-model="CORP_OF_TYPE" style="width: 100%;">
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <el-form-item label="所属行业">-->
<!-- <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- <el-form-item label="属地">-->
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@ -55,7 +55,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CORP_NAME" label="企业名称" />
<el-table-column prop="TYPE_NAME" label="所属行业" />
<el-table-column prop="INDUSTRYALL" label="所属行业" />
<el-table-column label="属地" >
<template slot-scope="{row}">
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}

16
src/views/risk/notificationcard/components/corpInfo.vue
View File

@ -7,13 +7,13 @@
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属行业">
<el-select v-model="CORP_OF_TYPE" style="width: 100%;">
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="4">-->
<!-- <el-form-item label="所属行业">-->
<!-- <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="4">-->
<!-- <el-form-item label="属地">-->
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@ -55,7 +55,7 @@
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CORP_NAME" label="企业名称" />
<el-table-column prop="TYPE_NAME" label="所属行业" />
<el-table-column prop="INDUSTRYALL" label="所属行业" />
<el-table-column prop="gaoCount" label="告知卡数" />
<el-table-column label="属地" >
<template slot-scope="{row}">