Merge branch 'master' of http://192.168.0.56:3000/haozq/ah_jjzhgd_webservice
This commit is contained in:
commit
735f73882d
|
|
@ -92,7 +92,7 @@ export function getBuildList(data) {
|
|||
// 工程完工
|
||||
export function completeProject(data) {
|
||||
return request({
|
||||
url: '/system/sys/pro/editProStatus',
|
||||
url: '/background/sys/pro/editProStatus',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@ export function getEmergencyCaseList(data) {
|
|||
// 新增应急预案
|
||||
export function addEmergencyCaseItem(data) {
|
||||
return request({
|
||||
headers: { // 修改请求头
|
||||
'decrypt': 'decrypt'
|
||||
},
|
||||
url: '/background/back/emerge/addYaFile',
|
||||
method: 'post',
|
||||
data
|
||||
|
|
@ -59,6 +62,9 @@ export function addEmergencyCaseItem(data) {
|
|||
// 编辑应急预案
|
||||
export function updateEmergencyCaseItem(data) {
|
||||
return request({
|
||||
headers: { // 修改请求头
|
||||
'decrypt': 'decrypt'
|
||||
},
|
||||
url: '/background/back/emerge/updateYaFile',
|
||||
method: 'post',
|
||||
data
|
||||
|
|
@ -78,6 +84,9 @@ export function deleteEmergencyCaseItem(data) {
|
|||
// 查询应急流程列表
|
||||
export function getEmergencyProcessList(data) {
|
||||
return request({
|
||||
headers: { // 修改请求头
|
||||
'decrypt': 'decrypt'
|
||||
},
|
||||
url: '/background/back/emerge/getLcList',
|
||||
method: 'get',
|
||||
params: data
|
||||
|
|
@ -87,6 +96,9 @@ export function getEmergencyProcessList(data) {
|
|||
// 新增应急流程
|
||||
export function addEmergencyProcessItem(data) {
|
||||
return request({
|
||||
headers: { // 修改请求头
|
||||
'decrypt': 'decrypt'
|
||||
},
|
||||
url: '/background/back/emerge/addLcFile',
|
||||
method: 'post',
|
||||
data
|
||||
|
|
@ -96,6 +108,9 @@ export function addEmergencyProcessItem(data) {
|
|||
// 编辑应急流程
|
||||
export function updateEmergencyProcessItem(data) {
|
||||
return request({
|
||||
headers: { // 修改请求头
|
||||
'decrypt': 'decrypt'
|
||||
},
|
||||
url: '/background/back/emerge/updateLcFile',
|
||||
method: 'post',
|
||||
data
|
||||
|
|
|
|||
|
|
@ -330,6 +330,7 @@
|
|||
v-model="completeForm.endTime"
|
||||
style="width: 100%"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -497,7 +498,7 @@ export default {
|
|||
this.list = response.rows
|
||||
this.total = response.total
|
||||
}).finally(() => {
|
||||
|
||||
|
||||
})
|
||||
setTimeout(()=>{
|
||||
this.listLoading = false
|
||||
|
|
@ -652,7 +653,7 @@ export default {
|
|||
this.getList()
|
||||
this.completeModalVisible = false
|
||||
}).finally(() => {
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<el-select v-model="orgId" placeholder="请选择组织机构" class="filter-item" style="width: 200px" >
|
||||
<el-option v-for="item in buildArr" :key="item.orgId" :label="item.name" :value="item.orgId"></el-option>
|
||||
</el-select>
|
||||
<el-select v-model="types" placeholder="是否分配" class="filter-item" style="width: 200px" >
|
||||
<el-select v-model="types" placeholder="是否分配" class="filter-item" style="width: 200px; display: none" >
|
||||
<el-option label="请选择" value="" ></el-option>
|
||||
<el-option label="已分配" value="1">已分配</el-option>
|
||||
<el-option label="未分配" value="2">未分配</el-option>
|
||||
|
|
@ -89,7 +89,7 @@ export default {
|
|||
props:['componentVisible','userId','type','parentList'],
|
||||
data() {
|
||||
return {
|
||||
types:'2',
|
||||
types:'',
|
||||
orgId:'',
|
||||
addType:0,
|
||||
tableKey: 0,
|
||||
|
|
|
|||
|
|
@ -170,6 +170,7 @@ export default {
|
|||
handleExit() {
|
||||
this.planEditMode = false
|
||||
this.temp = _.cloneDeep(defaultTmp)
|
||||
this.getDutyPlan();
|
||||
},
|
||||
// 导出班组
|
||||
handleExport() {
|
||||
|
|
@ -196,7 +197,7 @@ export default {
|
|||
}
|
||||
this.total = response.total
|
||||
}).finally(() => {
|
||||
|
||||
|
||||
})
|
||||
setTimeout(()=>{
|
||||
this.listLoading = false
|
||||
|
|
@ -230,7 +231,7 @@ export default {
|
|||
})
|
||||
this.temp = Object.assign({}, tmp)
|
||||
}).finally(() => {
|
||||
|
||||
|
||||
})
|
||||
setTimeout(()=>{
|
||||
this.listLoading = false
|
||||
|
|
@ -259,7 +260,7 @@ export default {
|
|||
this.getDutyPlan()
|
||||
this.dialogFormVisible = false
|
||||
}).finally(() => {
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -11,15 +11,7 @@
|
|||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<BuildSelect style="width: 200px" class="filter-item ml-20" :current-build.sync="listQuery.orgId" />
|
||||
<el-input
|
||||
v-model="listQuery.proName"
|
||||
placeholder="工程名称"
|
||||
style="width: 200px"
|
||||
class="filter-item ml-20"
|
||||
:maxlength="30"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-select v-model="temp.type" placeholder="请选择是否已分配" style="width: 200px" class="filter-item ml-20" clearable>
|
||||
<el-select v-model="temp.type" placeholder="请选择是否已分配" style="width: 200px;display: none" class="filter-item ml-20" clearable>
|
||||
<el-option v-for="item in Object.keys(typeMap)" :key="item" :value="Number(item)" :label="typeMap[item]" />
|
||||
</el-select>
|
||||
<el-button
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button class="filter-item" style="margin-left: 10px" type="primary" @click="handleCreate">
|
||||
新增
|
||||
</el-button>
|
||||
<!-- <el-button class="filter-item" style="margin-left: 10px" type="primary" @click="handleCreate">-->
|
||||
<!-- 新增-->
|
||||
<!-- </el-button>-->
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ import waves from '@/directive/waves' // waves directive
|
|||
import Pagination from '@/components/Pagination' // secondary package based on el-pagination
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import { delUser } from '@/api/user'
|
||||
export default {
|
||||
components: { Pagination, Treeselect },
|
||||
directives: { waves },
|
||||
|
|
|
|||
Loading…
Reference in New Issue