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

Merge branch 'dev'

pull/2/head
dearlin 2023-11-15 17:29:36 +08:00
parent fc6f97c03e 3882a8343a
commit c6de0d3dde
21 changed files with 325 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/components/OutSourced/index.vue Normal file
View File

@ -0,0 +1,150 @@
<template>
<div class="app-container">
<el-form label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="企业名字">
<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="6">
<el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
重置
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table
v-loading="listLoading"
ref="multipleTable"
:data="varList"
:row-key="getRowKey"
:header-cell-style="{
'font-weight': 'bold',
'color': '#000'
}"
tooltip-effect="dark"
border
fit
highlight-current-row
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
<el-table-column prop="STARTTIME" label="属地" show-overflow-tooltip>
<template slot-scope="{row}"/>
<template slot-scope="{row}">
<span v-if="row.CORPINFO_ID !='1'">
{{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
</span>
<span v-else>
河北省 -- 秦皇岛市 -- 海港区
</span>
</template>
</el-table-column>
<el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
<template slot-scope="{row}">
<span v-if="row.CORPINFO_ID !='1'">
{{ row.INDUSTRY_NAME }}
</span>
<span v-else>
交通运输、仓储和邮政业
</span>
</template>
</el-table-column>
<el-table-column prop="OUTSOURCED_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>
</template>
</el-table-column>
</el-table>
<div class="page-btn-group">
<div/>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
</div>
</template>
<script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
import { requestFN } from '@/utils/request'
import waves from '@/directive/waves' // waves directive
export default {
name: 'IndexVue',
components: { Pagination },
directives: { waves },
props: {
activeName: {
type: String,
default: ''
}
},
data() {
return {
listLoading: true,
listQuery: {
page: 1,
limit: 20
},
total: 0,
OUTSOURCED_NAME: '',
CORP_NAME: '',
varList: []
}
},
created() {
this.getList()
},
methods: {
getRowKey(row) {
return row.CORPINFO_ID
},
// 搜索
getQuery() {
this.getList()
},
goKeyReset() {
this.CORP_NAME = ''
this.OUTSOURCED_NAME = ''
this.getQuery()
},
// 获取列表
getList() {
this.listLoading = true
requestFN(
'api/outsourced/listByCorp?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
CORP_NAME: this.CORP_NAME,
OUTSOURCED_NAME: this.OUTSOURCED_NAME
}
).then((data) => {
this.listLoading = false
this.varList = data.varList
this.total = data.page.totalResult
}).catch((e) => {
this.listLoading = false
})
},
// 查看
goDetail(ID) {
this.$parent.CORPINFO_ID = ID
this.$parent.activeName = this.activeName
}
}
}
</script>
<style scoped>
</style>

4
src/views/BI/index.vue
View File

@ -1056,8 +1056,8 @@ export default {
labelLine: { labelLine: {
normal: { normal: {
show: true, show: true,
length: 15, length: 10,
length2: 15 length2: 10
} }
}, },
label: { label: {

58
src/views/corpInfo/info/components/indexAdd.vue
View File

@ -271,7 +271,7 @@ export default {
CORP_NAME: [{ required: true, message: '分公司名称不能为空', trigger: 'blur' }], CORP_NAME: [{ required: true, message: '分公司名称不能为空', trigger: 'blur' }],
shudi: [{ required: true, message: '属地不能为空', trigger: 'blur' }], shudi: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
// POSTAL_CODE: [{ required: true, message: '邮政编码不能为空', trigger: 'blur' }], // POSTAL_CODE: [{ required: true, message: '邮政编码不能为空', trigger: 'blur' }],
CODE: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }], CODE: [{ required: false, message: '统一社会信用代码不能为空', trigger: 'blur' }],
INDUSTRY: [{ required: true, message: '所属行业不能为空', trigger: 'blur' }], INDUSTRY: [{ required: true, message: '所属行业不能为空', trigger: 'blur' }],
ECO_TYPE: [{ required: true, message: '经济类型不能为空', trigger: 'blur' }], ECO_TYPE: [{ required: true, message: '经济类型不能为空', trigger: 'blur' }],
// ADDRESS_BUSINESS: [{ required: true, message: '企事业单位经营地址不能为空', trigger: 'blur' }], // ADDRESS_BUSINESS: [{ required: true, message: '企事业单位经营地址不能为空', trigger: 'blur' }],
@ -509,31 +509,37 @@ export default {
}, },
// 保存 // 保存
confirm() { confirm() {
this.$refs.form.validate(valid => { this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', {
if (valid) { confirmButtonText: '确定',
if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) { cancelButtonText: '取消',
this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || '' type: 'warning'
this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || '' }).then(() => {
this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || '' this.$refs.form.validate(valid => {
this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || '' if (valid) {
} if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
requestFN( this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add', this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
{ this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
...this.form, this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
PROVINCE: this.form.shudi[0],
CITY: this.form.shudi[1],
COUNTRY: this.form.shudi[2],
ISDELETE: Number(this.form.ISDELETE)
} }
).then((data) => { requestFN(
this.uploadImg() this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
this.$message.success('新建成功') {
this.goBack() ...this.form,
}).catch((e) => { }) PROVINCE: this.form.shudi[0],
} else { CITY: this.form.shudi[1],
return false COUNTRY: this.form.shudi[2],
} ISDELETE: Number(this.form.ISDELETE)
}
).then((data) => {
this.uploadImg()
this.$message.success('新建成功')
this.goBack()
}).catch((e) => { })
} else {
return false
}
})
}) })
}, },
@ -607,7 +613,7 @@ export default {
} }
this.form.jinweidu = data.pd.LONGITUDE + ' , ' + data.pd.LATITUDE this.form.jinweidu = data.pd.LONGITUDE + ' , ' + data.pd.LATITUDE
this.form.shudi = [data.pd.PROVINCE, data.pd.CITY, data.pd.COUNTRY] this.form.shudi = [data.pd.PROVINCE, data.pd.CITY, data.pd.COUNTRY]
this.shudiPlaceholder = data.pd.PROVINCE_VAL + "-" + data.pd.CITY_VAL + "-" + data.pd.COUNTRY_VAL this.shudiPlaceholder = data.pd.PROVINCE_VAL + '-' + data.pd.CITY_VAL + '-' + data.pd.COUNTRY_VAL
this.hImgs = data.hImgs this.hImgs = data.hImgs
this.$forceUpdate() this.$forceUpdate()
this.listLoading = false this.listLoading = false

