fix : 修改分类分级标准
Showing
4 changed files
with
23 additions
and
17 deletions
| ... | @@ -24,7 +24,8 @@ const props = defineProps({ | ... | @@ -24,7 +24,8 @@ const props = defineProps({ |
| 24 | 24 | ||
| 25 | const emits = defineEmits(["expand"]); | 25 | const emits = defineEmits(["expand"]); |
| 26 | 26 | ||
| 27 | const isExpanded = ref(true); | 27 | // const isExpanded = ref(true); |
| 28 | const isExpanded = ref(props.isExpand); | ||
| 28 | 29 | ||
| 29 | watch( | 30 | watch( |
| 30 | () => props.isExpand, | 31 | () => props.isExpand, |
| ... | @@ -46,14 +47,10 @@ const expandSwicthHandler = () => { | ... | @@ -46,14 +47,10 @@ const expandSwicthHandler = () => { |
| 46 | </script> | 47 | </script> |
| 47 | 48 | ||
| 48 | <template> | 49 | <template> |
| 49 | <ElCard | 50 | <ElCard class="v-content-wrap" shadow="never" :body-style="{ |
| 50 | class="v-content-wrap" | ||
| 51 | shadow="never" | ||
| 52 | :body-style="{ | ||
| 53 | padding: `0px`, | 51 | padding: `0px`, |
| 54 | height: `${isExpanded ? contentHeight + 28 : 0}px`, | 52 | height: `${isExpanded ? contentHeight + 28 : 0}px`, |
| 55 | }" | 53 | }"> |
| 56 | > | ||
| 57 | <template v-if="title" #header> | 54 | <template v-if="title" #header> |
| 58 | <div class="card-title" @click="expandSwicthHandler"> | 55 | <div class="card-title" @click="expandSwicthHandler"> |
| 59 | <span v-if="expandSwicth" style="padding-right: 5px; cursor: pointer"> | 56 | <span v-if="expandSwicth" style="padding-right: 5px; cursor: pointer"> | ... | ... |
| ... | @@ -673,7 +673,7 @@ const initGraph = () => { | ... | @@ -673,7 +673,7 @@ const initGraph = () => { |
| 673 | }, | 673 | }, |
| 674 | getHGap: function getHGap() { | 674 | getHGap: function getHGap() { |
| 675 | return 80; | 675 | return 80; |
| 676 | } | 676 | }, |
| 677 | } | 677 | } |
| 678 | }); | 678 | }); |
| 679 | graph.data(shapeTreeListData.value[0]); | 679 | graph.data(shapeTreeListData.value[0]); |
| ... | @@ -799,12 +799,16 @@ onMounted(() => { | ... | @@ -799,12 +799,16 @@ onMounted(() => { |
| 799 | // }); | 799 | // }); |
| 800 | }) | 800 | }) |
| 801 | 801 | ||
| 802 | const isExpand = ref<boolean>(router.currentRoute.value.query.isExpand == 'true'); | ||
| 803 | |||
| 804 | |||
| 802 | </script> | 805 | </script> |
| 803 | 806 | ||
| 804 | <template> | 807 | <template> |
| 805 | <div class="container_wrap" v-loading="fullscreenLoading"> | 808 | <div class="container_wrap" v-loading="fullscreenLoading"> |
| 806 | <div class="content_main"> | 809 | <div class="content_main"> |
| 807 | <ContentWrap id="id-baseInfo" title="基础信息" description="" style="margin-top: 8px;"> | 810 | <ContentWrap id="id-baseInfo" title="基础信息" description="" style="margin-top: 8px;" :expandSwicth="true" |
| 811 | :isExpand="isExpand"> | ||
| 808 | <Form ref="formRef" :itemList="classStandardFormItems" formId="main-model-edit" col="col3" /> | 812 | <Form ref="formRef" :itemList="classStandardFormItems" formId="main-model-edit" col="col3" /> |
| 809 | </ContentWrap> | 813 | </ContentWrap> |
| 810 | <ContentWrap id="id-classStandard" class="detail-content" title="分类标准" description="" | 814 | <ContentWrap id="id-classStandard" class="detail-content" title="分类标准" description="" |
| ... | @@ -852,6 +856,7 @@ onMounted(() => { | ... | @@ -852,6 +856,7 @@ onMounted(() => { |
| 852 | .content_main { | 856 | .content_main { |
| 853 | height: calc(100% - 44px); | 857 | height: calc(100% - 44px); |
| 854 | padding: 10px 16px; | 858 | padding: 10px 16px; |
| 859 | overflow: auto; | ||
| 855 | } | 860 | } |
| 856 | 861 | ||
| 857 | .bottom_tool_wrap { | 862 | .bottom_tool_wrap { |
| ... | @@ -870,6 +875,7 @@ onMounted(() => { | ... | @@ -870,6 +875,7 @@ onMounted(() => { |
| 870 | 875 | ||
| 871 | .card-body-content { | 876 | .card-body-content { |
| 872 | height: 100%; | 877 | height: 100%; |
| 878 | overflow: auto; | ||
| 873 | } | 879 | } |
| 874 | } | 880 | } |
| 875 | } | 881 | } |
| ... | @@ -885,11 +891,11 @@ onMounted(() => { | ... | @@ -885,11 +891,11 @@ onMounted(() => { |
| 885 | } | 891 | } |
| 886 | 892 | ||
| 887 | .shape-main { | 893 | .shape-main { |
| 888 | height: calc(100% - 160px); | 894 | height: calc(100% - 44px); |
| 889 | } | 895 | } |
| 890 | 896 | ||
| 891 | .table_panel { | 897 | .table_panel { |
| 892 | height: calc(100% - 160px) !important; | 898 | height: calc(100% - 44px) !important; |
| 893 | } | 899 | } |
| 894 | 900 | ||
| 895 | .node-details-popup { | 901 | .node-details-popup { | ... | ... |
| ... | @@ -114,7 +114,7 @@ const tableInfo = ref({ | ... | @@ -114,7 +114,7 @@ const tableInfo = ref({ |
| 114 | multiple: true, | 114 | multiple: true, |
| 115 | fields: [ | 115 | fields: [ |
| 116 | { label: "序号", type: 'index', width: 56, align: "center" }, | 116 | { label: "序号", type: 'index', width: 56, align: "center" }, |
| 117 | { label: "排序", field: 'orderNum', width: 56, align: "center" }, | 117 | // { label: "排序", field: 'orderNum', width: 56, align: "center" }, |
| 118 | { | 118 | { |
| 119 | label: "数据级别", field: "dataGrade", width: 120, getName: (scope) => { | 119 | label: "数据级别", field: "dataGrade", width: 120, getName: (scope) => { |
| 120 | let dataGrade = scope.row.dataGrade; | 120 | let dataGrade = scope.row.dataGrade; |
| ... | @@ -231,7 +231,7 @@ const newCreateGradeFormItems = ref([{ | ... | @@ -231,7 +231,7 @@ const newCreateGradeFormItems = ref([{ |
| 231 | visible: true, | 231 | visible: true, |
| 232 | }, | 232 | }, |
| 233 | { | 233 | { |
| 234 | label: '序号', | 234 | label: '排序号', |
| 235 | type: 'input', | 235 | type: 'input', |
| 236 | maxlength: 19, | 236 | maxlength: 19, |
| 237 | placeholder: '请输入', | 237 | placeholder: '请输入', |
| ... | @@ -417,6 +417,7 @@ const cancel = () => { | ... | @@ -417,6 +417,7 @@ const cancel = () => { |
| 417 | .content_main { | 417 | .content_main { |
| 418 | height: calc(100% - 44px); | 418 | height: calc(100% - 44px); |
| 419 | padding: 10px 16px; | 419 | padding: 10px 16px; |
| 420 | overflow: auto; | ||
| 420 | 421 | ||
| 421 | .table-top-btns { | 422 | .table-top-btns { |
| 422 | margin-bottom: 12px; | 423 | margin-bottom: 12px; | ... | ... |
| ... | @@ -158,7 +158,8 @@ const handleClassDataClick = (item, des = '') => { | ... | @@ -158,7 +158,8 @@ const handleClassDataClick = (item, des = '') => { |
| 158 | type: des === '' ? '配置' : des, | 158 | type: des === '' ? '配置' : des, |
| 159 | classStandardName: item.name, | 159 | classStandardName: item.name, |
| 160 | refGradeGuid: item.refGradeGuid, | 160 | refGradeGuid: item.refGradeGuid, |
| 161 | description: item.description | 161 | description: item.description, |
| 162 | isExpand: item.isExpand || false | ||
| 162 | } | 163 | } |
| 163 | }); | 164 | }); |
| 164 | } | 165 | } |
| ... | @@ -276,7 +277,8 @@ const newCreateClassStandardDialogInfo = ref({ | ... | @@ -276,7 +277,8 @@ const newCreateClassStandardDialogInfo = ref({ |
| 276 | name: item.name, | 277 | name: item.name, |
| 277 | guid: item.guid, | 278 | guid: item.guid, |
| 278 | refGradeGuid: item.refGradeGuid, | 279 | refGradeGuid: item.refGradeGuid, |
| 279 | description: item.description | 280 | description: item.description, |
| 281 | isExpand: true | ||
| 280 | } | 282 | } |
| 281 | handleClassDataClick(params, ''); | 283 | handleClassDataClick(params, ''); |
| 282 | } | 284 | } |
| ... | @@ -559,7 +561,7 @@ const newCreateGrade = () => { | ... | @@ -559,7 +561,7 @@ const newCreateGrade = () => { |
| 559 | </el-icon> | 561 | </el-icon> |
| 560 | </template> | 562 | </template> |
| 561 | <div class="levitation-ul"> | 563 | <div class="levitation-ul"> |
| 562 | <span class="levitation-li" @click="handleClassDataClick(item)">配置</span> | 564 | <span class="levitation-li" @click="handleClassDataClick(item)">编辑</span> |
| 563 | <!-- <span class="levitation-li" @click="handleClassDataEdit(item)">编辑</span> --> | 565 | <!-- <span class="levitation-li" @click="handleClassDataEdit(item)">编辑</span> --> |
| 564 | <span class="levitation-li" @click="handleClassDataDel(item)">删除</span> | 566 | <span class="levitation-li" @click="handleClassDataDel(item)">删除</span> |
| 565 | </div> | 567 | </div> |
| ... | @@ -592,7 +594,7 @@ const newCreateGrade = () => { | ... | @@ -592,7 +594,7 @@ const newCreateGrade = () => { |
| 592 | </el-icon> | 594 | </el-icon> |
| 593 | </template> | 595 | </template> |
| 594 | <div class="levitation-ul"> | 596 | <div class="levitation-ul"> |
| 595 | <span class="levitation-li" @click="handleClassifyGradDataClick(item)">配置</span> | 597 | <span class="levitation-li" @click="handleClassifyGradDataClick(item)">编辑</span> |
| 596 | <!-- <span class="levitation-li" @click="handleClassifyGradDataEdit(item)">编辑</span> --> | 598 | <!-- <span class="levitation-li" @click="handleClassifyGradDataEdit(item)">编辑</span> --> |
| 597 | <span class="levitation-li" @click="handleClassifyGradDataDel(item)">删除</span> | 599 | <span class="levitation-li" @click="handleClassifyGradDataDel(item)">删除</span> |
| 598 | </div> | 600 | </div> | ... | ... |
-
Please register or sign in to post a comment