Merge remote-tracking branch 'origin/master'
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1,13 +1,9 @@
|
||||
<template>
|
||||
<TableHeader ref="TableHeaderRef">
|
||||
<TableHeader ref="TableHeaderRef">
|
||||
<template #select>
|
||||
<el-form-item label="工程名称">
|
||||
<el-input
|
||||
v-model="tableStore.table.params.searchValue"
|
||||
clearable
|
||||
></el-input>
|
||||
<el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="所属地市">
|
||||
<el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
|
||||
<el-option
|
||||
@@ -20,8 +16,8 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template #operation>
|
||||
<el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button>
|
||||
|
||||
<!-- <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button> -->
|
||||
<el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
|
||||
<el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button>
|
||||
</template>
|
||||
</TableHeader>
|
||||
@@ -30,6 +26,8 @@
|
||||
<Add ref="addRef" @onSubmit="tableStore.index()" />
|
||||
<!-- 上传 -->
|
||||
<Audit ref="AuditRef" @onSubmit="tableStore.index()" />
|
||||
<!-- 查看详情 detail 新增/修改 create-->
|
||||
<addForm ref="addForms" openType="create"></addForm>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, provide, nextTick } from 'vue'
|
||||
@@ -39,6 +37,7 @@ import TableHeader from '@/components/table/header/index.vue'
|
||||
import { mainHeight } from '@/utils/layout'
|
||||
import Add from './add.vue'
|
||||
import Audit from './audit.vue'
|
||||
import addForm from './addForm.vue'
|
||||
import { useDictData } from '@/stores/dictData'
|
||||
import { getLoadTypeUserList } from '@/api/process-boot/interference'
|
||||
const dictData = useDictData()
|
||||
@@ -149,6 +148,15 @@ const addList = () => {
|
||||
addRef.value.open()
|
||||
}
|
||||
|
||||
//三个表单
|
||||
const addForms = ref()
|
||||
const formVisibile = ref(false)
|
||||
const addFormModel = () => {
|
||||
console.log( addForms.value,"00000");
|
||||
addForms.value.open()
|
||||
formVisibile.value = true
|
||||
}
|
||||
|
||||
// 导出
|
||||
const exportEvent = () => {
|
||||
let form = JSON.parse(JSON.stringify(tableStore.table.params))
|
||||
@@ -176,4 +184,7 @@ onMounted(() => {
|
||||
:deep(.el-upload-list__item) {
|
||||
width: 400px;
|
||||
}
|
||||
::v-deep .el-input__wrapper{
|
||||
width:200px !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<template>
|
||||
<div class="default-main">
|
||||
<el-tabs v-model="activeName" type="border-card">
|
||||
<el-tab-pane label="非线性用户建档" name="1">
|
||||
<undocumented v-if="activeName == '1'"/>
|
||||
<el-tab-pane label="未建档非线性用户录入及查询" name="1">
|
||||
<undocumented v-if="activeName == '1'" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'"/></el-tab-pane>
|
||||
<el-tab-pane label="干扰源用户常态化管理" name="3"><normal v-if="activeName == '3'"/></el-tab-pane>
|
||||
<el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'"/></el-tab-pane>
|
||||
<el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>
|
||||
<el-tab-pane label="干扰源用户常态化管理" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
|
||||
<el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
@@ -17,7 +17,6 @@ import undocumented from './components/undocumented/index.vue'
|
||||
import network from './components/network/index.vue'
|
||||
import normal from './components/normal.vue'
|
||||
import report from './components/report.vue'
|
||||
|
||||
import { mainHeight } from '@/utils/layout'
|
||||
defineOptions({
|
||||
name: 'Processsupervision/interferencemanagement'
|
||||
@@ -27,6 +26,8 @@ const Statistics = ref()
|
||||
const compatibility = ref()
|
||||
|
||||
const layout = mainHeight(63) as any
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@@ -1,34 +1,34 @@
|
||||
<!--流程模型管理界面-->
|
||||
<template>
|
||||
<div class='default-main'>
|
||||
<div class="default-main">
|
||||
<TableHeader>
|
||||
<template v-slot:select>
|
||||
<!-- <el-form-item label='用户'>-->
|
||||
<!-- <el-select v-model='tableStore.table.params.userId' filterable clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for='item in userListData'-->
|
||||
<!-- :key='item.id'-->
|
||||
<!-- :label='item.userName'-->
|
||||
<!-- :value='item.id'-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label='用户'>-->
|
||||
<!-- <el-select v-model='tableStore.table.params.userId' filterable clearable>-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for='item in userListData'-->
|
||||
<!-- :key='item.id'-->
|
||||
<!-- :label='item.userName'-->
|
||||
<!-- :value='item.id'-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
</template>
|
||||
<template v-slot:operation>
|
||||
<el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增模型</el-button>
|
||||
<el-button type="primary" @click="add" class="ml10" :icon="Plus">新增模型</el-button>
|
||||
</template>
|
||||
</TableHeader>
|
||||
<!--表格-->
|
||||
<Table ref='tableRef' isGroup></Table>
|
||||
<model-popup ref='modelPopup' />
|
||||
<Table ref="tableRef" isGroup></Table>
|
||||
<model-popup ref="modelPopup" />
|
||||
<!-- 弹窗：表单详情 -->
|
||||
<el-dialog title='表单详情' v-model='formDetailVisible' width='800'>
|
||||
<form-create :rule='formDetailPreview.rule' :option='formDetailPreview.option' />
|
||||
<el-dialog title="表单详情" v-model="formDetailVisible" width="800">
|
||||
<form-create :rule="formDetailPreview.rule" :option="formDetailPreview.option" />
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang='ts'>
|
||||
<script setup lang="ts">
|
||||
import { Plus } from '@element-plus/icons-vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import TableStore from '@/utils/tableStore'
|
||||
@@ -50,7 +50,6 @@ defineOptions({
|
||||
const { push } = useRouter()
|
||||
const modelPopup = ref()
|
||||
|
||||
|
||||
const tableStore = new TableStore({
|
||||
url: '/bpm-boot/bpm/model/list',
|
||||
method: 'POST',
|
||||
@@ -61,23 +60,33 @@ const tableStore = new TableStore({
|
||||
{ title: '流程分类', field: 'categoryName', width: 150 },
|
||||
{ title: '表单信息', field: 'formName', width: 170 },
|
||||
{
|
||||
title: '创建时间', field: 'createTime', width: 150
|
||||
title: '创建时间',
|
||||
field: 'createTime',
|
||||
width: 150
|
||||
},
|
||||
{
|
||||
title: '最新部署的流程定义',
|
||||
children: [
|
||||
{ title: '模型版本', width: '150', field: 'processDefinition.version' },
|
||||
{
|
||||
title: '激活状态', width: '150', field: 'processDefinition.suspensionState',
|
||||
render: 'tag',
|
||||
custom: {
|
||||
2: 'danger',
|
||||
1: 'success'
|
||||
},
|
||||
replaceValue: {
|
||||
2: '关闭',
|
||||
1: '开启'
|
||||
title: '激活状态',
|
||||
width: '150',
|
||||
field: 'processDefinition.suspensionState',
|
||||
render: 'switch',
|
||||
activeValue: '1',
|
||||
inactiveValue: '0',
|
||||
onChangeField: (row: any, value) => {
|
||||
console.log(row, 444123, value)
|
||||
value == 0 ? (value = 1) : (value = 0)
|
||||
}
|
||||
// custom: {
|
||||
// 2: 'danger',
|
||||
// 1: 'success'
|
||||
// },
|
||||
// replaceValue: {
|
||||
// 2: '关闭',
|
||||
// 1: '开启'
|
||||
// }
|
||||
},
|
||||
{ title: '部署时间', width: '150', field: 'processDefinition.deploymentTime' }
|
||||
]
|
||||
@@ -150,11 +159,9 @@ const tableStore = new TableStore({
|
||||
delete tableStore.table.params[key]
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
onMounted(() => {
|
||||
// 加载数据
|
||||
tableStore.index()
|
||||
@@ -178,30 +185,23 @@ const handleDesign = (rowId: string) => {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
/** 发布流程 */
|
||||
const handleDeployConfirm = (rowId: string) => {
|
||||
try {
|
||||
// 删除的二次确认
|
||||
ElMessageBox.confirm(
|
||||
'是否部署该流程?',
|
||||
'提示',
|
||||
{
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
draggable: true,
|
||||
type: 'warning'
|
||||
}
|
||||
).then(() => {
|
||||
handleDeploy(rowId)
|
||||
ElMessageBox.confirm('是否部署该流程?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
draggable: true,
|
||||
type: 'warning'
|
||||
})
|
||||
.catch(() => {
|
||||
.then(() => {
|
||||
handleDeploy(rowId)
|
||||
})
|
||||
} catch {
|
||||
}
|
||||
.catch(() => {})
|
||||
} catch {}
|
||||
}
|
||||
|
||||
|
||||
const handleDeploy = async (rowId: string) => {
|
||||
// 发起部署
|
||||
await deployModel(rowId)
|
||||
@@ -224,8 +224,5 @@ const handleFormDetail = async (formId: string) => {
|
||||
// 弹窗打开
|
||||
formDetailVisible.value = true
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user