blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 20:39:48 +08:00
Code Issues Releases Wiki Activity

优化系统功能

Browse Source
This commit is contained in:
dengfuchuan 2021-04-11 14:31:05 +08:00
parent 78da30869b
commit 87c919d0e1
8 changed files with 192 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/Search/index.vue
View File

@ -9,7 +9,7 @@
:value="item.fun_col__col_code"
/>
</el-select>
<div v-if="control === 'text' || control === 'selectwin'">
<div v-if="control === 'text' || control === 'selectwin' || control === 'combowin'">
<el-input v-model="searchVal" clearable placeholder="请输入内容" @keyup.enter.native="search" />
</div>
<div v-else-if="control === 'date'" class="combo-select">
@ -58,6 +58,18 @@ export default {
funid: {
type: String,
default: ''
},
wsql: {
type: String,
default: ''
},
wvalue: {
type: String,
default: ''
},
wtype: {
type: String,
default: ''
}
},
data() {
@ -85,7 +97,10 @@ export default {
getFunCol() {
api.getFunCol(this.funid).then(data => {
if (data.success) {
this.fun = data.data.root
this.fun = data.data.root.filter(d => {
return d.fun_col__col_index !== '10000'
})
console.log(this.fun, 'this.fun')
this.funCode = this.fun[0].fun_col__col_code
this.where_sql = `${this.fun[0].fun_col__col_code}`
this.where_type = this.fun[0].fun_col__data_type
@ -122,7 +137,6 @@ export default {
api.getSelect(this.control_name).then(data => {
if (data.success) {
this.combo = data.data.root
console.log(this.combo, 'this.combo')
} else {
this.$message.error(data.message)
}
@ -133,14 +147,29 @@ export default {
let whereSql
if (this.searchVal) {
if (this.control === 'date') {
if (this.wsql) {
const where_sql = `(${this.wsql}=?) and ${this.where_sql} >= ?`
const whereValue = `${this.wvalue};${this.searchVal}`
const where_type = `${this.wtype};date`
whereSql = `where_sql=${where_sql}&where_value=${whereValue}&where_type=${where_type}`
} else {
const where_sql = `${this.where_sql} >= ?`
const whereValue = `${this.searchVal}`
const where_type = `date`
whereSql = `where_sql=${where_sql}&where_value=${whereValue}&where_type=${where_type}`
}
} else {
if (this.wsql) {
const Value = encodeURI(`\%${this.searchVal}\%`)
const where_sql = `(${this.wsql}=?) and ${Value} >= ?`
const whereValue = `${this.wvalue};${Value}`
const where_type = `${this.wtype};${this.where_type}`
whereSql = `where_sql=${where_sql}&where_value=${whereValue}&where_type=${where_type}`
} else {
whereValue = encodeURI(`\%${this.searchVal}\%`)
whereSql = `where_sql=${this.where_sql} like ?&where_value=${whereValue}&where_type=${this.where_type}`
}
}
} else {
whereSql = `where_sql=&where_value=&where_type=`
}

3
src/views/insp_name/index.vue
View File

@ -19,6 +19,7 @@
@selection-change="handleSelectionChange"
@cell-dblclick="cellDblclick"
>
<el-table-column type="index" fixed="left" width="35px" />
<template v-for="(d,i) in tableHeader">
<el-table-column v-if="d.type && d.type === 'selection'" :key="i" :type="d.type" :fixed="d.fixed" />
<el-table-column
@ -34,7 +35,7 @@
<template slot-scope="scope">
<div v-if="d.label === '操作'">
<el-button icon="el-icon-view" type="text" title="编辑" @click="edit(scope.row)" />
<el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
<!-- <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" /> -->
</div>
<div v-else>{{ scope.row[d.prop] }}</div>
</template>

8
src/views/safe_insp/components/create/index.vue
View File

@ -108,13 +108,13 @@
v-if="inspNameVisible"
title="选择巡检名称"
:visible.sync="inspNameVisible"
width="60%"
width="40%"
>
<InspName @updateInspName="updateInspName" />
<span>
<el-button @click="inspNameVisible = false">取 消</el-button>
<!-- <span>
<el-button type="primary" @click="inspNameVisible = false">取 消</el-button>
<el-button type="primary" @click="inspNameVisible = false">确 定</el-button>
</span>
</span> -->
</el-dialog>
</div>
</template>

8
src/views/safe_insp/components/edit_form/index.vue
View File

@ -108,13 +108,13 @@
v-if="inspNameVisible"
title="选择巡检名称"
:visible.sync="inspNameVisible"
width="60%"
width="40%"
>
<InspName @updateInspName="updateInspName" />
<span>
<!-- <div>
<el-button @click="inspNameVisible = false">取 消</el-button>
<el-button type="primary" @click="inspNameVisible = false">确 定</el-button>
</span>
<el-button type="primary" @click="inspNameVisible = false">取 消</el-button>
</div> -->
</el-dialog>
</div>
</template>

4
src/views/safe_insp/components/inspName/index.vue
View File

@ -8,6 +8,7 @@
style="width: 100%"
@cell-dblclick="cellDblclick"
>
<el-table-column type="index" width="35px" />
<template v-for="(d,i) in tableHeader">
<el-table-column v-if="d.type && d.type === 'selection'" :key="i" :type="d.type" :fixed="d.fixed" />
<el-table-column
@ -128,4 +129,7 @@ export default {
.el-card {
margin-top: 10px;
}
::v-deep .el-table .cell {
line-height: 33px;
}
</style>

4
src/views/safe_insp/components/insp_det/api/index.js
View File

@ -1,11 +1,11 @@
import request from '@/utils/request'
export default {
getDate(id, pageSize, pageNo, whereSql) {
getDate(id, pageSize, pageNo, isWhereSql, whereValue) {
return request({
url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=subeditgrid&query_funid=insp_det&user_id=administrator`,
method: 'post',
data: `start=${pageNo}&limit=${pageSize}&${whereSql}&is_query=1&query_type=0`
data: `start=${pageNo}&limit=${pageSize}&where_sql=insp_det.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
}).then(response => response.data)
},
getDeptTree() {

8
src/views/safe_insp/components/insp_det/index.vue
View File

@ -5,7 +5,7 @@
<div>
<buttons funid="insp_det" style="margin-bottom:10px" @Create="editCreate" @Del="editDelete" @upload="upload" />
</div>
<Search funid="insp_det" @search="search" />
<Search funid="insp_det" :wsql="where_sql" :wvalue="where_value" :wtype="where_type" @search="search" />
</div>
<el-table
ref="deptTable"
@ -15,6 +15,7 @@
@selection-change="handleSelectionChange"
@cell-dblclick="cellDblclick"
>
<el-table-column type="index" fixed="left" width="35px" />
<template v-for="(d,i) in tableHeader">
<el-table-column v-if="d.type && d.type === 'selection'" :key="i" :type="d.type" :fixed="d.fixed" />
<el-table-column
@ -193,8 +194,11 @@ export default {
label: 'sys_dept__dept_name'
},
treeList: [],
whereSql: false,
whereSql: '',
whereValue: '',
where_sql: 'insp_item.insp_name_id = ?',
where_value: this.$props.id,
where_type: 'string',
dialogUploadVisible: false
}
},

2
src/views/safe_insp/index.vue
View File

@ -43,7 +43,7 @@
</div>
<div v-else-if="d.label === '操作'">
<el-button icon="el-icon-view" type="text" size="mini" title="编辑" @click="edit(scope.row)" />
<el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" />
<!-- <el-button v-if="scope.row.status !== 'NULLIFY'" icon="el-icon-delete" style="color:#F56C6C" type="text" title="删除" @click="Delete(scope.row)" /> -->
</div>
<div v-else>{{ scope.row[d.prop] }}</div>
</template>