Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua
commit
e94c3e9188
|
|
@ -17,7 +17,11 @@
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div id="form-container" style="position: relative" :class="mapConfig?.isShowMap ? 'form-container' : ''">
|
||||
<div
|
||||
id="form-container"
|
||||
style="position: relative"
|
||||
:class="mapConfig?.isShowMap ? 'form-container' : ''"
|
||||
>
|
||||
<a-layout>
|
||||
<a-layout>
|
||||
<a-layout-content>
|
||||
|
|
@ -129,7 +133,10 @@
|
|||
:auto-size="{ minRows: 2, maxRows: 8 }"
|
||||
/>
|
||||
</a-form-item>
|
||||
<a-form-item label="" class="l-task-btns">
|
||||
<a-form-item
|
||||
label=""
|
||||
:class="btnVisble ? 'l-task-btns' : 'l-task-btns btn-hidden'"
|
||||
>
|
||||
<a-button
|
||||
v-for="(btn, index) in designerData.taskBtns"
|
||||
:key="index"
|
||||
|
|
@ -255,7 +262,7 @@
|
|||
import { buildGUID } from '@/utils/uuid';
|
||||
import { settings } from 'nprogress';
|
||||
const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
|
||||
const geomsList = ref()
|
||||
const geomsList = ref();
|
||||
const mapConfig = ref({ isShowMap: false });
|
||||
const MapboxComponent = ref();
|
||||
const { createMessage } = useMessage();
|
||||
|
|
@ -302,6 +309,7 @@
|
|||
if (props.type == 4) {
|
||||
rules.value = {};
|
||||
}
|
||||
const btnVisble = ref(true);
|
||||
// 表单数据
|
||||
const formConfig = ref<IFormConfig>({
|
||||
// 表单配置
|
||||
|
|
@ -415,13 +423,12 @@
|
|||
|
||||
let currentMapNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
|
||||
|
||||
|
||||
// mapConfig.value = currentMapNode.mapConfig;
|
||||
if (auditNode.isInherit) {
|
||||
currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
|
||||
// mapConfig.value = currentNode.mapConfig;
|
||||
|
||||
footerStyle.value.width = mapConfig.value?.isShowMap ? '60%' : '100%';
|
||||
footerStyle.value.width = mapConfig.value?.isShowMap ? '100%' : '60%';
|
||||
if (mapConfig.value?.isShowMap) {
|
||||
|
||||
}
|
||||
|
|
@ -429,14 +436,13 @@
|
|||
currentNode = auditNode;
|
||||
let currentMapNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
|
||||
// mapConfig.value = currentMapNode.mapConfig;
|
||||
footerStyle.value.width = mapConfig.value?.isShowMap ? '60%' : '100%';
|
||||
footerStyle.value.width = mapConfig.value?.isShowMap ? '100%' : '60%';
|
||||
}
|
||||
|
||||
getConfig({ code: 'mapsetting' }).then((res) => {
|
||||
mapConfig.value = JSON.parse(res.codeValue);
|
||||
});
|
||||
|
||||
|
||||
if (currentNode.authFields.length > 0) {
|
||||
formVisble.value = true;
|
||||
} else if (currentNode.formUrl) {
|
||||
|
|
@ -805,6 +811,7 @@
|
|||
des: formData.value.des,
|
||||
});
|
||||
if (data) {
|
||||
btnVisble.value = false;
|
||||
closePage();
|
||||
return createMessage.success('成功');
|
||||
} else {
|
||||
|
|
@ -873,14 +880,14 @@
|
|||
try {
|
||||
geomfiledValue = geomfiledValue.toLowerCase();
|
||||
gids = formData[geomfiledValue];
|
||||
console.log("gidssss",gids);
|
||||
console.log('gidssss', gids);
|
||||
// 根据ids获取图斑
|
||||
if (gids) {
|
||||
try {
|
||||
let getGeomPrams = {
|
||||
TableName: layer,
|
||||
FieldName: 'gid',
|
||||
FieldValue: gids?.split(","),
|
||||
FieldValue: gids?.split(','),
|
||||
page: 1,
|
||||
limit: 999,
|
||||
key: null,
|
||||
|
|
@ -901,7 +908,7 @@
|
|||
// MapboxComponent.value.handlerDraw(status,mapgemoList.value, false);
|
||||
MapboxComponent.value.handlerDraw('Details', geoms, false);
|
||||
} else {
|
||||
geomsList.value = null
|
||||
geomsList.value = null;
|
||||
createMessage.error('当前数据没有图斑!');
|
||||
}
|
||||
});
|
||||
|
|
@ -1039,12 +1046,16 @@
|
|||
height: 98%;
|
||||
}
|
||||
.l-task-btns {
|
||||
visibility: visible;
|
||||
.ant-btn {
|
||||
margin: 0;
|
||||
margin-top: 8px;
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
.l-task-btns.btn-hidden {
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
::v-deep .ant-modal-footer {
|
||||
display: none !important;
|
||||
|
|
@ -1070,28 +1081,25 @@
|
|||
padding: 10px 30px;
|
||||
}
|
||||
|
||||
|
||||
#process-form-container{
|
||||
width:100%;
|
||||
height:100%;
|
||||
#process-form-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
float: left;
|
||||
position: relative;
|
||||
::deep(.ant-image-preview-root){
|
||||
::deep(.ant-image-preview-root) {
|
||||
position: absolute;
|
||||
}
|
||||
:deep(.ant-image-preview-wrap) {
|
||||
position: absolute;
|
||||
.ant-image-preview{
|
||||
.ant-image-preview-content{
|
||||
.ant-image-preview-body{
|
||||
.ant-image-preview-switch-left{
|
||||
position:absolute;
|
||||
|
||||
.ant-image-preview {
|
||||
.ant-image-preview-content {
|
||||
.ant-image-preview-body {
|
||||
.ant-image-preview-switch-left {
|
||||
position: absolute;
|
||||
}
|
||||
.ant-image-preview-switch-right{
|
||||
position:absolute;
|
||||
|
||||
.ant-image-preview-switch-right {
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1100,10 +1108,10 @@
|
|||
:deep(.ant-image-preview-mask) {
|
||||
position: absolute;
|
||||
}
|
||||
::deep(.ant-image-preview-switch-left){
|
||||
position:absolute;
|
||||
::deep(.ant-image-preview-switch-left) {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
:deep(.ant-image-preview-operations-wrapper) {
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
|
|
@ -1111,19 +1119,19 @@
|
|||
position: absolute;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
.ant-image-preview-operations-operation{
|
||||
.ant-image-preview-operations-operation {
|
||||
// flex:1;
|
||||
}
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(1){
|
||||
.ant-image-preview-operations-operation:nth-last-child(1) {
|
||||
display: none;
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(2){
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(2) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
#form-container{
|
||||
#form-container {
|
||||
position: relative;
|
||||
height: 100%;
|
||||
:deep(.ant-image-preview-wrap) {
|
||||
|
|
@ -1132,11 +1140,11 @@
|
|||
:deep(.ant-image-preview-mask) {
|
||||
position: absolute;
|
||||
}
|
||||
:deep(.ant-image-preview-switch-left){
|
||||
position:absolute;
|
||||
:deep(.ant-image-preview-switch-left) {
|
||||
position: absolute;
|
||||
}
|
||||
:deep(.ant-image-preview-switch-right){
|
||||
position:absolute;
|
||||
:deep(.ant-image-preview-switch-right) {
|
||||
position: absolute;
|
||||
}
|
||||
:deep(.ant-image-preview-operations-wrapper) {
|
||||
height: 100%;
|
||||
|
|
@ -1145,14 +1153,14 @@
|
|||
position: absolute;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
.ant-image-preview-operations-operation{
|
||||
.ant-image-preview-operations-operation {
|
||||
// flex:1;
|
||||
}
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(1){
|
||||
.ant-image-preview-operations-operation:nth-last-child(1) {
|
||||
display: none;
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(2){
|
||||
}
|
||||
.ant-image-preview-operations-operation:nth-last-child(2) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue