diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index 641d0295..825f4ee2 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -7,13 +7,13 @@
关闭
-
+
-
+
-
+
-
-
- {{ item.time }}
-
- {{ item.name }}
-
- {{ userName }}
- {{ item.des }}
-
-
-
-
+
+
+
+ {{ item.time }}
+
+ {{ item.name }}
+
+ {{ userName }}
+ {{ item.des }}
+
+
+
+
+
-
+
@@ -123,8 +125,6 @@
/>
-
-
@@ -235,7 +235,6 @@
des: [{ required: true, message: '请填写审批意见', trigger: 'blur' }],
});
-
if (props.type == 4) {
rules.value = {};
}
@@ -257,7 +256,7 @@
const designerData: designerDataType = reactive({
loading: false,
xmlString: '',
- height: document.documentElement.clientHeight - 200.5 + 'px;',
+ height: document.documentElement.clientHeight - 300.5 + 'px;',
midVisible: false,
isCustmerTitle: false,
nodeUsers: [],
@@ -290,19 +289,19 @@
const auditName = ref('audit');
const auditTitleVal = ref('审批栏');
const auditNameVal = ref('审批意见');
- const rejectOpen = ref(false);
+ const rejectOpen = ref(false);
const footerStyle = ref({
- height:"220px",
- width:mapConfig.value.isShowMap ? '100%':'60%',
- overFlow:"auto",
- color: '#fff',
- backgroundColor: '#ffffff',
- zIndex:"9999999999",
- padding:"0px 100px",
- position:"fixed",
- bottom:"0px",
- left:"0px"
- })
+ height: '220px',
+ width: mapConfig.value.isShowMap ? '100%' : '60%',
+ overFlow: 'auto',
+ color: '#fff',
+ backgroundColor: '#ffffff',
+ zIndex: '9999999999',
+ padding: '0px 100px',
+ position: 'fixed',
+ bottom: '0px',
+ left: '0px',
+ });
function changeActive(activeKey) {
if (activeKey == 'flow') {
@@ -350,14 +349,14 @@
currentNode = wfData.find((t) => t.type == 'bpmn:StartEvent');
mapConfig.value = currentNode.mapConfig;
- footerStyle.value.width = mapConfig.value?.isShowMap ? "60%":"100%"
- if(mapConfig.value?.isShowMap){}
-
+ footerStyle.value.width = mapConfig.value?.isShowMap ? '60%' : '100%';
+ if (mapConfig.value?.isShowMap) {
+ }
} else {
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 ? '60%' : '100%';
}
if (currentNode.authFields.length > 0) {
formVisble.value = true;
@@ -470,7 +469,7 @@
for (let key in nodeMap) {
nodeMap[key] = nodeMap[key].filter((t: { userIds: string | any[] }) => t.userIds.length > 0);
}
-
+ logs.reverse();
logs.forEach(
(log: {
unitId: string;
@@ -754,13 +753,11 @@
}
}
-
-
- async function handlerShowGeomtrys(currentNode){
- let info = currentNode.authFields?.find((item,index)=>{
- return item.component == "MapGeom"
- })
- let layer:string="";
+ async function handlerShowGeomtrys(currentNode) {
+ let info = currentNode.authFields?.find((item, index) => {
+ return item.component == 'MapGeom';
+ });
+ let layer: string = '';
// let layer:string="drone_shp_data";
if (info) {
@@ -772,7 +769,7 @@
}
let geomfiledValue = info.field.toLowerCase();
- let gids = "";
+ let gids = '';
try {
await formBoxRef.value.getForm().then((res) => {
@@ -818,9 +815,7 @@
}
}
-
- function onMapboxLoad(){
-
+ function onMapboxLoad() {
handlerShowGeomtrys(designerData.formCurrentNode);
}
// 驳回到指定节点
diff --git a/src/views/demo/workflow/task/process/look.vue b/src/views/demo/workflow/task/process/look.vue
index 16394dc3..3eff37b0 100644
--- a/src/views/demo/workflow/task/process/look.vue
+++ b/src/views/demo/workflow/task/process/look.vue
@@ -57,27 +57,29 @@
-
-
- {{ item.time }}
-
- {{ item.name }}
-
- {{ userName }}
- {{ item.des }}
-
-
-
-
+
+
+
+ {{ item.time }}
+
+ {{ item.name }}
+
+ {{ userName }}
+ {{ item.des }}
+
+
+
+
+
@@ -173,7 +175,7 @@
const designerData: designerDataType = reactive({
loading: false,
xmlString: '',
- height: document.documentElement.clientHeight - 200.5 + 'px;',
+ height: document.documentElement.clientHeight - 300.5 + 'px;',
midVisible: false,
isCustmerTitle: false,
nodeUsers: [],
@@ -343,7 +345,7 @@
for (let key in nodeMap) {
nodeMap[key] = nodeMap[key].filter((t: { userIds: string | any[] }) => t.userIds.length > 0);
}
-
+ logs.reverse();
logs.forEach(
(log: {
unitId: string;