联调市详情页面

src/components/bpmnProcessDesigner/package/theme/element-variables.scss

@@ -34,6 +34,7 @@ span:focus {
 .el-dialog {
   margin-top: 50vh !important;
   transform: translateY(-50%);
+  padding: 0px !important;
   overflow: hidden;
 }
 .el-dialog__wrapper {

src/components/echarts/MyEchart.vue

@@ -113,7 +113,7 @@ const handlerBar = (options: any) => {
         options.series.forEach((item: any) => {
             if (item.type === 'bar') {
                 item.barMinHeight = 10
-                item.barMaxWidth = 30
+                item.barMaxWidth = 20
                 item.itemStyle = Object.assign(
                     {
                         color: (params: any) => {
@@ -163,8 +163,8 @@ const handlerYAxis = () => {
     if (Array.isArray(props.options?.yAxis)) {
         return props.options?.yAxis.map((item: any) => {
             return {
-                ...item,
-                ...temp
+                ...temp,
+                ...item
             }
         })
     } else {

src/components/form/area/index.vue

@@ -9,7 +9,7 @@ defineOptions({
     name: 'Area'
 })
 import { useDictData } from '@/stores/dictData'
-const emit = defineEmits(['changeName'])
+const emit = defineEmits(["changeValue"])
 const cascaderProps = {
     label: 'name',
     value: 'id',
@@ -18,7 +18,7 @@ const cascaderProps = {
 }
 const cascader = ref()
 const dictData = useDictData()
-const options = dictData.state.area
+const options:any = dictData.state.area
 const areaName = ref(dictData.state.area[0].name)
 const jbName = ref(dictData.state.area[0].name)
 const change = (e: any) => {
@@ -27,7 +27,8 @@ const change = (e: any) => {
     } else if (cascader.value.getCheckedNodes()[0]?.pathLabels.length >= 2) {
         areaName.value = cascader.value.getCheckedNodes()[0].pathLabels[1]
     }
-    emit('changeName', cascader.value.getCheckedNodes()[0].label)
+
+    emit('changeValue', cascader.value.getCheckedNodes()[0])
 }
 const changeName = () => {
     return jbName.value