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

fix： 重点工程视频监控外层新加字段

pull/3/head
dearlin 2023-11-22 16:14:15 +08:00
parent 77afd2507a
commit 4270d8e78f
7 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,12 @@
</span> </span>
</template> </template>
</el-table-column> </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"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button> <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button>
@ -87,6 +92,10 @@ export default {
activeName: { activeName: {
type: String, type: String,
default: '' 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>--> <!-- <span v-if="row.villageName"> &#45;&#45; {{ row.villageName }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="INDUSTRY" label="所属行业"> <el-table-column prop="INDUSTRYALL" label="所属行业">
<template slot-scope="{row}"> <!-- <template slot-scope="{row}">-->
{{ translate(industryList,row.INDUSTRY) }} <!-- {{ translate(industryList,row.INDUSTRY) }}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column prop="changCount" label="厂级部门数" /> <el-table-column prop="changCount" label="厂级部门数" />
<el-table-column prop="keCount" 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> <span v-if="row.villageName"> -- {{ row.villageName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="INDUSTRY" label="所属行业"> <el-table-column prop="INDUSTRYALL" label="所属行业">
<template slot-scope="{row}"> <!-- <template slot-scope="{row}">-->
{{ translate(industryList,row.INDUSTRY) }} <!-- {{ translate(industryList,row.INDUSTRY) }}-->
</template> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column prop="count" label="人数"/> <el-table-column prop="count" label="人数"/>
<el-table-column prop="CORP_STATE" 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-input v-model="KEYWORDS" placeholder="企业名称"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <!-- <el-col :span="4">-->
<el-form-item label="所属行业"> <!-- <el-form-item label="所属行业">-->
<el-select v-model="KEYQYLX" clearable placeholder="请选择类型" style="width: 100%;" > <!-- <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-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隶属关系"> <el-form-item label="隶属关系">
<el-select v-model="KEYLS" clearable placeholder="请选隶属关系" style="width: 100%;" @click.native="getDicForClick('lsgxList','1a13f574d4c44cd2ac2034f8e3259f9b')" > <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> <span v-if="row.villageName"> -- {{ row.villageName }}</span>
</template> </template>
</el-table-column> </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 prop="corpStateName" label="分公司状态" />
<el-table-column label="状态" > <el-table-column label="状态" >
<template slot-scope="{row}"> <template slot-scope="{row}">

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

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

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

@ -1,21 +1,27 @@
<template> <template>
<div> <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> </div>
</template> </template>
<script> <script>
import OutSourced from '@/components/OutSourced/index'
import List from './components/list' import List from './components/list'
import videoList from './components/video-list' import videoList from './components/video-list'
export default { export default {
components: { components: {
List: List, List: List,
OutSourced: OutSourced,
videoList: videoList videoList: videoList
}, },
data() { data() {
return { return {
activeName: 'List', activeName: 'OutSourced',
UNITS_ID: '', UNITS_ID: '',
OUTSOURCED_ID: '' OUTSOURCED_ID: ''
} }

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

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