Skip to content

S
sgaqgl-vue
Commit 33370ba4 authored by zhoumaotao's avatar zhoumaotao
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents a14cb3b7 6e135c84
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1048 additions and 556 deletions
src/router/index.js
View file @ 33370ba4
......@@ -808,7 +808,7 @@ export const constantRoutes = [
component:() => import( "@/views/train/onlinExamination/index"),
hidden:false,
meta:{
"title": "onlinExamination",
"title": "在线考试管理",
"icon": "",
"noCache": false,
"link": null,
......
src/views/threeViolations/correctTV/exposure.vue
View file @ 33370ba4
<template>
<div class="form-detail">
<el-form ref="form" label-width='80px' :model="form" >
<el-row class="tool-bar">
<!-- <AttachFileButton :params="{childPath:'BGLX'}" :app='vMain'></AttachFileButton> -->
<el-button size='mini' @click.native="readonly=false;$success('开启编辑')" type="primary">编辑</el-button>
<el-button size='mini' @click.native="save()" type="primary">保存</el-button>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row>
<br>
<el-form ref="form" label-width='80px' >
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="通报内容">
<el-input type="textarea" rows="5" >
<el-form-item label="纠正措施">
<el-input v-model='vMain.rowItem.jzcs' :readonly="readonly" type="textarea" rows="5" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="纠正结果">
<el-input type="textarea" rows="5" >
<el-input v-model='vMain.rowItem.jzjg' :readonly="readonly" type="textarea" rows="5" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="验证人">
<el-input >
</el-input>
<el-form-item label="验证人">
<personSelector :readonly="readonly" :label="vMain.rowItem.jzyzrName||vMain.rowItem.jzyzrid||'暂无'" @selected='yzrSelected' ></personSelector>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="验证时间">
<el-date-picker></el-date-picker>
<el-date-picker style='width:100%' v-model='vMain.rowItem.jzyzsj' :readonly="readonly" ></el-date-picker>
</el-form-item>
</el-col>
......@@ -36,25 +46,45 @@
export default {
data() {
return {
readonly:true,
}
},
props:['vMain'],
methods: {
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
}
yzrSelected(row){
this.vMain.rowItem.id=row.id
},
save(){
let params=this.vMain.rowItem
this.vMain.apiUpdate(params).then(res => {
if (res.success) {
this.$success('更新成功')
this.readonly=true
this.vMain.$refs['TablePager'].reLoad()
let tableData=this.vMain.$refs['TablePager'].tableData
let nowIndex=false
tableData.forEach((data,index)=>{
if(data.id==params.master.id){
nowIndex=index
}
})
if(nowIndex!==false){
this.vMain.$refs['TablePager'].tableData.splice(nowIndex,1,params.master)
this.vMain.$refs['TablePager'].setCurrent(params.master)
}
} else {
this.$error(res.message || '更新失败')
}
})
}
}
}
</script>
<style scoped>
.form-detail{
height: 300px;
height: 500px;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
......
src/views/threeViolations/correctTV/index.vue
View file @ 33370ba4
......@@ -26,10 +26,9 @@
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app'></AttachFileButton>
<EditButton ref="edit" :app='app'></EditButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -47,7 +46,7 @@
</div>
<div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs -->
<Exposure />
<Exposure :vMain='this' />
</div>
</div>
......@@ -55,14 +54,12 @@
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
import {
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/threeViolations/enterTV.js';
/* edit页面*/
import Edit from './edit'
import Exposure from './exposure.vue'
......@@ -76,8 +73,7 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
console.log(_)
this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
},
data() {
return {
......@@ -88,7 +84,7 @@
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/
queryParams: {
ksrq: '',
......@@ -96,87 +92,41 @@
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '时间',
show:false,
fieldType:'ftDateTime',
width: '100',
align:'left'
},
{
prop: 'whsj',
label: '车间',
...this.$common('ftDateTime')
},
{
prop: 'whr',
label: '岗位',
width: '100'
},
{
prop: 'whr',
label: '地点',
width: '100'
},
{
prop: 'whr',
label: '作业活动设施风险点',
width: '100'
},
{
prop: 'whr',
label: '事故类型',
width: '100'
},
{
prop: 'whr',
label: '危险等级',
width: '100'
},
{
prop: 'whr',
label: '危险分值',
width: '100'
},
{
prop: 'whr',
label: '风险类型',
width: '100'
},
{
prop: 'whr',
label: '管控措施落实后等级',
width: '100'
},
{
prop: 'whr',
label: '管理层级',
width: '100'
},
{
prop: 'whr',
label: '拍照选项',
width: '100'
},
{
prop: 'whr',
label: '序号',
width: '100'
},
{
prop: 'whr',
label: '图形编号',
width: '100'
},
{
prop: 'whr',
label: '措施类型',
width: '100'
}
]
{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
{label: "手机", prop: "phone", fieldType: "ftString",width:192},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
// {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
// {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
// {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
// {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
// {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
// {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
// {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
// {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
// {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
// {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
// {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
// {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
// {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
// {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
// {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
// {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
// {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
// {label: "处罚金额", prop: "cfje", fieldType: "float"},
]
}
},
methods: {
......@@ -184,38 +134,18 @@
console.log(val,'val')
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
},
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
},
......
src/views/threeViolations/enterTV/index.vue
View file @ 33370ba4
......@@ -59,7 +59,7 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
},
data() {
return {
......
src/views/threeViolations/punishmentRecord/index.vue
View file @ 33370ba4
......@@ -19,8 +19,8 @@
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">所在支部:</span>
<el-input></el-input>
<span class="search-span">所在部门:</span>
<RelSelect hasValue style="width: 100%;" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
......@@ -45,10 +45,10 @@
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<EditButton ref="edit" :app='app'></EditButton> -->
<!-- <AttachFileButton :app='app' ></AttachFileButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -69,13 +69,11 @@
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/threeViolations/enterTV.js';
/* edit页面*/
import Edit from './edit'
import {
......@@ -83,7 +81,6 @@
} from 'common'
export default {
mixins: [tableMixin],
name: 'appVersion',
/* 初始额外赋值*/
async mounted() {
......@@ -98,62 +95,61 @@
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
jsrq: '',
bmid:''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '人员工号',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '姓名',
...this.$common('ftDateTime')
},
{
prop: 'whr',
label: '所在支部',
width: '100'
},
{
prop: 'whr',
label: '所在班组',
width: '100'
},
{
prop: 'whr',
label: '联系手机',
width: '100'
},
{
prop: 'whr',
label: '违章日期',
width: '100'
},
{
prop: 'whr',
label: '违章行为',
width: '100'
}
{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
{label: "手机", prop: "phone", fieldType: "ftString",width:192},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
// {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
// {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
// {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
// {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
// {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
// {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
// {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
// {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
// {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
// {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
// {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
// {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
// {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
// {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
// {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
// {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
// {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
// {label: "处罚金额", prop: "cfje", fieldType: "float"},
]
}
},
methods: {
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
/* 基础查询*/
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
......
src/views/threeViolations/queryRecords/index.vue
View file @ 33370ba4
......@@ -19,8 +19,8 @@
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">所在支部:</span>
<el-input></el-input>
<span class="search-span">所在部门:</span>
<RelSelect hasValue :optionsData='optionsData' style="width: 100%;" src='/kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
......@@ -67,15 +67,14 @@
</template>
<script>
/* 引入需要的接口*/
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/threeViolations/enterTV.js';
/* edit页面*/
import Edit from './edit'
import {
......@@ -98,92 +97,68 @@
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/swgl/swjl',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
jsrq: '',
bmid:''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '人员工号',
...this.$common('ftDateTime')
},
{
prop: 'whsj',
label: '姓名',
...this.$common('ftDateTime')
},
{
prop: 'whr',
label: '所在支部',
width: '100'
},
{
prop: 'whr',
label: '所在班组',
width: '100'
},
{
prop: 'whr',
label: '联系手机',
width: '100'
},
{
prop: 'whr',
label: '违章日期',
width: '100'
},
{
prop: 'whr',
label: '违章行为',
width: '100'
},
{
prop: 'whr',
label: '处罚金额',
width: '100'
}
]
{label: "部门", prop: "bmName", fieldType: "ftString",width:192},
// {label: "班组", prop: "bzName", fieldType: "ftString",width:192},
// {label: "违规人ID", prop: "userid", fieldType: "ftString",width:192},
{label: "违章人", prop: "wzr", fieldType: "ftString",width:192},
{label: "手机", prop: "phone", fieldType: "ftString",width:192},
{label: "违章日期", prop: "wzrq", fieldType: "ftDateTime"},
{label: "违章行为", prop: "wzxw", fieldType: "ftString",width:300},
// {label: "备注", prop: "bz", fieldType: "ftString",width:300},
// {label: "维护人", prop: "whr", fieldType: "ftString"},
// {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
// {label: "创建人", prop: "cjr", fieldType: "ftString"},
// {label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "工作流状态", prop: "wfpname", fieldType: "ftString",width:300},
// {label: "状态", prop: "zt", fieldType: "ftString",width:6},
// {label: "曝光内容", prop: "bgcont", fieldType: "ftString",width:300},
// {label: "安全教育人", prop: "aqjyrid", fieldType: "ftString",width:192},
// {label: "安全教育时间", prop: "aqjysj", fieldType: "ftDateTime"},
// {label: "安全教育内容", prop: "aqcont", fieldType: "ftString",width:300},
// {label: "反思内容", prop: "fscont", fieldType: "ftString",width:300},
// {label: "谈话层级", prop: "ldglcj", fieldType: "ftString",width:60},
// {label: "教育人编码", prop: "ldjyrid", fieldType: "ftString",width:192},
// {label: "被教育人编码", prop: "ldbjyrid", fieldType: "ftString",width:192},
// {label: "领导教育时间", prop: "ldjysj", fieldType: "ftDateTime"},
// {label: "领导教育内容", prop: "ldcont", fieldType: "ftString",width:300},
// {label: "家属教育人", prop: "jsjyr", fieldType: "ftString",width:180},
// {label: "家属教育时间", prop: "jsjysj", fieldType: "ftDateTime"},
// {label: "家属教育内容", prop: "jscont", fieldType: "ftString",width:300},
// {label: "纠正措施", prop: "jzcs", fieldType: "ftString",width:300},
// {label: "纠正结果", prop: "jzjg", fieldType: "ftString",width:300},
// {label: "纠正验证人编码", prop: "jzyzrid", fieldType: "ftString",width:192},
// {label: "纠正验证时间", prop: "jzyzsj", fieldType: "ftDateTime"},
// {label: "处罚标志", prop: "cfbz", fieldType: "ftString",width:60},
// {label: "处罚金额", prop: "cfje", fieldType: "float"},
]
}
},
methods: {
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
},
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment