Showing
6 changed files
with
4 additions
and
32 deletions
| @@ -173,7 +173,6 @@ export const instrumentComponent2 = (params?: Partial<ComponentInfo>): EChartsOp | @@ -173,7 +173,6 @@ export const instrumentComponent2 = (params?: Partial<ComponentInfo>): EChartsOp | ||
| 173 | 173 | ||
| 174 | const firstGradient = firstRecord?.value ? firstRecord.value / max : 0.3; | 174 | const firstGradient = firstRecord?.value ? firstRecord.value / max : 0.3; |
| 175 | const secondGradient = secondRecord?.value ? secondRecord.value / max : 0.7; | 175 | const secondGradient = secondRecord?.value ? secondRecord.value / max : 0.7; |
| 176 | - // const thirdGradient = thirdRecord?.value ? thirdRecord.value / max : 1; | ||
| 177 | 176 | ||
| 178 | return { | 177 | return { |
| 179 | series: [ | 178 | series: [ |
| @@ -22,8 +22,6 @@ | @@ -22,8 +22,6 @@ | ||
| 22 | const getImagBase64 = ref(fallback); | 22 | const getImagBase64 = ref(fallback); |
| 23 | 23 | ||
| 24 | const getRadio = computed(() => { | 24 | const getRadio = computed(() => { |
| 25 | - // const { radio } = props.radio || DEFAULT_RADIO_RECORD; | ||
| 26 | - // return radio; | ||
| 27 | return props.radio || DEFAULT_RADIO_RECORD; | 25 | return props.radio || DEFAULT_RADIO_RECORD; |
| 28 | }); | 26 | }); |
| 29 | 27 | ||
| @@ -67,7 +65,6 @@ | @@ -67,7 +65,6 @@ | ||
| 67 | class="w-full h-full flex flex-col justify-center items-center justify-between widget-picture" | 65 | class="w-full h-full flex flex-col justify-center items-center justify-between widget-picture" |
| 68 | > | 66 | > |
| 69 | <AntImage :width="getWidth" :src="getImagBase64" :fallback="fallback" /> | 67 | <AntImage :width="getWidth" :src="getImagBase64" :fallback="fallback" /> |
| 70 | - <!-- <Image :style="{ width: `${getWidth}px` }" :src="getImagBase64" /> --> | ||
| 71 | <div | 68 | <div |
| 72 | class="w-full text-center truncate p-5" | 69 | class="w-full text-center truncate p-5" |
| 73 | :style="{ fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 12 }), color: '#999' }" | 70 | :style="{ fontSize: fontSize({ radioRecord: getRadio, basic: 12, max: 12 }), color: '#999' }" |
| @@ -7,12 +7,7 @@ interface PictureComponentList { | @@ -7,12 +7,7 @@ interface PictureComponentList { | ||
| 7 | id: PictureComponentType; | 7 | id: PictureComponentType; |
| 8 | component: Component; | 8 | component: Component; |
| 9 | } | 9 | } |
| 10 | -// { | ||
| 11 | -// id: 'instrument-component-1', | ||
| 12 | -// layout: { chartOption: instrumentComponent1() }, | ||
| 13 | -// component: DashBoardComponent, | ||
| 14 | -// value: { id: buildUUID() }, | ||
| 15 | -// } | 10 | + |
| 16 | const pictureComponentList: PictureComponentList[] = [ | 11 | const pictureComponentList: PictureComponentList[] = [ |
| 17 | { | 12 | { |
| 18 | id: 'picture-component-1', | 13 | id: 'picture-component-1', |
| @@ -47,8 +47,6 @@ | @@ -47,8 +47,6 @@ | ||
| 47 | }); | 47 | }); |
| 48 | 48 | ||
| 49 | const getRadio = computed(() => { | 49 | const getRadio = computed(() => { |
| 50 | - // const { radio } = props.radio; | ||
| 51 | - // return radio; | ||
| 52 | return props.radio || DEFAULT_RADIO_RECORD; | 50 | return props.radio || DEFAULT_RADIO_RECORD; |
| 53 | }); | 51 | }); |
| 54 | </script> | 52 | </script> |
| @@ -84,12 +82,8 @@ | @@ -84,12 +82,8 @@ | ||
| 84 | /> | 82 | /> |
| 85 | </div> | 83 | </div> |
| 86 | <div :style="{ color: '#666', fontSize: fontSize({ radioRecord: getRadio, basic: 16 }) }"> | 84 | <div :style="{ color: '#666', fontSize: fontSize({ radioRecord: getRadio, basic: 16 }) }"> |
| 87 | - <!-- {{ getShowUnit ? props.value.unit : '' }} --> | ||
| 88 | {{ props.value.name }} | 85 | {{ props.value.name }} |
| 89 | </div> | 86 | </div> |
| 90 | - <!-- <div class="truncate" :style="{ fontSize: fontSize({ radio: getRadio, basic: 16 }) }"> | ||
| 91 | - {{ props.value.name }} | ||
| 92 | - </div> --> | ||
| 93 | </div> | 87 | </div> |
| 94 | </div> | 88 | </div> |
| 95 | </div> | 89 | </div> |
| @@ -361,9 +361,7 @@ | @@ -361,9 +361,7 @@ | ||
| 361 | await deleteDataComponent({ dataBoardId, ids: [id] }); | 361 | await deleteDataComponent({ dataBoardId, ids: [id] }); |
| 362 | createMessage.success('删除成功'); | 362 | createMessage.success('删除成功'); |
| 363 | await getDataBoardComponent(); | 363 | await getDataBoardComponent(); |
| 364 | - } catch (error) { | ||
| 365 | - // createMessage.error('删除失败'); | ||
| 366 | - } | 364 | + } catch (error) {} |
| 367 | }; | 365 | }; |
| 368 | 366 | ||
| 369 | const [registerHistoryDataModal, historyDataModalMethod] = useModal(); | 367 | const [registerHistoryDataModal, historyDataModalMethod] = useModal(); |
| @@ -543,12 +541,6 @@ | @@ -543,12 +541,6 @@ | ||
| 543 | cursor: pointer; | 541 | cursor: pointer; |
| 544 | } | 542 | } |
| 545 | 543 | ||
| 546 | - // .container { | ||
| 547 | - // display: grid; | ||
| 548 | - // grid-template-columns: 3; | ||
| 549 | - // grid-row: 3; | ||
| 550 | - // } | ||
| 551 | - | ||
| 552 | .grid-item-layout { | 544 | .grid-item-layout { |
| 553 | overflow: hidden; | 545 | overflow: hidden; |
| 554 | border: 1px solid #eee !important; | 546 | border: 1px solid #eee !important; |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | }, | 51 | }, |
| 52 | }); | 52 | }); |
| 53 | 53 | ||
| 54 | - //分页相关 | 54 | + // about pagination |
| 55 | const page = ref(1); | 55 | const page = ref(1); |
| 56 | const pageSize = ref(10); | 56 | const pageSize = ref(10); |
| 57 | const total = ref(0); | 57 | const total = ref(0); |
| @@ -147,14 +147,11 @@ | @@ -147,14 +147,11 @@ | ||
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | const handleRemove = async (record: DataBoardRecord) => { | 149 | const handleRemove = async (record: DataBoardRecord) => { |
| 150 | - // TODO 删除确认 | ||
| 151 | try { | 150 | try { |
| 152 | await deleteDataBoard([record.id]); | 151 | await deleteDataBoard([record.id]); |
| 153 | createMessage.success('删除成功'); | 152 | createMessage.success('删除成功'); |
| 154 | await getDatasource(); | 153 | await getDatasource(); |
| 155 | - } catch (error) { | ||
| 156 | - // createMessage.error('删除失败'); | ||
| 157 | - } | 154 | + } catch (error) {} |
| 158 | }; | 155 | }; |
| 159 | 156 | ||
| 160 | const [registerModal, { openModal }] = useModal(); | 157 | const [registerModal, { openModal }] = useModal(); |
| @@ -201,7 +198,6 @@ | @@ -201,7 +198,6 @@ | ||
| 201 | <div class="bg-light-100 mb-6 w-full p-3 search-form"> | 198 | <div class="bg-light-100 mb-6 w-full p-3 search-form"> |
| 202 | <BasicForm class="flex-auto w-full" @register="searchFormRegister" /> | 199 | <BasicForm class="flex-auto w-full" @register="searchFormRegister" /> |
| 203 | </div> | 200 | </div> |
| 204 | - <!-- <div> </div> --> | ||
| 205 | <Spin :spinning="loading"> | 201 | <Spin :spinning="loading"> |
| 206 | <List | 202 | <List |
| 207 | ref="listEL" | 203 | ref="listEL" |
| @@ -226,7 +222,6 @@ | @@ -226,7 +222,6 @@ | ||
| 226 | <MoreOutlined class="rotate-90 transform cursor-pointer" /> | 222 | <MoreOutlined class="rotate-90 transform cursor-pointer" /> |
| 227 | </Dropdown> | 223 | </Dropdown> |
| 228 | </template> | 224 | </template> |
| 229 | - <!-- <template #cover>title</template> --> | ||
| 230 | <section @click="handleViewBoard(item)"> | 225 | <section @click="handleViewBoard(item)"> |
| 231 | <div class="flex data-card__info"> | 226 | <div class="flex data-card__info"> |
| 232 | <div> | 227 | <div> |