35
src/views/keyprojects/hidden/components/list.vue
View File

@ -1,44 +1,48 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-page-header content="隐患管理" @back="back"/>
<div class="level-title mt-20"/>
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="重点工程名称"> <el-form-item label="重点工程名称">
<el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" /> <el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="隐患来源"> <el-form-item label="隐患来源">
<el-select ref="SOURCE" v-model="SOURCE" style="width: 100%;"> <el-select ref="SOURCE" v-model="SOURCE" style="width: 100%;">
<el-option v-for="item in SOURCEList" :key="item.ID" :label="item.NAME" :value="item.ID" /> <el-option v-for="item in SOURCEList" :key="item.ID" :label="item.NAME" :value="item.ID" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="隐患发现人"> <el-form-item label="隐患发现人">
<el-input v-model="CREATOR_NAME" placeholder="搜索隐患发现人" /> <el-input v-model="CREATOR_NAME" placeholder="搜索隐患发现人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="隐患整改人"> <el-form-item label="隐患整改人">
<el-input v-model="RECTIFICATIONOR_NAME" placeholder="搜索隐患整改人" /> <el-input v-model="RECTIFICATIONOR_NAME" placeholder="搜索隐患整改人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> </el-row>
<el-row>
<el-col :span="6">
<el-form-item label="隐患状态"> <el-form-item label="隐患状态">
<el-select ref="STATE" v-model="STATE" style="width: 100%;"> <el-select ref="STATE" v-model="STATE" style="width: 100%;">
<el-option v-for="item in zList" :key="item.ID" :label="item.NAME" :value="item.ID" /> <el-option v-for="item in zList" :key="item.ID" :label="item.NAME" :value="item.ID" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label="是否处罚"> <el-form-item label="是否处罚">
<el-select ref="ISPUNISH" v-model="ISPUNISH" style="width: 100%;"> <el-select ref="ISPUNISH" v-model="ISPUNISH" style="width: 100%;">
<el-option v-for="item in stateList" :key="item.ID" :label="item.NAME" :value="item.ID" /> <el-option v-for="item in stateList" :key="item.ID" :label="item.NAME" :value="item.ID" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="6">
<el-form-item label-width="10px"> <el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery"> <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索 搜索
@ -47,7 +51,8 @@
重置 重置
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col></el-row> </el-col>
</el-row>
</el-form> </el-form>
<el-table <el-table
v-loading="listLoading" v-loading="listLoading"
@ -97,7 +102,7 @@
</el-table-column> </el-table-column>
<el-table-column label="是否处罚"> <el-table-column label="是否处罚">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.ISPUNISH && (row.ISPUNISH === "1" ? "是" : "否") }} {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
@ -141,11 +146,11 @@ export default {
// { ID: '1', NAME: '申请中' }, // { ID: '1', NAME: '申请中' },
// { ID: '2', NAME: '已完成' } // { ID: '2', NAME: '已完成' }
{ ID: '1', NAME: '是' }, { ID: '1', NAME: '是' },
{ ID: '2', NAME: '否' } { ID: '2', NAME: '否' },
{ ID: '3', NAME: '处罚人未处理' }
], ],
sourceState: { sourceState: {
1: 'AI报警', 1: 'AI报警',
2: 'AI报警(企业端)',
4: '安全环保检查(监管端)', 4: '安全环保检查(监管端)',
5: '安全环保检查(企业端)' 5: '安全环保检查(企业端)'
}, },
@ -155,8 +160,7 @@ export default {
4: '已验收' 4: '已验收'
}, },
SOURCEList: [ SOURCEList: [
{ ID: '1', NAME: 'AI报警(监管端)' }, { ID: '1', NAME: 'AI报警' },
{ ID: '2', NAME: 'AI报警(企业端)' },
{ ID: '4', NAME: '安全环保检查(监管端)' }, { ID: '4', NAME: '安全环保检查(监管端)' },
{ ID: '5', NAME: '安全环保检查(企业端)' } { ID: '5', NAME: '安全环保检查(企业端)' }
], ],
@ -174,6 +178,10 @@ export default {
getRowKey(row) { getRowKey(row) {
return row.OUTSOURCED_ID return row.OUTSOURCED_ID
}, },
back() {
this.$parent.CORPINFO_ID = ''
this.$parent.activeName = 'OutSourced'
},
// 搜索 // 搜索
getQuery() { getQuery() {
this.$refs.multipleTable.clearSelection() this.$refs.multipleTable.clearSelection()
@ -200,6 +208,7 @@ export default {
OUTSOURCED_NAME: this.OUTSOURCED_NAME, OUTSOURCED_NAME: this.OUTSOURCED_NAME,
ISCHECK: this.ISCHECK, ISCHECK: this.ISCHECK,
ISPUNISH: this.ISPUNISH, ISPUNISH: this.ISPUNISH,
CORPINFO_ID: this.$parent.CORPINFO_ID,
RECTIFICATIONOR_NAME: this.RECTIFICATIONOR_NAME, RECTIFICATIONOR_NAME: this.RECTIFICATIONOR_NAME,
CREATOR_NAME: this.CREATOR_NAME, CREATOR_NAME: this.CREATOR_NAME,
STATE: this.STATE, STATE: this.STATE,

8
src/views/keyprojects/hidden/index.vue
View File

@ -1,21 +1,25 @@
<template> <template>
<div> <div>
<component :is="activeName"/> <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
<List v-if="activeName=='List'" />
<Info v-if="activeName=='Info'"/>
</div> </div>
</template> </template>
<script> <script>
import List from './components/list' import List from './components/list'
import Info from './components/info' import Info from './components/info'
import OutSourced from '@/components/OutSourced/index'
export default { export default {
components: { components: {
List: List, List: List,
OutSourced: OutSourced,
Info: Info Info: Info
}, },
data() { data() {
return { return {
activeName: 'List', activeName: 'OutSourced',
HIDDEN_ID: '' HIDDEN_ID: ''
} }
} }

13
src/views/keyprojects/inspection/components/list.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-page-header content="安全环保检查" @back="back"/>
<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">-->
@ -9,7 +11,7 @@
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="5"> <el-col :span="5">
<el-form-item label="重点工程名称"> <el-form-item label="重点工程名称">
<el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" /> <el-input v-model="KEYWORDS" placeholder="搜索重点工程名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
@ -73,7 +75,8 @@
<div/> <div/>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
</div></template> </div>
</template>
<script> <script>
import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
import { requestFN } from '@/utils/request' import { requestFN } from '@/utils/request'
@ -106,6 +109,10 @@ export default {
this.getList() this.getList()
}, },
methods: { methods: {
back() {
this.$parent.CORPINFO_ID = ''
this.$parent.activeName = 'OutSourced'
},
getRowKey(row) { getRowKey(row) {
return row.OUTSOURCED_ID return row.OUTSOURCED_ID
}, },
@ -127,7 +134,7 @@ export default {
'/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,
OUTSOURCED_NAME: this.OUTSOURCED_NAME, CORPINFO_ID: this.$parent.CORPINFO_ID,
STATE: this.STATE STATE: this.STATE
} }
).then((data) => { ).then((data) => {

16
src/views/keyprojects/inspection/index.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div> <div>
<component :is="activeName"/> <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
<List v-if="activeName=='List'" ref="list" />
<Info v-if="activeName=='Info'" />
<recordList v-if="activeName=='recordList'" />
</div> </div>
</template> </template>
@ -8,19 +11,28 @@
import List from './components/list' import List from './components/list'
import Info from './components/info' import Info from './components/info'
import recordList from './components/record-list' import recordList from './components/record-list'
import OutSourced from '@/components/OutSourced/index'
export default { export default {
components: { components: {
List: List, List: List,
OutSourced: OutSourced,
Info: Info, Info: Info,
recordList: recordList recordList: recordList
}, },
data() { data() {
return { return {
activeName: 'List', activeName: 'OutSourced',
OUTSOURCED_ID: '', OUTSOURCED_ID: '',
KEYPROJECTCHECK_ID: '' KEYPROJECTCHECK_ID: ''
} }
},
watch: {
activeName(val) {
if (val == 'OutSourced') {
this.$refs.outSourced.getQuery()
}
}
} }
} }
</script> </script>

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

@ -1,5 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-page-header content="重点工程" @back="back"/>
<div class="level-title mt-20"/>
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -8,8 +10,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建单位"> <el-form-item label="集团单位">
<el-input v-model="CORP_NAME" placeholder="创建单位" style="width: 100%;" /> <el-select v-model="GROUP_UNIT" placeholder="请选择集团单位" style="width: 100%;">
<el-option v-for="item in groupCorpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -66,13 +70,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="集团单位">
<el-select v-model="GROUP_UNIT" placeholder="请选择集团单位" style="width: 100%;">
<el-option v-for="item in groupCorpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select ref="SELECT_STATE" v-model="STATE" style="width: 100%;"> <el-select ref="SELECT_STATE" v-model="STATE" style="width: 100%;">
@ -112,7 +110,6 @@
width="55" width="55"
align="center"/> align="center"/>
<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="创建单位" show-overflow-tooltip />
<el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip /> <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
<el-table-column prop="UNITS_NAME" label="施工相关方" width="250" show-overflow-tooltip /> <el-table-column prop="UNITS_NAME" label="施工相关方" width="250" show-overflow-tooltip />
<el-table-column label="辖区单位" show-overflow-tooltip > <el-table-column label="辖区单位" show-overflow-tooltip >
@ -133,7 +130,12 @@
<span v-else>{{ row.DEPARTMENT_NAME }}</span> <span v-else>{{ row.DEPARTMENT_NAME }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" show-overflow-tooltip /> <el-table-column label="监理单位" show-overflow-tooltip >
<template slot-scope="{row}">
<span v-if="row.MANAGE_CORPS_NAME"> {{ row.MANAGE_CORPS_NAME }} </span>
<span v-else>无</span>
</template>
</el-table-column>
<el-table-column prop="STATE" label="状态" width="100" > <el-table-column prop="STATE" label="状态" width="100" >
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.STATE == 1">进行中</span> <span v-if="row.STATE == 1">进行中</span>
@ -298,6 +300,7 @@ export default {
CONTRACT_STIME: this.CONTRACTTIME[0], CONTRACT_STIME: this.CONTRACTTIME[0],
CONTRACT_ETIME: this.CONTRACTTIME[1], CONTRACT_ETIME: this.CONTRACTTIME[1],
STATE: this.STATE, STATE: this.STATE,
CORPINFO_ID: this.$parent.CORPINFO_ID,
INVOLVING_CORP: this.INVOLVING_CORP, INVOLVING_CORP: this.INVOLVING_CORP,
DEPARTMENT_ID: this.DEPARTMENT_ID, DEPARTMENT_ID: this.DEPARTMENT_ID,
COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID, COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
@ -509,6 +512,10 @@ export default {
this.listLoading = false this.listLoading = false
}) })
}, },
back() {
this.$parent.CORPINFO_ID = ''
this.$parent.activeName = 'OutSourced'
},
// 获取数据字典数据 // 获取数据字典数据
getDict: function() { getDict: function() {
}, },

8
src/views/keyprojects/outsourced/index.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<div> <div>
<OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
<List v-show="activeName=='List'" ref="list" /> <List v-show="activeName=='List'" ref="list" />
<Edit v-if="activeName=='Edit'" /> <Edit v-if="activeName=='Edit'" />
<Info v-if="activeName=='Info'" /> <Info v-if="activeName=='Info'" />
@ -10,16 +11,18 @@
import List from './components/list' import List from './components/list'
import Edit from './components/edit' import Edit from './components/edit'
import Info from './components/info' import Info from './components/info'
import OutSourced from '@/components/OutSourced/index'
export default { export default {
components: { components: {
List: List, List: List,
Edit: Edit, Edit: Edit,
OutSourced: OutSourced,
Info: Info Info: Info
}, },
data() { data() {
return { return {
activeName: 'List' activeName: 'OutSourced'
} }
}, },
watch: { watch: {
@ -27,6 +30,9 @@ export default {
if (val == 'List') { if (val == 'List') {
this.$refs.list.getQuery() this.$refs.list.getQuery()
} }
if (val == 'OutSourced') {
this.$refs.outSourced.getQuery()
}
} }
} }
} }

8
src/views/keyprojects/personnelmanagement/index.vue
View File

@ -66,12 +66,12 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="JOBTYPE" label="作业类别" /> <!--<el-table-column prop="JOBTYPE" label="作业类别" />
<el-table-column prop="OPERATIONITEM" label="操作项目" /> <el-table-column prop="OPERATIONITEM" label="操作项目" />-->
<el-table-column prop="NAME" label="姓名" width="100" /> <el-table-column prop="NAME" label="姓名" width="100" />
<el-table-column prop="SEX" label="性别" width="50" /> <!--<el-table-column prop="SEX" label="性别" width="50" />
<el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" /> <el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" />
<el-table-column prop="REVIEWTIME" label="复审时间" width="120" /> <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />-->
<el-table-column label="操作" align="left" width="400"> <el-table-column label="操作" align="left" width="400">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button> <el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button>

2
src/views/keyprojects/punish/components/hiddenInfo.vue
View File

@ -200,7 +200,7 @@ export default {
this.$refs.hdVideoPlayer.player.pause() this.$refs.hdVideoPlayer.player.pause()
}, },
goBack() { goBack() {
this.$parent.activeName = 'List' this.$parent.activeName = 'List2'
this.$parent.HIDDEN_ID = '' this.$parent.HIDDEN_ID = ''
} }
} }

18
src/views/keyprojects/punish/components/list.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-page-header content="处罚管理" @back="back"/>
<div class="level-title mt-20"/>
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
@ -7,14 +9,6 @@
<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-form-item label="处罚状态">
<el-select v-model="HANDLED">
<el-option value="1" label="待反馈处罚"/>
<el-option value="2" label="已完成处罚"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label-width="10px"> <el-form-item label-width="10px">
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery"> <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@ -110,6 +104,10 @@ export default {
getRowKey(row) { getRowKey(row) {
return row.OUTSOURCED_ID return row.OUTSOURCED_ID
}, },
back() {
this.$parent.CORPINFO_ID = ''
this.$parent.activeName = 'OutSourced'
},
// 搜索 // 搜索
getQuery() { getQuery() {
this.$refs.multipleTable.clearSelection() this.$refs.multipleTable.clearSelection()
@ -143,7 +141,9 @@ 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

4
src/views/keyprojects/punish/components/list2.vue
View File

@ -10,8 +10,8 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="处罚状态"> <el-form-item label="处罚状态">
<el-select v-model="HANDLED"> <el-select v-model="HANDLED">
<el-option value="1" label="待反馈处罚"/> <el-option value="0" label="待反馈处罚"/>
<el-option value="2" label="已完成处罚"/> <el-option value="1" label="已完成处罚"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

5
src/views/keyprojects/punish/index.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<div> <div>
<OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
<List v-show="activeName=='List'" ref="list" /> <List v-show="activeName=='List'" ref="list" />
<List2 v-if="activeName=='List2'" /> <List2 v-if="activeName=='List2'" />
<Info v-if="activeName=='Info'" /> <Info v-if="activeName=='Info'" />
@ -12,17 +13,19 @@ import List from './components/list'
import Info from './components/info' import Info from './components/info'
import List2 from './components/list2' import List2 from './components/list2'
import HiddenInfo from './components/hiddenInfo.vue' import HiddenInfo from './components/hiddenInfo.vue'
import OutSourced from '@/components/OutSourced/index'
export default { export default {
components: { components: {
HiddenInfo: HiddenInfo, HiddenInfo: HiddenInfo,
OutSourced: OutSourced,
List: List, List: List,
Info: Info, Info: Info,
List2: List2 List2: List2
}, },
data() { data() {
return { return {
activeName: 'List', activeName: 'OutSourced',
KEYPROJECTPUNISH_ID: '', KEYPROJECTPUNISH_ID: '',
HIDDEN_ID: '' HIDDEN_ID: ''
} }

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

@ -48,7 +48,7 @@
align="center"/> align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip /> <el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip />
<el-table-column prop="CODE" label="统一社会信用代码" width="200" /> <!--<el-table-column prop="CODE" label="统一社会信用代码" width="200" />-->
<el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip /> <el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip />
<el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" /> <el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" />
<el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip /> <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />

4
src/views/keyprojects/videoinfomanager/components/list.vue
View File

@ -318,7 +318,7 @@ export default {
}, },
over() { over() {
// 定时器手动关闭 // 定时器手动关闭
console.log('定时器手动关闭') console.log('定时器自动关闭')
this.$message.warning('单次播放时长已到5分钟自动关闭') this.$message.warning('单次播放时长已到5分钟自动关闭')
clearInterval(this.timer) clearInterval(this.timer)
}, },
@ -363,6 +363,8 @@ export default {
} }
}, },
back() { back() {
console.log('手动关闭定时器')
clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) { if (this.dialogVideoAll) {

25
src/views/keyprojects/videomanager/components/bobileCamer.vue
View File

@ -100,6 +100,7 @@ export default {
dialogVideoBack: false, dialogVideoBack: false,
dialogVideoAll: false, dialogVideoAll: false,
VIDEOURL: '', VIDEOURL: '',
timer: '',
player: {}, player: {},
// //
config: config, config: config,
@ -125,6 +126,18 @@ export default {
}, },
methods: { methods: {
// 五分钟关闭视频播放页面定时任务
start() {
console.log('定时器开启')
this.timer = setInterval(this.over, (5 * 60 * 1000)) // 5分钟;
},
over() {
// 定时器手动关闭
console.log('定时器自动关闭')
this.$message.warning('单次播放时长已到5分钟自动关闭')
this.back()
clearInterval(this.timer)
},
async init(UNITS_ID) { async init(UNITS_ID) {
this.visible = true this.visible = true
this.UNITS_ID = UNITS_ID this.UNITS_ID = UNITS_ID
@ -172,6 +185,8 @@ export default {
} }
}, },
back() { back() {
console.log('定时器手动关闭')
clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) { if (this.dialogVideoAll) {
@ -187,6 +202,8 @@ export default {
} }
}, },
showVideo(row) { showVideo(row) {
this.$message.warning('单次播放最多五分钟')
this.start()
if (!row.PLATFORMVIDEOMANAGEMENT_ID) { if (!row.PLATFORMVIDEOMANAGEMENT_ID) {
this.VIDEOURL = row.VIDEOURL this.VIDEOURL = row.VIDEOURL
this.dialogVideo = true this.dialogVideo = true
@ -217,6 +234,7 @@ export default {
}) })
}) })
}).catch((e) => { }).catch((e) => {
this.over()
this.listLoading = false this.listLoading = false
}) })
} }
@ -264,8 +282,11 @@ export default {
closeWindow() { closeWindow() {
this.handleClose() this.handleClose()
} }
} },
beforeDestroy() {
console.log('页面定时器关闭')
clearInterval(this.timer)
},
} }
</script> </script>

4
src/views/keyprojects/videomanager/components/video-list.vue
View File

@ -249,7 +249,7 @@ export default {
}, },
over() { over() {
// 定时器手动关闭 // 定时器手动关闭
console.log('定时器手动关闭') console.log('定时器自动关闭')
clearInterval(this.timer) clearInterval(this.timer)
}, },
closeVideoStart() { closeVideoStart() {
@ -702,6 +702,8 @@ export default {
}) })
}, },
back() { back() {
console.log('手动关闭定时器')
clearInterval(this.timer)
if (this.dialogVideo) this.dialogVideo = false if (this.dialogVideo) this.dialogVideo = false
if (this.dialogVideoBack) this.dialogVideoBack = false if (this.dialogVideoBack) this.dialogVideoBack = false
if (this.dialogVideoAll) { if (this.dialogVideoAll) {

3
src/views/relevantunits/audit/components/corpInfoEdit.vue
View File

@ -29,6 +29,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="集团单位" prop="corpTypeName">
<el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
</el-form-item>
<el-form-item label="开户人" prop="CREATOR"> <el-form-item label="开户人" prop="CREATOR">
<el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/> <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
</el-form-item> </el-form-item>

5
src/views/relevantunits/audit/components/edit.vue
View File

@ -47,6 +47,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="集团单位" prop="corpTypeName">
<el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开户人" prop="CREATOR"> <el-form-item label="开户人" prop="CREATOR">
<el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/> <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>

28
src/views/system/group/user/index.vue
View File

@ -100,7 +100,7 @@
</div> </div>
</el-main> </el-main>
</el-container> </el-container>
<el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px"> <el-dialog v-loading="editloading" :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
<el-form ref="form" :rules="rules" :model="pd" label-width="110px" style="width: 500px;"> <el-form ref="form" :rules="rules" :model="pd" label-width="110px" style="width: 500px;">
<el-form-item label="角色" prop="ROLE_ID"> <el-form-item label="角色" prop="ROLE_ID">
<el-select v-model="pd.ROLE_ID" multiple placeholder="请选择角色"> <el-select v-model="pd.ROLE_ID" multiple placeholder="请选择角色">
@ -246,6 +246,7 @@ export default {
keyDepeName: '', keyDepeName: '',
keyJobLeven: '', keyJobLeven: '',
dialogFormEdit: false, dialogFormEdit: false,
editloading: false,
dialogType: 'add', dialogType: 'add',
rules: { rules: {
EMAIL: [ EMAIL: [
@ -357,6 +358,7 @@ export default {
})) }))
resolve(nodes) // 通过调用resolve将子节点数据返回，通知组件数据加载完成 resolve(nodes) // 通过调用resolve将子节点数据返回，通知组件数据加载完成
}).catch((e) => { }).catch((e) => {
this.editloading = false
this.listLoading = false this.listLoading = false
}) })
}, 500) }, 500)
@ -588,8 +590,6 @@ export default {
console.log(row) console.log(row)
this.dialogType = 'editUser' this.dialogType = 'editUser'
this.pd = JSON.parse(JSON.stringify(row)) this.pd = JSON.parse(JSON.stringify(row))
this.dialogFormEdit = true
await this.$nextTick()
const areaRefID = [] const areaRefID = []
if (this.pd.PROVINCE) { if (this.pd.PROVINCE) {
areaRefID.push(this.pd.PROVINCE) areaRefID.push(this.pd.PROVINCE)
@ -609,14 +609,6 @@ export default {
refDeptLevelVal.id = this.pd.deptLevenlID refDeptLevelVal.id = this.pd.deptLevenlID
const deptRefsValue = {} const deptRefsValue = {}
deptRefsValue.id = this.pd.DEPARTMENT_ID deptRefsValue.id = this.pd.DEPARTMENT_ID
// this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
// if (this.$refs.refFromDeptTypeID) {
// this.$refs.refFromDeptTypeID.handleNodeClick(refDeptLevelVal)
// }
// if (this.$refs.deptTree) {
// this.$refs.deptTree.handleNodeClick(deptRefsValue)
// }
// }
var arrString = [] var arrString = []
if (this.pd.ROLE_ID != null && this.pd.ROLE_ID != '') { if (this.pd.ROLE_ID != null && this.pd.ROLE_ID != '') {
arrString.push(this.pd.ROLE_ID) arrString.push(this.pd.ROLE_ID)
@ -631,17 +623,9 @@ export default {
} }
} }
this.pd.ROLE_ID = arrString this.pd.ROLE_ID = arrString
// var roleIds = [] this.dialogFormEdit = true
// if (this.pd.ROLE_ID) { await this.$nextTick()
// roleIds.push(this.pd.ROLE_ID)
// if (this.pd.ROLE_IDS) {
// var roleIDS = this.pd.ROLE_IDS.split(',')
// roleIDS.forEach((item) => {
// roleIds.push(item)
// })
// }
// }
// this.pd.ROLE_ID = roleIds
}, },
handleEditStatus(row, type) { handleEditStatus(row, type) {
const typeName = type == '1' ? '禁用' : '启用' const typeName = type == '1' ? '禁用' : '启用'