Skip to content

S
sgaqgl-vue
Commit 5e3b2c8c authored by 李苏's avatar 李苏 💬
Browse files
Options

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

parents 04a2dac8 0e3313ac
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 199 deletions
src/api/equipment/sbxx.js
View file @ 5e3b2c8c
......@@ -30,7 +30,14 @@ method: 'post',
data: query||{}
})
}
/* 启用、停用 */
export function setQt(query) {
return request({
url: '/aqgl/sbgl/sbxx/record/qt',
method: 'post',
data: query||{}
})
}
/* 使用状态查询 */
export function initUsed(query) {
......
src/views/riskPrecontrol/maintenanceRisk/index.vue
View file @ 5e3b2c8c
......@@ -9,13 +9,13 @@
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">开始日期:</span>
<el-date-picker v-model="queryParams.sgksrq"></el-date-picker>
<el-date-picker v-model="queryParams.ksrq"></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">结束日期:</span>
<el-date-picker v-model="queryParams.sgjsrq" ></el-date-picker>
<el-date-picker v-model="queryParams.jsrq" ></el-date-picker>
</div>
</el-col>
</el-row>
......@@ -24,11 +24,11 @@
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AttachFileButton :app='app'></AttachFileButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -78,8 +78,8 @@
baseUrl: '/aqgl/fxsj',
/* 查询参数*/
queryParams: {
sgksrq: new Date().getTime(),
sgjsrq: new Date().getTime()
ksrq: new Date().getTime(),
jsrq: new Date().getTime() + 1000*60*60*24*30
},
/* 表格标题对应参数*/
tableTitle: [
......
src/views/riskPrecontrol/queryRisk/index.vue
View file @ 5e3b2c8c
......@@ -9,13 +9,13 @@
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">开始日期:</span>
<el-date-picker v-model="queryParams.sgksrq"></el-date-picker>
<el-date-picker v-model="queryParams.ksrq"></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">结束日期:</span>
<el-date-picker v-model="queryParams.sgjsrq" ></el-date-picker>
<el-date-picker v-model="queryParams.jsrq" ></el-date-picker>
</div>
</el-col>
</el-row>
......@@ -77,17 +77,17 @@
baseUrl: '/aqgl/fxsj',
/* 查询参数*/
queryParams: {
sgksrq: new Date().getTime(),
sgjsrq: new Date().getTime()
ksrq: '',
jsrq: ''
},
/* 表格标题对应参数*/
tableTitle: [
{label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{
url:'/aqgl/fxyk/shlx/query',label:'name',value:'id'
}},
{label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{
url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id'
}},
}},
{label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{
url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id'
}},
{label: "死亡人数", prop: "swrs", fieldType: "int"},
{label: "重伤人数", prop: "zsrs", fieldType: "int"},
{label: "轻伤人数", prop: "qsrs", fieldType: "int"},
......@@ -95,11 +95,11 @@
{label: "损失工作日", prop: "gzrss", fieldType: "float"},
{label: "部门", prop: "bmid", fieldType: "ftString",width:192,transform:{
url:'/kzzx/bm/query',label:'bmmc',value:'id'
}},
}},
{label: "车间编码", prop: "cjid", fieldType: "ftString",width:192},
{label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{
url:'/kzzx/user/query',label:'username',value:'userid'
}},
}},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
......
src/views/riskPrecontrol/riskAnalysis/index.vue
View file @ 5e3b2c8c
<template>
<div class="min_full" style="height: 140vh;">
<div class="min_full" style="height: 40%;">
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">岗位:</span>
<el-input style="width:60% ;"></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">设备设施风险点:</span>
<el-input></el-input>
</div>
</el-col>
</el-row>
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
</div>
</div>
<div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" >
<template>
<div class="min_full" style="height: 140vh;">
<div class="min_full" style="height: 40%;">
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">岗位:</span>
<el-select v-model="queryParams.gwid" clearable placeholder="请选择">
<el-option
v-for="item in doQueryScgw"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">风险点:</span>
<el-input v-model="queryParams.fxd"></el-input>
</div>
</el-col>
</el-row>
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<!-- <ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app'></AttachFileButton> -->
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
</div>
</div>
<div class="min_full" style="height: 60%;padding: 10px;">
<!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane label="详细" name="first" >
<Details />
</el-tab-pane>
<Details />
</el-tab-pane>
<el-tab-pane label="检查周期" name="second">
<Cycle />
</el-tab-pane>
</el-tab-pane>
<el-tab-pane label="检查内容" name="third">
<Content />
</el-tab-pane>
</el-tab-pane>
<el-tab-pane label="责任人" name="fourth">
<PersonLiable />
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/
import Edit from './edit'
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
import {
doQueryScgw
} from "@/api/riskPrecontrol/screeningCriteria.js";
/* edit页面*/
import Edit from './edit'
import Details from './details.vue'
import Cycle from './cycle.vue'
import Content from './content.vue' import PersonLiable from './personLiable.vue'
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'appVersion',
/* 初始额外赋值*/
async mounted() {
import Content from './content.vue'
import PersonLiable from './personLiable.vue'
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'appVersion',
/* 初始额外赋值*/
async mounted() {
await this.$asRun(
[doQueryScgw(),
res => {
var data = res['data']['records'];
this.doQueryScgw = data
}
]
)
this.$refs['TablePager'].pageQuery()
console.log(_)
},
data() {
return {
activeName: 'first',
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
},
/* 表格标题对应参数*/
},
data() {
return {
doQueryScgw:[],
activeName: 'first',
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
/* 查询参数*/
queryParams: {
gwid: '',
fxd: ''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
{
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'
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',
......@@ -189,65 +208,65 @@
prop: 'whr',
label: '措施类型',
width: '100'
}
]
}
},
methods: {
}
]
}
},
methods: {
handleClick(val){
console.log(val,'val')
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
/* 初始化赋值操作*/
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 || '操作失败')
}
})
})
}
},
components: {
Edit,
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
/* 初始化赋值操作*/
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 || '操作失败')
}
})
})
}
},
components: {
Edit,
Details,
Cycle,
PersonLiable,
Content
}
}
</script>
<style scoped>
/deep/.el-tabs__item {
font-size: 13px;
color: #666;
}
Content
}
}
</script>
<style scoped>
/deep/.el-tabs__item {
font-size: 13px;
color: #666;
}
</style>
src/views/riskPrecontrol/shlx/edit.vue
View file @ 5e3b2c8c
......@@ -4,7 +4,7 @@
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="类型编码" ref="code" prop="code">
<el-form-item label="编码" ref="code" prop="code">
<el-input :readonly="readonly" v-model="form.code" ></el-input>
</el-form-item>
</el-col>
......
src/views/riskPrecontrol/shlx/index.vue
View file @ 5e3b2c8c
......@@ -74,7 +74,7 @@
},
/* 表格标题对应参数*/
tableTitle: [
{label: "类型编码", prop: "code", fieldType: "ftString",width:120},
{label: "编码", prop: "code", fieldType: "ftString",width:120},
{label: "名称", prop: "name", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
......
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