Skip to content

D
dd_school
Commit 6ae4536d by zhaopanyu
Options

zpy 实验室药品管理 实验室管理修改

parent a34b7e02
Showing with 1265 additions and 727 deletions
ruoyi-ui/src/api/smartSchool/InstrumentDrugAdministration/instrumentManagement.js
......@@ -17,7 +17,7 @@ export function editInst(data) {
});
}
//查看仪器列表
export function getList(query) {
export function getListyq(query) {
return request({
url: "/schoolInstrument/list",
method: "get",
......
ruoyi-ui/src/assets/icons/svg/仓库.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694586094638" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11336" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 554.666667h-42.666667v298.666666H170.666667v-298.666666H128l384-384 384 384z m-640-8.533334V768h512v-221.866667l-256-256-256 256z m174.933333-76.8h170.666667v85.333334h-170.666667v-85.333334z" fill="#444444" p-id="11337"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694586094638" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11336" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 554.666667h-42.666667v298.666666H170.666667v-298.666666H128l384-384 384 384z m-640-8.533334V768h512v-221.866667l-256-256-256 256z m174.933333-76.8h170.666667v85.333334h-170.666667v-85.333334z" fill="#444444" p-id="11337"></path></svg>
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/实验室 (1).svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585200349" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2468" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M375.754979 682.621159a68.262116 68.262116 0 1 0 136.524232 0 68.262116 68.262116 0 0 0-136.524232 0z" fill="#768197" p-id="2469"></path><path d="M580.541327 819.14539a68.262116 68.262116 0 1 0 136.524231 0 68.262116 68.262116 0 0 0-136.524231 0z" fill="#FFFFFF" p-id="2470"></path><path d="M977.280744 852.320779L703.413135 360.35571a43.756016 43.756016 0 0 1-11.399773-28.601827V57.203653h34.19932c17.133791 0 28.533564-11.468035 28.533564-28.601826S743.346473 0 726.212682 0H292.611722c-17.065529 0-28.533564 11.468035-28.533565 28.601827s11.399773 28.601827 28.533565 28.601826h34.267582V331.753883c0 11.468035 0 22.936071-5.734018 28.670089L47.277677 852.252516a133.862009 133.862009 0 0 0 0 114.407307c22.799547 34.335844 57.067129 57.203653 102.734485 57.203653h724.534098c40.0016 0 79.866676-22.867809 102.734484-57.203653 17.065529-34.335844 17.065529-80.071462 0-114.407307zM634.946233 57.203653V331.753883c0 22.936071 5.734018 40.069862 17.065529 62.937671l40.0016 68.671688H332.54506l39.933337-74.405706a110.584628 110.584628 0 0 0 17.133791-57.203653V57.203653h245.334045z m291.0014 880.922605c-11.399773 17.133791-28.533564 28.601827-51.401373 28.601827H150.012162c-22.867809 0-40.0016-11.468035-51.401373-28.601827a52.083994 52.083994 0 0 1 0-57.203653l205.468968-366.089727h422.132925l205.468969 366.089727c0 17.133791 0 40.069862-5.734018 57.203653z" fill="#768197" p-id="2471"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585200349" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2468" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M375.754979 682.621159a68.262116 68.262116 0 1 0 136.524232 0 68.262116 68.262116 0 0 0-136.524232 0z" fill="#768197" p-id="2469"></path><path d="M580.541327 819.14539a68.262116 68.262116 0 1 0 136.524231 0 68.262116 68.262116 0 0 0-136.524231 0z" fill="#FFFFFF" p-id="2470"></path><path d="M977.280744 852.320779L703.413135 360.35571a43.756016 43.756016 0 0 1-11.399773-28.601827V57.203653h34.19932c17.133791 0 28.533564-11.468035 28.533564-28.601826S743.346473 0 726.212682 0H292.611722c-17.065529 0-28.533564 11.468035-28.533565 28.601827s11.399773 28.601827 28.533565 28.601826h34.267582V331.753883c0 11.468035 0 22.936071-5.734018 28.670089L47.277677 852.252516a133.862009 133.862009 0 0 0 0 114.407307c22.799547 34.335844 57.067129 57.203653 102.734485 57.203653h724.534098c40.0016 0 79.866676-22.867809 102.734484-57.203653 17.065529-34.335844 17.065529-80.071462 0-114.407307zM634.946233 57.203653V331.753883c0 22.936071 5.734018 40.069862 17.065529 62.937671l40.0016 68.671688H332.54506l39.933337-74.405706a110.584628 110.584628 0 0 0 17.133791-57.203653V57.203653h245.334045z m291.0014 880.922605c-11.399773 17.133791-28.533564 28.601827-51.401373 28.601827H150.012162c-22.867809 0-40.0016-11.468035-51.401373-28.601827a52.083994 52.083994 0 0 1 0-57.203653l205.468968-366.089727h422.132925l205.468969 366.089727c0 17.133791 0 40.069862-5.734018 57.203653z" fill="#768197" p-id="2471"></path></svg>
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/实验药品.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585833732" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8273" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1023.8976 364.3392l-2.2528-6.144c-7.3728-19.8656-21.6064-32.9728-41.984-38.8096l-6.2464-1.7408H866.5088l-4.1984 1.9456c-5.4272 2.56-9.6256 6.5536-12.288 11.776-2.048 3.9936-2.1504 4.5056-2.1504 11.264 0 6.656 0.1024 7.2704 2.048 10.8544 3.4816 6.5536 7.8848 10.4448 14.2336 12.4928 3.8912 1.2288 5.632 1.3312 52.224 1.3312 55.3984 0 53.4528-0.2048 56.7296 5.0176 3.4816 5.5296 2.2528 9.9328-3.9936 15.4624-3.6864 3.072-7.4752 7.0656-10.5472 11.1616-1.8432 2.4576-2.4576 3.3792-5.4272 9.4208-0.7168 1.3312-2.1504 5.0176-3.2768 8.2944l-2.048 5.9392-0.3072 28.2624-0.2048 28.2624-6.4512 0.4096c-3.584 0.2048-39.5264 0.8192-79.872 1.3312s-113.4592 1.536-162.6112 2.3552l-89.2928 1.3312-1.4336-1.8432c-0.8192-0.9216-1.4336-2.1504-1.4336-2.56 0-0.4096-0.4096-1.1264-0.9216-1.6384a21.1968 21.1968 0 0 1-2.3552-3.6864c-0.7168-1.536-2.1504-3.6864-2.9696-4.8128a10.02496 10.02496 0 0 1-1.4336-2.4576c0-0.2048-0.9216-1.7408-1.9456-3.2768-1.1264-1.536-1.9456-2.9696-1.9456-3.1744 0-0.2048-1.024-1.9456-2.2528-3.7888s-2.2528-3.4816-2.2528-3.7888c0-0.2048-0.9216-1.6384-1.9456-3.1744s-1.9456-2.9696-1.9456-3.1744c0-0.2048-0.9216-1.7408-1.9456-3.2768s-1.9456-2.9696-1.9456-3.1744-1.024-1.9456-2.2528-3.7888-2.2528-3.4816-2.2528-3.7888c0-0.2048-0.9216-1.6384-1.9456-3.1744-1.1264-1.536-1.9456-2.9696-1.9456-3.1744 0-0.2048-0.7168-1.536-1.7408-3.072a99.0208 99.0208 0 0 1-5.2224-8.9088c-0.8192-1.4336-2.2528-3.8912-3.2768-5.3248-0.9216-1.4336-2.3552-3.6864-3.1744-5.12-0.8192-1.4336-2.1504-3.6864-2.9696-5.12-3.8912-6.5536-3.8912-6.144-1.7408-9.5232 1.4336-2.3552 2.1504-4.3008 2.6624-8.6016 0.4096-3.072 1.3312-6.7584 2.1504-8.2944 2.6624-5.3248-5.632-4.8128 97.792-5.2224l91.8528-0.3072 3.6864-1.4336c5.5296-2.2528 11.3664-8.3968 13.312-14.0288 4.1984-12.1856-0.8192-25.6-11.4688-31.0272-6.2464-3.2768-2.1504-3.1744-99.9424-3.1744-60.416 0-92.7744 0.2048-95.4368 0.7168-13.312 2.1504-24.7808 7.9872-34.0992 17.3056l-4.096 4.1984V148.1728h19.7632c10.8544 0 21.2992-0.3072 23.2448-0.6144 3.1744-0.512 11.8784-3.9936 12.6976-5.12 0.2048-0.2048 1.7408-1.4336 3.3792-2.8672 7.5776-6.0416 13.312-18.2272 13.312-28.16 0-4.096-1.6384-10.5472-3.7888-15.2576-2.3552-5.2224-2.9696-6.0416-8.8064-11.6736-3.4816-3.3792-5.8368-5.0176-9.6256-6.7584l-5.0176-2.2528H257.3312l-5.4272 2.7648c-3.9936 1.9456-6.7584 3.8912-9.9328 7.0656-5.3248 5.2224-8.192 10.1376-9.8304 16.9984-4.4032 17.7152 3.3792 34.4064 19.7632 42.5984l6.144 2.9696 22.6304 0.2048 22.6304 0.2048v225.8944l-1.8432 3.072c-0.9216 1.6384-3.2768 5.3248-5.12 7.9872-1.8432 2.7648-3.2768 5.12-3.2768 5.3248 0 0.3072-3.4816 5.632-6.4512 10.0352-0.7168 0.9216-1.2288 1.9456-1.2288 2.1504 0 0.3072-0.8192 1.6384-1.7408 3.072-1.6384 2.3552-4.9152 7.4752-6.8608 10.752-0.4096 0.6144-1.2288 1.8432-1.8432 2.8672-1.6384 2.56-4.9152 7.5776-7.7824 12.0832-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.8672-1.8432 3.072 0 0.2048-0.8192 1.6384-1.8432 3.072-0.9216 1.4336-2.8672 4.4032-4.1984 6.5536-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 3.072 0 0.2048-0.512 1.1264-1.2288 2.1504-3.2768 4.7104-6.4512 9.728-6.4512 10.1376 0 0.2048-1.024 1.8432-2.2528 3.4816-1.2288 1.7408-2.2528 3.3792-2.2528 3.6864 0 0.3072-0.4096 1.024-0.9216 1.536-0.512 0.512-1.9456 2.6624-3.1744 4.7104-3.3792 5.632-3.4816 5.8368-7.68 12.3904-4.1984 6.656-4.608 7.2704-7.168 11.5712-0.9216 1.6384-2.3552 3.6864-3.1744 4.7104-0.8192 1.024-1.4336 2.1504-1.4336 2.4576 0 0.4096-1.024 1.9456-2.2528 3.584-1.2288 1.6384-2.2528 3.1744-2.2528 3.3792 0 0.4096-5.0176 8.3968-6.7584 10.5472a4.096 4.096 0 0 0-0.9216 1.7408c0 0.2048-0.8192 1.7408-1.8432 3.1744-3.584 5.3248-10.1376 15.5648-10.5472 16.4864-0.2048 0.512-1.9456 3.1744-3.6864 5.7344-3.3792 5.12-9.9328 15.6672-11.5712 18.432-0.512 0.9216-1.4336 2.1504-1.9456 2.8672-0.6144 0.6144-1.4336 1.9456-1.9456 2.9696-0.4096 0.9216-1.6384 2.8672-2.56 4.3008-0.9216 1.4336-2.8672 4.3008-4.096 6.4512-1.3312 2.1504-3.2768 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 3.072 0 0.2048-0.8192 1.6384-1.8432 3.072-0.9216 1.4336-2.8672 4.4032-4.1984 6.5536-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 2.9696 0 0.4096-4.7104 7.9872-5.7344 9.1136-0.6144 0.7168-4.5056 6.9632-6.2464 10.0352-0.4096 0.7168-1.1264 1.7408-1.4336 2.2528-1.9456 2.9696-6.4512 9.8304-6.4512 10.1376 0 0.2048-5.8368 9.3184-10.3424 15.9744-1.024 1.4336-1.8432 2.9696-1.8432 3.3792 0 0.3072-0.6144 1.3312-1.4336 2.3552-1.4336 1.6384-3.8912 5.5296-6.2464 9.6256-0.6144 0.9216-2.6624 4.1984-4.7104 7.2704-1.9456 2.9696-3.6864 5.7344-3.6864 5.9392 0 0.2048-1.024 1.7408-2.2528 3.4816-1.2288 1.6384-2.2528 3.2768-2.2528 3.3792 0 0.2048-1.7408 2.9696-3.8912 6.144-2.1504 3.2768-3.8912 6.0416-3.8912 6.2464 0 0.1024-0.8192 1.536-1.8432 2.9696-3.8912 5.7344-10.3424 15.9744-10.3424 16.384 0 0.2048-0.9216 1.6384-1.9456 2.9696-1.1264 1.4336-1.9456 2.9696-1.9456 3.3792 0 0.4096-0.2048 0.8192-0.4096 0.8192-0.3072 0-1.3312 1.3312-2.3552 3.072-1.024 1.6384-2.8672 4.608-4.096 6.5536-1.3312 1.9456-2.9696 4.608-3.7888 5.9392-3.6864 5.9392-5.0176 8.0896-7.2704 11.4688-1.4336 1.9456-2.4576 3.8912-2.4576 3.9936s-0.512 1.1264-1.2288 2.1504c-2.8672 4.1984-6.4512 9.728-6.4512 10.0352 0 0.3072-4.9152 7.9872-5.7344 9.1136-0.4096 0.4096-1.7408 2.56-3.072 4.7104l-3.3792 5.4272c-1.3312 1.9456-6.0416 9.4208-10.1376 16.1792-3.1744 5.0176-8.0896 14.7456-11.5712 22.4256-0.7168 1.6384-2.3552 6.656-3.7888 11.1616L0 868.352v28.7744l2.1504 6.0416c1.1264 3.3792 2.9696 7.4752 3.9936 9.1136 1.1264 1.7408 1.9456 3.2768 1.9456 3.3792 0 0.8192 5.9392 7.9872 9.1136 10.9568 3.3792 3.2768 12.288 9.8304 13.312 9.8304 0.3072 0 1.9456 0.9216 3.7888 1.9456 1.7408 1.1264 3.7888 1.9456 4.4032 1.9456s1.4336 0.2048 1.8432 0.6144c1.6384 1.6384 17.1008 5.632 26.8288 7.0656 2.1504 0.3072 193.3312 0.512 424.8576 0.4096l421.0688-0.1024 6.0416-1.4336c3.3792-0.8192 7.4752-1.7408 9.0112-2.048 4.8128-0.9216 22.4256-8.6016 23.6544-10.24 0.2048-0.2048 1.024-0.8192 1.8432-1.2288 1.8432-0.9216 8.8064-6.0416 10.6496-7.7824 5.2224-4.9152 11.264-11.264 11.5712-12.288 0.2048-0.6144 0.6144-1.1264 0.8192-1.1264 0.6144 0 6.0416-7.9872 8.0896-11.8784 0.7168-1.4336 1.6384-3.1744 2.048-3.7888 1.7408-3.1744 4.1984-9.3184 5.4272-13.1072 0.6144-2.3552 1.7408-6.3488 2.6624-9.0112l1.4336-4.8128 0.6144-438.1696 1.8432-2.6624c1.024-1.4336 2.4576-2.9696 3.072-3.3792 2.56-1.4336 13.9264-14.0288 13.9264-15.5648 0-0.2048 0.8192-1.6384 1.6384-3.072 0.9216-1.4336 2.7648-5.5296 3.9936-9.1136l2.2528-6.4512v-26.8288zM438.5792 695.9104c-2.56 3.3792-7.9872 6.9632-11.264 7.5776-6.656 1.3312-12.0832 0.2048-16.7936-3.2768-3.8912-2.7648-6.2464-6.144-8.192-11.1616-2.4576-6.4512-0.1024-14.7456 5.9392-20.48 4.9152-4.5056 7.5776-5.632 14.1312-5.632 5.7344 0 6.4512 0.3072 11.6736 3.4816 9.3184 6.0416 11.5712 20.6848 4.5056 29.4912z m48.2304 49.3568c-1.9456 5.3248-5.0176 8.9088-9.9328 11.776-3.3792 1.8432-4.9152 2.3552-8.2944 2.56-6.0416 0.3072-11.4688-1.9456-16.0768-6.7584-7.68-8.0896-7.4752-20.7872 0.6144-28.672 3.6864-3.6864 7.5776-5.4272 12.6976-5.8368 9.6256-0.6144 17.408 4.4032 20.8896 13.5168 1.9456 5.3248 2.048 8.192 0.1024 13.4144z m-74.4448-88.576c-159.9488 0-200.0896-0.2048-199.68-0.7168 0.3072-0.4096 1.3312-2.048 2.3552-3.584 0.9216-1.4336 1.7408-2.8672 1.7408-3.072 0-0.2048 0.8192-1.6384 1.8432-3.072 1.6384-2.2528 2.9696-4.4032 6.144-9.5232 0.3072-0.6144 1.9456-3.1744 3.4816-5.7344 1.6384-2.4576 3.2768-5.3248 3.8912-6.2464 0.512-0.9216 1.1264-1.8432 1.3312-2.048 0.4096-0.3072 4.1984-6.4512 6.3488-10.1376 1.024-1.7408 6.4512-10.24 10.6496-16.4864 1.2288-1.7408 2.1504-3.4816 2.1504-3.6864 0-0.3072 0.6144-1.3312 1.3312-2.1504 1.536-2.048 5.4272-7.9872 7.0656-10.6496 2.6624-4.5056 5.5296-9.0112 6.5536-10.1376 0.6144-0.7168 1.1264-1.4336 1.1264-1.7408 0-0.512 0.9216-1.9456 8.0896-13.0048 2.048-3.1744 4.1984-6.5536 4.7104-7.4752 2.2528-4.096 4.8128-7.9872 6.2464-9.6256 0.8192-1.024 1.4336-2.1504 1.4336-2.3552 0-0.3072 0.9216-1.9456 2.048-3.6864 4.4032-6.656 5.4272-8.2944 5.8368-9.1136l2.9696-4.8128c1.4336-2.1504 3.7888-5.8368 5.2224-8.2944 1.536-2.4576 3.1744-5.0176 3.6864-5.8368 1.1264-1.6384 3.9936-6.144 8.2944-13.1072 1.6384-2.4576 3.3792-5.2224 3.8912-6.0416 2.1504-3.1744 6.7584-10.8544 7.5776-12.4928 0.512-0.9216 1.1264-1.7408 1.3312-1.9456 0.512-0.3072 4.5056-6.656 6.4512-10.24 0.6144-1.024 1.8432-2.8672 2.7648-4.096 0.9216-1.2288 1.6384-2.4576 1.6384-2.6624 0-0.3072 0.8192-1.6384 1.7408-3.072 4.7104-6.9632 6.5536-9.8304 6.5536-10.5472 0-0.4096 0.4096-1.024 0.9216-1.4336 0.8192-0.6144 2.3552-3.072 6.144-9.5232 1.4336-2.4576 6.2464-9.8304 6.8608-10.6496 0.3072-0.3072 0.9216-1.3312 1.4336-2.2528 0.4096-0.8192 2.4576-4.096 4.608-7.168 2.048-3.072 3.6864-5.7344 3.6864-5.9392 0-0.1024 0.9216-1.536 1.9456-3.072l1.9456-2.8672V148.1728h71.0656V272.384c0 109.568 0.1024 124.2112 0.9216 124.928 0.512 0.4096 0.9216 1.024 0.9216 1.2288 0 0.3072 1.4336 2.56 3.072 5.2224 1.7408 2.6624 4.5056 6.9632 6.144 9.5232 1.7408 2.6624 3.8912 6.0416 4.9152 7.4752 1.024 1.4336 1.8432 2.8672 1.8432 2.9696 0 0.4096 4.7104 7.9872 5.7344 9.1136 0.6144 0.8192 4.5056 6.9632 6.2464 10.0352 0.4096 0.7168 1.1264 1.8432 1.4336 2.3552 2.4576 3.4816 6.4512 9.8304 6.4512 10.24 0 0.2048 1.024 1.7408 2.2528 3.3792s2.2528 3.1744 2.2528 3.4816c0 0.3072 0.9216 1.6384 1.9456 2.9696 1.1264 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.4096 0.8192 1.7408 1.9456 3.072 1.024 1.3312 1.9456 2.6624 1.9456 2.8672 0 0.4096 4.5056 7.5776 7.0656 11.1616 0.4096 0.512 1.024 1.6384 1.4336 2.3552 2.1504 3.7888 5.7344 9.6256 6.2464 9.8304 0.2048 0.2048 0.8192 1.1264 1.3312 1.9456 1.1264 2.1504 5.5296 9.216 8.9088 14.336 1.4336 2.1504 2.7648 4.3008 2.9696 4.8128 0.2048 0.512 1.1264 2.1504 2.1504 3.4816 3.2768 4.8128 8.8064 13.5168 10.3424 16.0768 2.7648 4.8128 5.3248 8.8064 8.704 13.824 1.8432 2.8672 3.3792 5.2224 3.3792 5.4272 0 0.1024 0.8192 1.4336 1.8432 2.9696 1.024 1.4336 2.56 3.7888 3.4816 5.2224 0.8192 1.4336 2.56 4.1984 3.8912 6.0416 1.2288 1.9456 3.584 5.7344 5.2224 8.2944 1.6384 2.6624 3.2768 5.12 3.6864 5.5296 0.3072 0.4096 1.1264 1.7408 1.8432 2.8672 2.048 3.584 5.5296 9.1136 5.9392 9.5232 0.2048 0.2048 1.3312 1.9456 2.4576 3.9936 1.1264 1.9456 2.4576 3.9936 2.9696 4.4032 0.512 0.4096 0.9216 1.1264 0.9216 1.4336s1.1264 2.3552 2.3552 4.1984c1.3312 1.9456 2.9696 4.7104 3.8912 6.0416 0.8192 1.3312 2.2528 3.4816 3.2768 5.0176 0.9216 1.4336 2.3552 3.4816 2.9696 4.7104 3.4816 5.7344 6.2464 10.24 6.656 10.5472 0.2048 0.2048 0.8192 1.1264 1.3312 2.048 0.512 0.9216 2.2528 3.7888 3.8912 6.2464 1.6384 2.56 3.1744 5.2224 3.584 5.9392 0.4096 0.7168 1.1264 1.6384 1.4336 1.9456 0.4096 0.4096 0.7168 0.9216 0.7168 1.2288s-90.2144 1.024-200.2944 1.024z m444.5184 241.4592c-7.5776 0-6.7584 0.512-11.5712-7.2704-3.3792-5.5296-8.2944-13.5168-10.0352-15.9744-2.048-3.1744-6.7584-10.8544-7.7824-12.5952-0.6144-1.024-1.7408-2.8672-2.7648-4.096-0.9216-1.2288-1.6384-2.4576-1.6384-2.8672 0-0.2048-0.8192-1.6384-1.9456-3.072-1.024-1.3312-1.9456-2.7648-1.9456-2.9696 0-0.4096-2.3552-4.096-3.1744-4.9152a14.1312 14.1312 0 0 1-1.3312-2.048c-0.9216-1.536-4.7104-7.68-7.9872-12.9024-0.7168-1.1264-2.1504-3.4816-3.1744-5.2224-1.024-1.7408-3.3792-5.4272-5.2224-8.192s-3.3792-5.2224-3.3792-5.4272c0-0.2048-0.8192-1.6384-1.9456-2.9696-1.024-1.3312-1.9456-2.7648-1.9456-2.9696 0-0.3072-0.8192-1.7408-1.8432-3.1744l-4.8128-7.4752c-1.6384-2.6624-3.2768-5.2224-3.584-5.7344-2.9696-4.5056-5.7344-9.1136-5.7344-9.3184 0-0.2048-0.8192-1.536-1.8432-2.9696-2.4576-3.6864-5.8368-9.0112-9.5232-15.1552-0.9216-1.6384-2.1504-3.4816-2.7648-4.1984-0.6144-0.7168-1.4336-1.9456-1.8432-2.8672-0.4096-0.9216-1.8432-3.3792-3.1744-5.4272-3.3792-5.2224-7.7824-12.1856-8.9088-14.336-0.512-0.9216-1.1264-1.7408-1.3312-1.9456-0.2048-0.2048-1.2288-1.7408-2.2528-3.4816s-2.4576-3.9936-3.3792-5.0176c-0.8192-1.024-1.4336-2.1504-1.4336-2.4576s-0.8192-1.7408-1.9456-3.072c-1.024-1.3312-1.9456-2.6624-1.9456-2.9696 0-0.3072-0.8192-1.7408-1.9456-3.1744-1.024-1.3312-1.9456-2.6624-1.9456-2.9696 0-0.2048-1.9456-3.4816-4.3008-7.168-2.4576-3.6864-4.9152-7.4752-5.4272-8.4992-1.3312-2.048-1.9456-3.1744-4.5056-7.0656-1.024-1.4336-1.7408-2.7648-1.7408-2.9696 0-0.2048-1.2288-2.1504-2.6624-4.5056-3.4816-5.2224-7.2704-11.264-9.728-15.4624-1.024-1.7408-2.2528-3.4816-2.6624-3.9936-0.512-0.4096-0.9216-1.1264-0.9216-1.4336 0-0.3072-1.024-1.9456-2.2528-3.6864-1.2288-1.6384-2.2528-3.3792-2.2528-3.584 0-0.2048-0.8192-1.6384-1.7408-3.072-4.9152-7.2704-5.9392-8.8064-5.9392-9.4208 0-0.3072-0.6144-1.3312-1.4336-2.3552-0.8192-0.9216-2.3552-3.1744-3.3792-4.9152-3.9936-6.656-8.9088-14.6432-11.4688-18.6368-0.7168-1.1264-2.1504-3.4816-3.1744-5.2224-1.024-1.7408-2.048-3.2768-2.2528-3.4816-0.3072-0.2048-3.3792-5.0176-5.9392-9.3184-1.7408-2.9696-5.3248-8.4992-6.9632-11.0592-0.9216-1.4336-1.7408-2.8672-1.7408-2.9696 0-0.2048-1.536-2.7648-3.3792-5.7344-7.2704-11.1616-12.5952-19.7632-12.5952-20.0704 0-0.2048-0.6144-1.3312-1.4336-2.3552-0.8192-1.1264-2.9696-4.4032-4.8128-7.4752-1.8432-2.9696-4.5056-7.2704-6.0416-9.6256-2.7648-4.4032-3.072-4.9152-7.4752-11.8784-3.7888-6.144-3.9936-6.5536-6.3488-10.0352-1.1264-1.6384-2.1504-3.2768-2.1504-3.4816 0-0.2048-0.6144-1.2288-1.4336-2.3552-3.4816-4.9152-5.5296-8.8064-4.608-8.8064 0.512 0 2.7648-0.8192 4.9152-1.7408 7.0656-3.2768 7.0656-3.2768 9.8304 1.2288 1.3312 2.2528 2.56 4.1984 2.7648 4.4032 0.2048 0.2048 0.7168 1.024 1.1264 1.9456 0.4096 0.9216 2.048 3.6864 3.6864 6.0416 2.6624 4.1984 5.632 9.0112 7.5776 12.1856 0.4096 0.7168 1.3312 2.1504 2.1504 3.1744 0.7168 1.1264 2.2528 3.584 3.4816 5.7344 1.2288 2.048 2.6624 4.4032 3.1744 5.2224 0.512 0.8192 2.048 3.3792 3.3792 5.632 1.3312 2.3552 2.7648 4.5056 3.2768 4.9152 0.512 0.4096 0.9216 1.024 0.9216 1.3312s1.4336 2.7648 3.1744 5.5296c1.7408 2.7648 4.1984 6.8608 5.5296 9.1136 1.3312 2.2528 2.8672 4.7104 3.3792 5.5296 2.3552 3.3792 9.216 14.6432 10.3424 16.7936 0.4096 0.8192 1.024 1.4336 1.3312 1.4336s0.512 0.4096 0.512 0.8192 0.8192 1.9456 1.9456 3.3792c1.024 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.2048 1.8432 3.3792 4.1984 6.9632 2.2528 3.4816 4.1984 6.5536 4.1984 6.7584s0.6144 1.3312 1.4336 2.3552c0.8192 1.1264 2.8672 4.5056 4.7104 7.4752s4.5056 7.2704 5.9392 9.6256c1.4336 2.3552 2.9696 4.7104 3.3792 5.4272 0.4096 0.7168 1.536 2.4576 2.56 3.9936 0.9216 1.4336 1.7408 2.8672 1.7408 3.072 0 0.2048 0.8192 1.6384 1.8432 3.072 1.6384 2.3552 4.9152 7.5776 6.7584 10.752 0.4096 0.6144 1.8432 3.072 3.3792 5.4272 1.4336 2.4576 3.072 5.0176 3.4816 5.7344 2.048 3.3792 5.3248 8.6016 7.0656 11.0592 0.9216 1.4336 1.7408 2.7648 1.7408 3.072 0 0.2048 0.8192 1.6384 1.8432 3.072 0.9216 1.4336 2.1504 3.2768 2.4576 3.9936 0.4096 0.7168 2.048 3.2768 3.4816 5.632 1.536 2.4576 3.1744 5.2224 3.7888 6.2464 0.6144 1.024 1.8432 2.8672 2.7648 4.096 0.9216 1.2288 1.6384 2.4576 1.6384 2.8672 0 0.2048 0.8192 1.6384 1.9456 3.072 1.024 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.3072 1.8432 3.3792 4.1984 6.9632 2.2528 3.4816 4.1984 6.5536 4.1984 6.7584s0.6144 1.2288 1.4336 2.3552a847.59552 847.59552 0 0 1 10.752 17.3056c2.9696 4.8128 4.1984 6.7584 7.4752 11.9808 1.1264 1.9456 3.2768 5.3248 4.7104 7.5776 1.4336 2.2528 3.072 4.9152 3.6864 5.8368 0.6144 0.9216 2.2528 3.7888 3.8912 6.3488s3.2768 5.3248 3.7888 6.3488c0.512 0.9216 1.1264 1.7408 1.3312 1.9456 0.2048 0.2048 1.2288 1.7408 2.2528 3.4816s2.4576 4.096 3.1744 5.12c0.7168 1.1264 1.7408 2.6624 2.2528 3.6864 0.4096 0.9216 1.3312 2.3552 2.048 2.9696 0.6144 0.7168 1.1264 1.536 1.1264 1.7408 0.1024 0.2048 1.6384 2.9696 3.4816 5.9392 1.9456 2.9696 4.8128 7.7824 6.5536 10.5472 1.6384 2.7648 3.6864 6.0416 4.5056 7.0656 0.8192 1.1264 1.4336 2.1504 1.4336 2.3552 0 0.3072 1.9456 3.4816 4.4032 7.0656 2.3552 3.6864 5.2224 8.192 6.2464 10.0352 1.1264 1.7408 3.4816 5.632 5.3248 8.4992 1.8432 2.8672 4.4032 6.7584 5.4272 8.704l2.9696 4.8128c0.512 0.8192 2.048 3.3792 3.3792 5.7344 1.3312 2.3552 2.7648 4.4032 3.072 4.608 0.3072 0.2048 1.024 1.2288 1.536 2.3552 0.512 1.1264 2.1504 3.7888 3.4816 5.9392 1.4336 2.1504 3.584 5.632 4.9152 7.7824 1.2288 2.1504 2.56 4.1984 2.8672 4.4032 0.4096 0.2048 0.6144 0.6144 0.6144 1.024 0.2048-0.1024-2.6624 0.2048-6.4512 0.2048z m88.3712-238.2848c-4.8128 1.2288-7.0656 1.2288-53.4528 1.2288-46.3872 0-48.64-0.1024-53.248-1.3312-5.8368-1.6384-10.4448-4.5056-11.8784-7.68-0.9216-2.048-0.9216-2.56-0.1024-4.5056 1.3312-2.9696 3.072-4.4032 8.8064-7.0656l4.8128-2.1504 47.104-0.2048c26.112-0.1024 49.664 0.1024 52.8384 0.4096 10.1376 1.024 18.2272 5.9392 18.2272 10.9568 0 4.1984-5.2224 8.2944-13.1072 10.3424z m1.536-77.0048c-2.9696 0.9216-8.2944 1.1264-40.96 1.2288-34.4064 0.2048-37.888 0.1024-41.984-0.9216a53.8624 53.8624 0 0 1-5.7344-1.7408c-13.1072-5.9392-8.704-16.4864 7.9872-19.2512 7.0656-1.1264 67.3792-1.3312 75.6736-0.2048 8.8064 1.2288 16.5888 6.144 16.5888 10.6496 0 3.8912-4.9152 8.192-11.5712 10.24z" fill="#585858" p-id="8274"></path><path d="M433.8688 560.3328c-7.2704 0-12.3904 3.584-15.0528 10.752-2.6624 7.168 1.7408 16.6912 9.0112 19.456 1.7408 0.6144 3.9936 0.8192 7.2704 0.6144 5.7344-0.4096 8.8064-2.1504 12.0832-6.9632 3.6864-5.5296 3.4816-11.5712-0.6144-17.6128-3.072-4.1984-7.168-6.2464-12.6976-6.2464zM519.8848 613.0688c-3.8912-1.9456-4.9152-2.1504-9.8304-2.1504-5.0176 0-5.7344 0.2048-10.0352 2.4576-5.4272 2.8672-8.2944 6.0416-10.3424 11.776-4.5056 12.3904 1.3312 23.9616 14.5408 29.2864 0.512 0.2048 3.584 0.2048 6.7584 0.2048 4.9152-0.1024 6.2464-0.4096 9.1136-2.048 4.9152-2.6624 8.6016-6.9632 10.24-11.8784 3.9936-11.264-0.4096-22.6304-10.4448-27.648zM424.1408 522.0352c2.1504 1.024 9.5232 0.6144 11.5712-0.6144 4.4032-2.7648 5.9392-10.5472 2.9696-15.4624-1.9456-3.4816-3.4816-4.4032-7.9872-4.7104-4.9152-0.4096-7.5776 0.512-10.1376 3.7888-3.4816 4.5056-3.4816 9.3184-0.1024 13.7216 1.1264 1.4336 2.7648 2.8672 3.6864 3.2768z" fill="#585858" p-id="8275"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585833732" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8273" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1023.8976 364.3392l-2.2528-6.144c-7.3728-19.8656-21.6064-32.9728-41.984-38.8096l-6.2464-1.7408H866.5088l-4.1984 1.9456c-5.4272 2.56-9.6256 6.5536-12.288 11.776-2.048 3.9936-2.1504 4.5056-2.1504 11.264 0 6.656 0.1024 7.2704 2.048 10.8544 3.4816 6.5536 7.8848 10.4448 14.2336 12.4928 3.8912 1.2288 5.632 1.3312 52.224 1.3312 55.3984 0 53.4528-0.2048 56.7296 5.0176 3.4816 5.5296 2.2528 9.9328-3.9936 15.4624-3.6864 3.072-7.4752 7.0656-10.5472 11.1616-1.8432 2.4576-2.4576 3.3792-5.4272 9.4208-0.7168 1.3312-2.1504 5.0176-3.2768 8.2944l-2.048 5.9392-0.3072 28.2624-0.2048 28.2624-6.4512 0.4096c-3.584 0.2048-39.5264 0.8192-79.872 1.3312s-113.4592 1.536-162.6112 2.3552l-89.2928 1.3312-1.4336-1.8432c-0.8192-0.9216-1.4336-2.1504-1.4336-2.56 0-0.4096-0.4096-1.1264-0.9216-1.6384a21.1968 21.1968 0 0 1-2.3552-3.6864c-0.7168-1.536-2.1504-3.6864-2.9696-4.8128a10.02496 10.02496 0 0 1-1.4336-2.4576c0-0.2048-0.9216-1.7408-1.9456-3.2768-1.1264-1.536-1.9456-2.9696-1.9456-3.1744 0-0.2048-1.024-1.9456-2.2528-3.7888s-2.2528-3.4816-2.2528-3.7888c0-0.2048-0.9216-1.6384-1.9456-3.1744s-1.9456-2.9696-1.9456-3.1744c0-0.2048-0.9216-1.7408-1.9456-3.2768s-1.9456-2.9696-1.9456-3.1744-1.024-1.9456-2.2528-3.7888-2.2528-3.4816-2.2528-3.7888c0-0.2048-0.9216-1.6384-1.9456-3.1744-1.1264-1.536-1.9456-2.9696-1.9456-3.1744 0-0.2048-0.7168-1.536-1.7408-3.072a99.0208 99.0208 0 0 1-5.2224-8.9088c-0.8192-1.4336-2.2528-3.8912-3.2768-5.3248-0.9216-1.4336-2.3552-3.6864-3.1744-5.12-0.8192-1.4336-2.1504-3.6864-2.9696-5.12-3.8912-6.5536-3.8912-6.144-1.7408-9.5232 1.4336-2.3552 2.1504-4.3008 2.6624-8.6016 0.4096-3.072 1.3312-6.7584 2.1504-8.2944 2.6624-5.3248-5.632-4.8128 97.792-5.2224l91.8528-0.3072 3.6864-1.4336c5.5296-2.2528 11.3664-8.3968 13.312-14.0288 4.1984-12.1856-0.8192-25.6-11.4688-31.0272-6.2464-3.2768-2.1504-3.1744-99.9424-3.1744-60.416 0-92.7744 0.2048-95.4368 0.7168-13.312 2.1504-24.7808 7.9872-34.0992 17.3056l-4.096 4.1984V148.1728h19.7632c10.8544 0 21.2992-0.3072 23.2448-0.6144 3.1744-0.512 11.8784-3.9936 12.6976-5.12 0.2048-0.2048 1.7408-1.4336 3.3792-2.8672 7.5776-6.0416 13.312-18.2272 13.312-28.16 0-4.096-1.6384-10.5472-3.7888-15.2576-2.3552-5.2224-2.9696-6.0416-8.8064-11.6736-3.4816-3.3792-5.8368-5.0176-9.6256-6.7584l-5.0176-2.2528H257.3312l-5.4272 2.7648c-3.9936 1.9456-6.7584 3.8912-9.9328 7.0656-5.3248 5.2224-8.192 10.1376-9.8304 16.9984-4.4032 17.7152 3.3792 34.4064 19.7632 42.5984l6.144 2.9696 22.6304 0.2048 22.6304 0.2048v225.8944l-1.8432 3.072c-0.9216 1.6384-3.2768 5.3248-5.12 7.9872-1.8432 2.7648-3.2768 5.12-3.2768 5.3248 0 0.3072-3.4816 5.632-6.4512 10.0352-0.7168 0.9216-1.2288 1.9456-1.2288 2.1504 0 0.3072-0.8192 1.6384-1.7408 3.072-1.6384 2.3552-4.9152 7.4752-6.8608 10.752-0.4096 0.6144-1.2288 1.8432-1.8432 2.8672-1.6384 2.56-4.9152 7.5776-7.7824 12.0832-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.8672-1.8432 3.072 0 0.2048-0.8192 1.6384-1.8432 3.072-0.9216 1.4336-2.8672 4.4032-4.1984 6.5536-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 3.072 0 0.2048-0.512 1.1264-1.2288 2.1504-3.2768 4.7104-6.4512 9.728-6.4512 10.1376 0 0.2048-1.024 1.8432-2.2528 3.4816-1.2288 1.7408-2.2528 3.3792-2.2528 3.6864 0 0.3072-0.4096 1.024-0.9216 1.536-0.512 0.512-1.9456 2.6624-3.1744 4.7104-3.3792 5.632-3.4816 5.8368-7.68 12.3904-4.1984 6.656-4.608 7.2704-7.168 11.5712-0.9216 1.6384-2.3552 3.6864-3.1744 4.7104-0.8192 1.024-1.4336 2.1504-1.4336 2.4576 0 0.4096-1.024 1.9456-2.2528 3.584-1.2288 1.6384-2.2528 3.1744-2.2528 3.3792 0 0.4096-5.0176 8.3968-6.7584 10.5472a4.096 4.096 0 0 0-0.9216 1.7408c0 0.2048-0.8192 1.7408-1.8432 3.1744-3.584 5.3248-10.1376 15.5648-10.5472 16.4864-0.2048 0.512-1.9456 3.1744-3.6864 5.7344-3.3792 5.12-9.9328 15.6672-11.5712 18.432-0.512 0.9216-1.4336 2.1504-1.9456 2.8672-0.6144 0.6144-1.4336 1.9456-1.9456 2.9696-0.4096 0.9216-1.6384 2.8672-2.56 4.3008-0.9216 1.4336-2.8672 4.3008-4.096 6.4512-1.3312 2.1504-3.2768 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 3.072 0 0.2048-0.8192 1.6384-1.8432 3.072-0.9216 1.4336-2.8672 4.4032-4.1984 6.5536-1.3312 2.1504-3.1744 5.0176-4.1984 6.5536-1.024 1.4336-1.8432 2.7648-1.8432 2.9696 0 0.4096-4.7104 7.9872-5.7344 9.1136-0.6144 0.7168-4.5056 6.9632-6.2464 10.0352-0.4096 0.7168-1.1264 1.7408-1.4336 2.2528-1.9456 2.9696-6.4512 9.8304-6.4512 10.1376 0 0.2048-5.8368 9.3184-10.3424 15.9744-1.024 1.4336-1.8432 2.9696-1.8432 3.3792 0 0.3072-0.6144 1.3312-1.4336 2.3552-1.4336 1.6384-3.8912 5.5296-6.2464 9.6256-0.6144 0.9216-2.6624 4.1984-4.7104 7.2704-1.9456 2.9696-3.6864 5.7344-3.6864 5.9392 0 0.2048-1.024 1.7408-2.2528 3.4816-1.2288 1.6384-2.2528 3.2768-2.2528 3.3792 0 0.2048-1.7408 2.9696-3.8912 6.144-2.1504 3.2768-3.8912 6.0416-3.8912 6.2464 0 0.1024-0.8192 1.536-1.8432 2.9696-3.8912 5.7344-10.3424 15.9744-10.3424 16.384 0 0.2048-0.9216 1.6384-1.9456 2.9696-1.1264 1.4336-1.9456 2.9696-1.9456 3.3792 0 0.4096-0.2048 0.8192-0.4096 0.8192-0.3072 0-1.3312 1.3312-2.3552 3.072-1.024 1.6384-2.8672 4.608-4.096 6.5536-1.3312 1.9456-2.9696 4.608-3.7888 5.9392-3.6864 5.9392-5.0176 8.0896-7.2704 11.4688-1.4336 1.9456-2.4576 3.8912-2.4576 3.9936s-0.512 1.1264-1.2288 2.1504c-2.8672 4.1984-6.4512 9.728-6.4512 10.0352 0 0.3072-4.9152 7.9872-5.7344 9.1136-0.4096 0.4096-1.7408 2.56-3.072 4.7104l-3.3792 5.4272c-1.3312 1.9456-6.0416 9.4208-10.1376 16.1792-3.1744 5.0176-8.0896 14.7456-11.5712 22.4256-0.7168 1.6384-2.3552 6.656-3.7888 11.1616L0 868.352v28.7744l2.1504 6.0416c1.1264 3.3792 2.9696 7.4752 3.9936 9.1136 1.1264 1.7408 1.9456 3.2768 1.9456 3.3792 0 0.8192 5.9392 7.9872 9.1136 10.9568 3.3792 3.2768 12.288 9.8304 13.312 9.8304 0.3072 0 1.9456 0.9216 3.7888 1.9456 1.7408 1.1264 3.7888 1.9456 4.4032 1.9456s1.4336 0.2048 1.8432 0.6144c1.6384 1.6384 17.1008 5.632 26.8288 7.0656 2.1504 0.3072 193.3312 0.512 424.8576 0.4096l421.0688-0.1024 6.0416-1.4336c3.3792-0.8192 7.4752-1.7408 9.0112-2.048 4.8128-0.9216 22.4256-8.6016 23.6544-10.24 0.2048-0.2048 1.024-0.8192 1.8432-1.2288 1.8432-0.9216 8.8064-6.0416 10.6496-7.7824 5.2224-4.9152 11.264-11.264 11.5712-12.288 0.2048-0.6144 0.6144-1.1264 0.8192-1.1264 0.6144 0 6.0416-7.9872 8.0896-11.8784 0.7168-1.4336 1.6384-3.1744 2.048-3.7888 1.7408-3.1744 4.1984-9.3184 5.4272-13.1072 0.6144-2.3552 1.7408-6.3488 2.6624-9.0112l1.4336-4.8128 0.6144-438.1696 1.8432-2.6624c1.024-1.4336 2.4576-2.9696 3.072-3.3792 2.56-1.4336 13.9264-14.0288 13.9264-15.5648 0-0.2048 0.8192-1.6384 1.6384-3.072 0.9216-1.4336 2.7648-5.5296 3.9936-9.1136l2.2528-6.4512v-26.8288zM438.5792 695.9104c-2.56 3.3792-7.9872 6.9632-11.264 7.5776-6.656 1.3312-12.0832 0.2048-16.7936-3.2768-3.8912-2.7648-6.2464-6.144-8.192-11.1616-2.4576-6.4512-0.1024-14.7456 5.9392-20.48 4.9152-4.5056 7.5776-5.632 14.1312-5.632 5.7344 0 6.4512 0.3072 11.6736 3.4816 9.3184 6.0416 11.5712 20.6848 4.5056 29.4912z m48.2304 49.3568c-1.9456 5.3248-5.0176 8.9088-9.9328 11.776-3.3792 1.8432-4.9152 2.3552-8.2944 2.56-6.0416 0.3072-11.4688-1.9456-16.0768-6.7584-7.68-8.0896-7.4752-20.7872 0.6144-28.672 3.6864-3.6864 7.5776-5.4272 12.6976-5.8368 9.6256-0.6144 17.408 4.4032 20.8896 13.5168 1.9456 5.3248 2.048 8.192 0.1024 13.4144z m-74.4448-88.576c-159.9488 0-200.0896-0.2048-199.68-0.7168 0.3072-0.4096 1.3312-2.048 2.3552-3.584 0.9216-1.4336 1.7408-2.8672 1.7408-3.072 0-0.2048 0.8192-1.6384 1.8432-3.072 1.6384-2.2528 2.9696-4.4032 6.144-9.5232 0.3072-0.6144 1.9456-3.1744 3.4816-5.7344 1.6384-2.4576 3.2768-5.3248 3.8912-6.2464 0.512-0.9216 1.1264-1.8432 1.3312-2.048 0.4096-0.3072 4.1984-6.4512 6.3488-10.1376 1.024-1.7408 6.4512-10.24 10.6496-16.4864 1.2288-1.7408 2.1504-3.4816 2.1504-3.6864 0-0.3072 0.6144-1.3312 1.3312-2.1504 1.536-2.048 5.4272-7.9872 7.0656-10.6496 2.6624-4.5056 5.5296-9.0112 6.5536-10.1376 0.6144-0.7168 1.1264-1.4336 1.1264-1.7408 0-0.512 0.9216-1.9456 8.0896-13.0048 2.048-3.1744 4.1984-6.5536 4.7104-7.4752 2.2528-4.096 4.8128-7.9872 6.2464-9.6256 0.8192-1.024 1.4336-2.1504 1.4336-2.3552 0-0.3072 0.9216-1.9456 2.048-3.6864 4.4032-6.656 5.4272-8.2944 5.8368-9.1136l2.9696-4.8128c1.4336-2.1504 3.7888-5.8368 5.2224-8.2944 1.536-2.4576 3.1744-5.0176 3.6864-5.8368 1.1264-1.6384 3.9936-6.144 8.2944-13.1072 1.6384-2.4576 3.3792-5.2224 3.8912-6.0416 2.1504-3.1744 6.7584-10.8544 7.5776-12.4928 0.512-0.9216 1.1264-1.7408 1.3312-1.9456 0.512-0.3072 4.5056-6.656 6.4512-10.24 0.6144-1.024 1.8432-2.8672 2.7648-4.096 0.9216-1.2288 1.6384-2.4576 1.6384-2.6624 0-0.3072 0.8192-1.6384 1.7408-3.072 4.7104-6.9632 6.5536-9.8304 6.5536-10.5472 0-0.4096 0.4096-1.024 0.9216-1.4336 0.8192-0.6144 2.3552-3.072 6.144-9.5232 1.4336-2.4576 6.2464-9.8304 6.8608-10.6496 0.3072-0.3072 0.9216-1.3312 1.4336-2.2528 0.4096-0.8192 2.4576-4.096 4.608-7.168 2.048-3.072 3.6864-5.7344 3.6864-5.9392 0-0.1024 0.9216-1.536 1.9456-3.072l1.9456-2.8672V148.1728h71.0656V272.384c0 109.568 0.1024 124.2112 0.9216 124.928 0.512 0.4096 0.9216 1.024 0.9216 1.2288 0 0.3072 1.4336 2.56 3.072 5.2224 1.7408 2.6624 4.5056 6.9632 6.144 9.5232 1.7408 2.6624 3.8912 6.0416 4.9152 7.4752 1.024 1.4336 1.8432 2.8672 1.8432 2.9696 0 0.4096 4.7104 7.9872 5.7344 9.1136 0.6144 0.8192 4.5056 6.9632 6.2464 10.0352 0.4096 0.7168 1.1264 1.8432 1.4336 2.3552 2.4576 3.4816 6.4512 9.8304 6.4512 10.24 0 0.2048 1.024 1.7408 2.2528 3.3792s2.2528 3.1744 2.2528 3.4816c0 0.3072 0.9216 1.6384 1.9456 2.9696 1.1264 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.4096 0.8192 1.7408 1.9456 3.072 1.024 1.3312 1.9456 2.6624 1.9456 2.8672 0 0.4096 4.5056 7.5776 7.0656 11.1616 0.4096 0.512 1.024 1.6384 1.4336 2.3552 2.1504 3.7888 5.7344 9.6256 6.2464 9.8304 0.2048 0.2048 0.8192 1.1264 1.3312 1.9456 1.1264 2.1504 5.5296 9.216 8.9088 14.336 1.4336 2.1504 2.7648 4.3008 2.9696 4.8128 0.2048 0.512 1.1264 2.1504 2.1504 3.4816 3.2768 4.8128 8.8064 13.5168 10.3424 16.0768 2.7648 4.8128 5.3248 8.8064 8.704 13.824 1.8432 2.8672 3.3792 5.2224 3.3792 5.4272 0 0.1024 0.8192 1.4336 1.8432 2.9696 1.024 1.4336 2.56 3.7888 3.4816 5.2224 0.8192 1.4336 2.56 4.1984 3.8912 6.0416 1.2288 1.9456 3.584 5.7344 5.2224 8.2944 1.6384 2.6624 3.2768 5.12 3.6864 5.5296 0.3072 0.4096 1.1264 1.7408 1.8432 2.8672 2.048 3.584 5.5296 9.1136 5.9392 9.5232 0.2048 0.2048 1.3312 1.9456 2.4576 3.9936 1.1264 1.9456 2.4576 3.9936 2.9696 4.4032 0.512 0.4096 0.9216 1.1264 0.9216 1.4336s1.1264 2.3552 2.3552 4.1984c1.3312 1.9456 2.9696 4.7104 3.8912 6.0416 0.8192 1.3312 2.2528 3.4816 3.2768 5.0176 0.9216 1.4336 2.3552 3.4816 2.9696 4.7104 3.4816 5.7344 6.2464 10.24 6.656 10.5472 0.2048 0.2048 0.8192 1.1264 1.3312 2.048 0.512 0.9216 2.2528 3.7888 3.8912 6.2464 1.6384 2.56 3.1744 5.2224 3.584 5.9392 0.4096 0.7168 1.1264 1.6384 1.4336 1.9456 0.4096 0.4096 0.7168 0.9216 0.7168 1.2288s-90.2144 1.024-200.2944 1.024z m444.5184 241.4592c-7.5776 0-6.7584 0.512-11.5712-7.2704-3.3792-5.5296-8.2944-13.5168-10.0352-15.9744-2.048-3.1744-6.7584-10.8544-7.7824-12.5952-0.6144-1.024-1.7408-2.8672-2.7648-4.096-0.9216-1.2288-1.6384-2.4576-1.6384-2.8672 0-0.2048-0.8192-1.6384-1.9456-3.072-1.024-1.3312-1.9456-2.7648-1.9456-2.9696 0-0.4096-2.3552-4.096-3.1744-4.9152a14.1312 14.1312 0 0 1-1.3312-2.048c-0.9216-1.536-4.7104-7.68-7.9872-12.9024-0.7168-1.1264-2.1504-3.4816-3.1744-5.2224-1.024-1.7408-3.3792-5.4272-5.2224-8.192s-3.3792-5.2224-3.3792-5.4272c0-0.2048-0.8192-1.6384-1.9456-2.9696-1.024-1.3312-1.9456-2.7648-1.9456-2.9696 0-0.3072-0.8192-1.7408-1.8432-3.1744l-4.8128-7.4752c-1.6384-2.6624-3.2768-5.2224-3.584-5.7344-2.9696-4.5056-5.7344-9.1136-5.7344-9.3184 0-0.2048-0.8192-1.536-1.8432-2.9696-2.4576-3.6864-5.8368-9.0112-9.5232-15.1552-0.9216-1.6384-2.1504-3.4816-2.7648-4.1984-0.6144-0.7168-1.4336-1.9456-1.8432-2.8672-0.4096-0.9216-1.8432-3.3792-3.1744-5.4272-3.3792-5.2224-7.7824-12.1856-8.9088-14.336-0.512-0.9216-1.1264-1.7408-1.3312-1.9456-0.2048-0.2048-1.2288-1.7408-2.2528-3.4816s-2.4576-3.9936-3.3792-5.0176c-0.8192-1.024-1.4336-2.1504-1.4336-2.4576s-0.8192-1.7408-1.9456-3.072c-1.024-1.3312-1.9456-2.6624-1.9456-2.9696 0-0.3072-0.8192-1.7408-1.9456-3.1744-1.024-1.3312-1.9456-2.6624-1.9456-2.9696 0-0.2048-1.9456-3.4816-4.3008-7.168-2.4576-3.6864-4.9152-7.4752-5.4272-8.4992-1.3312-2.048-1.9456-3.1744-4.5056-7.0656-1.024-1.4336-1.7408-2.7648-1.7408-2.9696 0-0.2048-1.2288-2.1504-2.6624-4.5056-3.4816-5.2224-7.2704-11.264-9.728-15.4624-1.024-1.7408-2.2528-3.4816-2.6624-3.9936-0.512-0.4096-0.9216-1.1264-0.9216-1.4336 0-0.3072-1.024-1.9456-2.2528-3.6864-1.2288-1.6384-2.2528-3.3792-2.2528-3.584 0-0.2048-0.8192-1.6384-1.7408-3.072-4.9152-7.2704-5.9392-8.8064-5.9392-9.4208 0-0.3072-0.6144-1.3312-1.4336-2.3552-0.8192-0.9216-2.3552-3.1744-3.3792-4.9152-3.9936-6.656-8.9088-14.6432-11.4688-18.6368-0.7168-1.1264-2.1504-3.4816-3.1744-5.2224-1.024-1.7408-2.048-3.2768-2.2528-3.4816-0.3072-0.2048-3.3792-5.0176-5.9392-9.3184-1.7408-2.9696-5.3248-8.4992-6.9632-11.0592-0.9216-1.4336-1.7408-2.8672-1.7408-2.9696 0-0.2048-1.536-2.7648-3.3792-5.7344-7.2704-11.1616-12.5952-19.7632-12.5952-20.0704 0-0.2048-0.6144-1.3312-1.4336-2.3552-0.8192-1.1264-2.9696-4.4032-4.8128-7.4752-1.8432-2.9696-4.5056-7.2704-6.0416-9.6256-2.7648-4.4032-3.072-4.9152-7.4752-11.8784-3.7888-6.144-3.9936-6.5536-6.3488-10.0352-1.1264-1.6384-2.1504-3.2768-2.1504-3.4816 0-0.2048-0.6144-1.2288-1.4336-2.3552-3.4816-4.9152-5.5296-8.8064-4.608-8.8064 0.512 0 2.7648-0.8192 4.9152-1.7408 7.0656-3.2768 7.0656-3.2768 9.8304 1.2288 1.3312 2.2528 2.56 4.1984 2.7648 4.4032 0.2048 0.2048 0.7168 1.024 1.1264 1.9456 0.4096 0.9216 2.048 3.6864 3.6864 6.0416 2.6624 4.1984 5.632 9.0112 7.5776 12.1856 0.4096 0.7168 1.3312 2.1504 2.1504 3.1744 0.7168 1.1264 2.2528 3.584 3.4816 5.7344 1.2288 2.048 2.6624 4.4032 3.1744 5.2224 0.512 0.8192 2.048 3.3792 3.3792 5.632 1.3312 2.3552 2.7648 4.5056 3.2768 4.9152 0.512 0.4096 0.9216 1.024 0.9216 1.3312s1.4336 2.7648 3.1744 5.5296c1.7408 2.7648 4.1984 6.8608 5.5296 9.1136 1.3312 2.2528 2.8672 4.7104 3.3792 5.5296 2.3552 3.3792 9.216 14.6432 10.3424 16.7936 0.4096 0.8192 1.024 1.4336 1.3312 1.4336s0.512 0.4096 0.512 0.8192 0.8192 1.9456 1.9456 3.3792c1.024 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.2048 1.8432 3.3792 4.1984 6.9632 2.2528 3.4816 4.1984 6.5536 4.1984 6.7584s0.6144 1.3312 1.4336 2.3552c0.8192 1.1264 2.8672 4.5056 4.7104 7.4752s4.5056 7.2704 5.9392 9.6256c1.4336 2.3552 2.9696 4.7104 3.3792 5.4272 0.4096 0.7168 1.536 2.4576 2.56 3.9936 0.9216 1.4336 1.7408 2.8672 1.7408 3.072 0 0.2048 0.8192 1.6384 1.8432 3.072 1.6384 2.3552 4.9152 7.5776 6.7584 10.752 0.4096 0.6144 1.8432 3.072 3.3792 5.4272 1.4336 2.4576 3.072 5.0176 3.4816 5.7344 2.048 3.3792 5.3248 8.6016 7.0656 11.0592 0.9216 1.4336 1.7408 2.7648 1.7408 3.072 0 0.2048 0.8192 1.6384 1.8432 3.072 0.9216 1.4336 2.1504 3.2768 2.4576 3.9936 0.4096 0.7168 2.048 3.2768 3.4816 5.632 1.536 2.4576 3.1744 5.2224 3.7888 6.2464 0.6144 1.024 1.8432 2.8672 2.7648 4.096 0.9216 1.2288 1.6384 2.4576 1.6384 2.8672 0 0.2048 0.8192 1.6384 1.9456 3.072 1.024 1.3312 1.9456 2.6624 1.9456 2.9696 0 0.3072 1.8432 3.3792 4.1984 6.9632 2.2528 3.4816 4.1984 6.5536 4.1984 6.7584s0.6144 1.2288 1.4336 2.3552a847.59552 847.59552 0 0 1 10.752 17.3056c2.9696 4.8128 4.1984 6.7584 7.4752 11.9808 1.1264 1.9456 3.2768 5.3248 4.7104 7.5776 1.4336 2.2528 3.072 4.9152 3.6864 5.8368 0.6144 0.9216 2.2528 3.7888 3.8912 6.3488s3.2768 5.3248 3.7888 6.3488c0.512 0.9216 1.1264 1.7408 1.3312 1.9456 0.2048 0.2048 1.2288 1.7408 2.2528 3.4816s2.4576 4.096 3.1744 5.12c0.7168 1.1264 1.7408 2.6624 2.2528 3.6864 0.4096 0.9216 1.3312 2.3552 2.048 2.9696 0.6144 0.7168 1.1264 1.536 1.1264 1.7408 0.1024 0.2048 1.6384 2.9696 3.4816 5.9392 1.9456 2.9696 4.8128 7.7824 6.5536 10.5472 1.6384 2.7648 3.6864 6.0416 4.5056 7.0656 0.8192 1.1264 1.4336 2.1504 1.4336 2.3552 0 0.3072 1.9456 3.4816 4.4032 7.0656 2.3552 3.6864 5.2224 8.192 6.2464 10.0352 1.1264 1.7408 3.4816 5.632 5.3248 8.4992 1.8432 2.8672 4.4032 6.7584 5.4272 8.704l2.9696 4.8128c0.512 0.8192 2.048 3.3792 3.3792 5.7344 1.3312 2.3552 2.7648 4.4032 3.072 4.608 0.3072 0.2048 1.024 1.2288 1.536 2.3552 0.512 1.1264 2.1504 3.7888 3.4816 5.9392 1.4336 2.1504 3.584 5.632 4.9152 7.7824 1.2288 2.1504 2.56 4.1984 2.8672 4.4032 0.4096 0.2048 0.6144 0.6144 0.6144 1.024 0.2048-0.1024-2.6624 0.2048-6.4512 0.2048z m88.3712-238.2848c-4.8128 1.2288-7.0656 1.2288-53.4528 1.2288-46.3872 0-48.64-0.1024-53.248-1.3312-5.8368-1.6384-10.4448-4.5056-11.8784-7.68-0.9216-2.048-0.9216-2.56-0.1024-4.5056 1.3312-2.9696 3.072-4.4032 8.8064-7.0656l4.8128-2.1504 47.104-0.2048c26.112-0.1024 49.664 0.1024 52.8384 0.4096 10.1376 1.024 18.2272 5.9392 18.2272 10.9568 0 4.1984-5.2224 8.2944-13.1072 10.3424z m1.536-77.0048c-2.9696 0.9216-8.2944 1.1264-40.96 1.2288-34.4064 0.2048-37.888 0.1024-41.984-0.9216a53.8624 53.8624 0 0 1-5.7344-1.7408c-13.1072-5.9392-8.704-16.4864 7.9872-19.2512 7.0656-1.1264 67.3792-1.3312 75.6736-0.2048 8.8064 1.2288 16.5888 6.144 16.5888 10.6496 0 3.8912-4.9152 8.192-11.5712 10.24z" fill="#585858" p-id="8274"></path><path d="M433.8688 560.3328c-7.2704 0-12.3904 3.584-15.0528 10.752-2.6624 7.168 1.7408 16.6912 9.0112 19.456 1.7408 0.6144 3.9936 0.8192 7.2704 0.6144 5.7344-0.4096 8.8064-2.1504 12.0832-6.9632 3.6864-5.5296 3.4816-11.5712-0.6144-17.6128-3.072-4.1984-7.168-6.2464-12.6976-6.2464zM519.8848 613.0688c-3.8912-1.9456-4.9152-2.1504-9.8304-2.1504-5.0176 0-5.7344 0.2048-10.0352 2.4576-5.4272 2.8672-8.2944 6.0416-10.3424 11.776-4.5056 12.3904 1.3312 23.9616 14.5408 29.2864 0.512 0.2048 3.584 0.2048 6.7584 0.2048 4.9152-0.1024 6.2464-0.4096 9.1136-2.048 4.9152-2.6624 8.6016-6.9632 10.24-11.8784 3.9936-11.264-0.4096-22.6304-10.4448-27.648zM424.1408 522.0352c2.1504 1.024 9.5232 0.6144 11.5712-0.6144 4.4032-2.7648 5.9392-10.5472 2.9696-15.4624-1.9456-3.4816-3.4816-4.4032-7.9872-4.7104-4.9152-0.4096-7.5776 0.512-10.1376 3.7888-3.4816 4.5056-3.4816 9.3184-0.1024 13.7216 1.1264 1.4336 2.7648 2.8672 3.6864 3.2768z" fill="#585858" p-id="8275"></path></svg>
\ No newline at end of file
ruoyi-ui/src/assets/icons/svg/教师借用.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585790298" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4238" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M821.8 767.8H107.9c-5.5 0-10-4.5-10-10V108.2c0-5.5 4.5-10 10-10h713.9c5.5 0 10 4.5 10 10v649.6c0 5.5-4.5 10-10 10z" fill="#EEEEEE" p-id="4239"></path><path d="M755.9 306.2v-67.7c0-0.4-0.1-0.8-0.2-1.1v-2.7h-0.4c-2.5-12.9-17.4-22.9-35.6-22.9H217.2c-18.2 0-33.1 10-35.6 22.9h-0.6v96.1h0.2V350c0 0.4-0.2 0.8-0.2 1.1v146.2c0 0.4 0.1 0.8 0.2 1.1v2.6h0.4c2.5 13 17.4 23 35.6 23h502.6c18.2 0 33.1-10 35.6-22.9h0.5V326.5h-0.2v-19.2c0-0.3 0.2-0.7 0.2-1.1z" fill="#5B5144" p-id="4240"></path><path d="M727.8 320.9v-59.3c0-0.3-0.1-0.7-0.1-1v-2.3h-0.3c-2.3-11.3-15.7-20.1-32.1-20.1H241.6c-16.4 0-29.9 8.7-32.1 20.1h-0.5v84.1h0.1v16.8c0 0.3-0.1 0.7-0.1 1v127.9c0 0.3 0.1 0.7 0.1 1v2.3h0.3c2.3 11.3 15.7 20.1 32.1 20.1h453.6c16.4 0 29.9-8.7 32.1-20.1h0.5V338.7h-0.1v-16.8c0-0.3 0.2-0.6 0.2-1z" fill="#3BCDAE" p-id="4241"></path><path d="M781.5 512.1c-0.1-11.3-12.4-20.4-27.6-20.4h-578c-15.2 0-27.6 9.1-27.6 20.4h633.2z" fill="#FCE38A" p-id="4242"></path><path d="M354.2 492.6c0-11.2-1.9-20.4-4.2-20.4h-87.5c-2.3 0-4.2 9.1-4.2 20.4h95.9z" fill="#FFFFFF" p-id="4243"></path><path d="M781.5 511.6c-0.1 11.3-12.4 20.4-27.6 20.4h-578c-15.2 0-27.6-9.1-27.6-20.4h633.2z" fill="#EEDBC3" p-id="4244"></path><path d="M447.9 334.8H256.4v-31.2h191.5v31.2zM384 396.7H256.4v-31.2H384v31.2z" fill="#FFFFFF" p-id="4245"></path><path d="M303.6 480.8h320.8v157.4H303.6z" fill="#78909C" p-id="4246"></path><path d="M290.5 480.8h350.9l37.1-24.9H253.4zM265.2 638.3h413.3v16H265.2z" fill="#B0BEC5" p-id="4247"></path><path d="M606 887.6V582.3c0-21 18-38.2 40-38.2h240c22 0 40 17.2 40 38.2v305.3c0 21-18 38.2-40 38.2H646c-22 0-40-17.2-40-38.2z" fill="#FFCCBC" p-id="4248"></path><path d="M878.4 732.1l-87.5-85.4v170.7l87.5-85.3z m-87.5 28.6H653.7v-57.3h137.1v57.3z" fill="#FD0000" p-id="4249"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694585790298" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4238" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M821.8 767.8H107.9c-5.5 0-10-4.5-10-10V108.2c0-5.5 4.5-10 10-10h713.9c5.5 0 10 4.5 10 10v649.6c0 5.5-4.5 10-10 10z" fill="#EEEEEE" p-id="4239"></path><path d="M755.9 306.2v-67.7c0-0.4-0.1-0.8-0.2-1.1v-2.7h-0.4c-2.5-12.9-17.4-22.9-35.6-22.9H217.2c-18.2 0-33.1 10-35.6 22.9h-0.6v96.1h0.2V350c0 0.4-0.2 0.8-0.2 1.1v146.2c0 0.4 0.1 0.8 0.2 1.1v2.6h0.4c2.5 13 17.4 23 35.6 23h502.6c18.2 0 33.1-10 35.6-22.9h0.5V326.5h-0.2v-19.2c0-0.3 0.2-0.7 0.2-1.1z" fill="#5B5144" p-id="4240"></path><path d="M727.8 320.9v-59.3c0-0.3-0.1-0.7-0.1-1v-2.3h-0.3c-2.3-11.3-15.7-20.1-32.1-20.1H241.6c-16.4 0-29.9 8.7-32.1 20.1h-0.5v84.1h0.1v16.8c0 0.3-0.1 0.7-0.1 1v127.9c0 0.3 0.1 0.7 0.1 1v2.3h0.3c2.3 11.3 15.7 20.1 32.1 20.1h453.6c16.4 0 29.9-8.7 32.1-20.1h0.5V338.7h-0.1v-16.8c0-0.3 0.2-0.6 0.2-1z" fill="#3BCDAE" p-id="4241"></path><path d="M781.5 512.1c-0.1-11.3-12.4-20.4-27.6-20.4h-578c-15.2 0-27.6 9.1-27.6 20.4h633.2z" fill="#FCE38A" p-id="4242"></path><path d="M354.2 492.6c0-11.2-1.9-20.4-4.2-20.4h-87.5c-2.3 0-4.2 9.1-4.2 20.4h95.9z" fill="#FFFFFF" p-id="4243"></path><path d="M781.5 511.6c-0.1 11.3-12.4 20.4-27.6 20.4h-578c-15.2 0-27.6-9.1-27.6-20.4h633.2z" fill="#EEDBC3" p-id="4244"></path><path d="M447.9 334.8H256.4v-31.2h191.5v31.2zM384 396.7H256.4v-31.2H384v31.2z" fill="#FFFFFF" p-id="4245"></path><path d="M303.6 480.8h320.8v157.4H303.6z" fill="#78909C" p-id="4246"></path><path d="M290.5 480.8h350.9l37.1-24.9H253.4zM265.2 638.3h413.3v16H265.2z" fill="#B0BEC5" p-id="4247"></path><path d="M606 887.6V582.3c0-21 18-38.2 40-38.2h240c22 0 40 17.2 40 38.2v305.3c0 21-18 38.2-40 38.2H646c-22 0-40-17.2-40-38.2z" fill="#FFCCBC" p-id="4248"></path><path d="M878.4 732.1l-87.5-85.4v170.7l87.5-85.3z m-87.5 28.6H653.7v-57.3h137.1v57.3z" fill="#FD0000" p-id="4249"></path></svg>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/teacherBorrowing/index.vue
<template>
<div>
<div class="app-container">
<!-- 搜索条件 -->
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px"
style="margin-left: 15px; margin-top: 10px">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="申请人">
<el-input v-model="queryForm.name" placeholder="请输入" clearable></el-input>
<el-input v-model="queryForm.borrowBy" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="借用学科">
<el-select v-model="queryForm.name" placeholder="请选择" clearable>
<el-option> </el-option>
<el-select v-model="queryForm.borrowSub" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 操作按钮 -->
<el-row style="margin-left: 10px" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" size="mini" @click="handAdd()" v-hasPermi="['system:student:add']">新增
</el-button>
</el-col>
<el-row class="mb8">
<el-col :span="1.5">
<el-button type="danger" size="mini" :disabled="single" @click="handleDelete">删除
<el-button type="primary" plain size="mini" icon="el-icon-plus" @click="handAdd()">新增
</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleDelete()">批量删除</el-button>
</el-col>
</el-row>
<!-- 表格 -->
......@@ -34,73 +29,88 @@
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="name" label="申请人" />
<el-table-column align="center" prop="name" label="借用状态" />
<el-table-column align="center" prop="name" label="借用明细" />
<el-table-column align="center" prop="name" label="借用学科" />
<el-table-column align="center" prop="name" label="申请时间" />
<el-table-column align="center" prop="name" label="借用时间" />
<el-table-column align="center" prop="name" label="归还时间" />
<el-table-column align="center" prop="name" label="备注" />
<el-table-column align="center" prop="borrowBy" label="申请人" />
<el-table-column align="center" prop="borrowState" label="借用状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.borrow_state, row.borrowState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="schoolTeacherBorrowDetailList" label="借用明细">
<template slot-scope="{ row }">
<div v-for="detail in row.schoolTeacherBorrowDetailList" :key="detail.id">
{{ detail.instrumentName }}
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="borrowSub" label="借用学科">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.lab_sub, row.borrowSub) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="applyTime" label="申请时间" />
<el-table-column align="center" prop="borrowTime" label="借用时间" />
<el-table-column align="center" prop="returnTime" label="归还时间" />
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small">详情</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 详情弹窗 -->
<el-dialog :title="title" :visible.sync="dialogTableVisible" width="40%" show-close>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-dialog :title="title" :visible.sync="dialogxq" width="40%" show-close>
<el-form :model="form" ref="form" size="small" label-width="110px" :disabled="isEdit">
<el-row>
<el-col :span="12">
<el-form-item label="申请人">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="form.borrowBy" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="借用状态">
<el-input v-model="form.name" placeholder="请输入" clearable>
</el-input>
<el-select v-model="form.borrowState" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.borrow_state" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="借用学科">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-select v-model="form.borrowSub" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="form.applyTime" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="借用时间">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="form.borrowTime" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归还时间">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="form.returnTime" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用明细">
<el-table stripe :data="tableData" border>
<el-table stripe :data="tableDatamx" border>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="name" label="仪器名称" />
<el-table-column align="center" prop="name" label="仪器型号" />
<el-table-column align="center" prop="name" label="借用数量" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="instrumentNum" label="借用数量" />
</el-table>
</el-form-item>
</el-col>
......@@ -108,28 +118,28 @@
<el-row>
<el-col>
<el-form-item label="备注">
<el-input v-model="form.name" placeholder="请输入" type="textarea" clearable></el-input>
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- 新增弹窗 -->
<el-dialog :title="title" :visible.sync="dialogTableOpen" width="40%" show-close>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-dialog :title="title" :visible.sync="dialogxz" width="40%" show-close>
<el-form :model="postForm" ref="postForm" size="small" label-width="110px">
<el-row>
<el-col>
<el-form-item label="借用人">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="postForm.borrowBy" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用学科">
<el-select v-model="name" placeholder="请选择" style="width: 100%">
<el-option v-for="(option, index) in options" :key="index" :label="option"
:value="option"></el-option>
<el-select v-model="postForm.borrowSub" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.lab_sub" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -139,15 +149,19 @@
<el-col>
<el-form-item label="借用明细">
<el-col :span="1.5" style="margin-bottom: 5px">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handOpenAdd()"
v-hasPermi="['system:student:add']">新增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handOpenAdd()">新增
</el-button>
</el-col>
<el-table stripe :data="tableData" border>
<el-table stripe :data="tableDataxz" border>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="name" label="仪器名称" />
<el-table-column align="center" prop="name" label="仪器型号" />
<el-table-column align="center" prop="name" label="借用数量" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="instrumentNum" label="可借用数量" />
<el-table-column align="center" prop="borrowNum" label="借用数量">
<template slot-scope="scope">
<el-input v-model="scope.row.borrowNum" size="mini"></el-input>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
......@@ -155,7 +169,7 @@
<el-row>
<el-col>
<el-form-item label="备注">
<el-input v-model="form.name" placeholder="请输入" type="textarea" clearable></el-input>
<el-input v-model="postForm.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -167,130 +181,330 @@
</div>
</el-dialog>
<!-- 借用明细弹窗 -->
<el-dialog :title="title" :visible.sync="dialogTableOpenAdd" @selection-change="handleSelectionChange" width="40%"
show-close>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-dialog :title="title" :visible.sync="dialogmx" width="50%" show-close>
<el-form :model="formmx" ref="formmx" size="small" label-width="70px">
<el-row>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="仪器名称">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-input v-model="formmx.instrumentName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="仪器分类">
<el-select v-model="name" placeholder="请选择" style="width: 100%">
<el-option v-for="(option, index) in AAA" :key="index" :label="option"
:value="option"></el-option>
</el-select>
<treeselect v-model="formmx.instrumentTypeId" :options="equiList" :normalizer="normalizer"
placeholder="选择分类编码" clearable style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item>
<el-button type="primary" plain icon="el-icon-search" size="mini"
@click="getListtc">搜索</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用明细">
<el-table stripe :data="tableData" border>
<el-table stripe :data="tablejymx" border @selection-change="handleSelectionChangemx">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="name" label="仪器名称" />
<el-table-column align="center" prop="name" label="仪器分类" />
<el-table-column align="center" prop="name" label="仪器型号" />
<el-table-column align="center" prop="name" label="仪器数量" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentTypeName" label="仪器分类" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="instrumentNum" label="可借用数量" />
</el-table>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submiopenForm">确定</el-button>
<el-button @click="cancelAdd">取 消</el-button>
<el-button @click="cancelmx">取 消</el-button>
</div>
</el-dialog>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import {
getTeacherBorrow,
addTeacherBorrow,
getTeacherBorrowlist,//查看列表
getTeacherBorrowlxq,
deleteTeacherBorrow,
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/teacherBorrowing'
import {
getList,//查看列表
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentClassification'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'teacherBorrowing',
components: { Treeselect },
dicts: ['lab_sub', 'borrow_state'],
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
name: ''
borrowBy: "",
borrowSub: "",
},
//表格数据
tableData: [
{
name: '456123'
},
{
name: '456123'
},
{
name: '456123'
}
],
//查看详情
tableDatamx: [
],
//借用明细
tablejymx: [
],
//新增
tableDataxz: [],
title: '',
// 弹窗
// 详情弹窗
form: {},
//新增弹窗
postForm: { // 新增弹窗表单数据
borrowBy: '', // 借用人
borrowSub: '', // 借用学科
remark: '', // 备注
tableDataxz: [],
},
//借用明细弹窗
formmx: {},
equiList: [],
isEdit: false,
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总计
total: 0,
single: false, // 添加 single 属性并设置初始值
multiple: false,
dialogTableVisible: false, //详情弹窗
dialogTableOpen: false, //新增弹窗
dialogTableOpenAdd: false, // 借用明细新增
// 学科下拉框
options: ['物理', '化学', '生物'],
AAA: ['反应容器', '光学仪器', '存放容器'],
dialogxq: false, //详情弹窗
dialogxz: false, //新增弹窗
dialogmx: false, // 借用明细新增
selectedRows: [] // 存储用户选择的行
}
},
created() {
this.getList();
this.getListequ();
},
methods: {
// 搜索
getList() { },
getList() {
this.loading = true
getTeacherBorrowlist({ ...this.queryForm }).then(res => {
if (res.code == 200) {
this.total = res.total;
this.tableData = res.rows;
console.log(this.tableData);
this.loading = false
}
})
},
getListtc() {
this.loading = true;
let params = {};
if (this.tablejymx.some(item => item.id)) {
params = {
instrumentName: this.formmx.instrumentName,
instrumentTypeId: this.formmx.instrumentTypeId,
ids: this.ids // 使用选中的 id
};
} else {
params = {
instrumentName: this.formmx.instrumentName,
instrumentTypeId: this.formmx.instrumentTypeId
};
}
getTeacherBorrow(params)
.then(res => {
if (res.code === 200) {
this.tablejymx = res.rows;
console.log(this.tablejymx);
this.loading = false;
}
});
},
//查询表单数据
getListequ() {
this.loading = true;
getList(this.queryForm).then(response => {
this.equiList = this.handleTree(response.rows, "id", 'parentId', 'children');
this.loading = false;
})
},
/** 转换分类编码数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.instrumentTypeName,
children: node.children
};
},
// 重置
resetQuery() { },
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
borrowBy: "",
borrowSub: "",
},
this.getList();
},
// 新增
handAdd() {
this.dialogTableOpen = true
this.reset();
const userName = this.$store.state.user;
console.log(userName);
this.postForm.borrowBy = userName.name
console.log(this.postForm.borrowBy);
this.dialogxz = true
this.title = '教师借用新增'
},
// 删除
handleDelete() { },
//删除按钮操作
handleDelete(row) {
if (row) {
// 单个删除
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
return deleteTeacherBorrow(row.id);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除成功");
this.getList();
})
} else {
// 批量删除
if (!this.ids || this.ids.length === 0) {
this.$modal.warning("请选择要删除的数据");
return;
}
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
const deletePromises = this.ids.map(id => deleteTeacherBorrow(id));
console.log(deletePromises);
return Promise.all(deletePromises);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
});
}
},
reset() {
this.postForm.borrowBy = ''; // 重置借用人字段
this.postForm.borrowSub = ''; // 重置借用学科字段
this.postForm.remark = ''; // 重置备注字段
this.tableDataxz = []; // 清空数组
},
// 详情
handleLook() {
this.dialogTableVisible = true
handleLook(row) {
console.log(row);
this.dialogxq = true;
getTeacherBorrowlxq(row.id).then(res => {
if (res.code == 200) {
this.form = res.data;
this.tableDatamx = res.data.schoolTeacherBorrowDetailList;
console.log(this.tableDatamx);
this.isEdit = true;
this.loading = false
}
})
this.title = '教师借用详情'
},
// 教师借用确定
submitparentForm() {
this.dialogTableOpen = false
const borrowDetails = [];
for (let i = 0; i < this.tableDataxz.length; i++) {
const item = this.tableDataxz[i];
if (item && item.id) {
borrowDetails.push({
instrumentId: item.id,
borrowNum: item.borrowNum // 借用数量字段
});
}
}
this.postForm.schoolTeacherBorrowDetailList = borrowDetails;
this.$refs["postForm"].validate(valid => {
if (valid) {
addTeacherBorrow(this.postForm).then(response => {
console.log('this.postForm', this.postForm);
this.$modal.msgSuccess("新增成功");
this.dialogxz = false;
this.getList();
});
}
});
},
// 教师借用取消
//取消按钮
cancel() {
this.dialogTableOpen = false
this.reset();
this.dialogxz = false;
},
cancelmx() {
this.dialogmx = false;
},
// 借用明细新增
handOpenAdd() {
this.dialogTableOpenAdd = true
this.dialogmx = true;
this.getListtc();
this.title = '借用明细新增'
},
// 多选
// 多选框选中数据
handleSelectionChange(selection) {
this.selectedRows = selection
this.ids = selection.map(item => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
// 借用明细新增
// 多选
handleSelectionChangemx(selection) {
if (selection.length > 0) {
selection.forEach(selectedItem => {
const newItem = { ...selectedItem };
this.tableDataxz.push(newItem);
});
}
this.ids = selection.map(item => item.id);
this.single = selection.length === 1;
this.multiple = !selection.length;
},
// 借用明细新增按钮
submiopenForm() {
this.dialogTableOpenAdd = false
// 先清空this.tableDataxz，然后将选中的项重新添加到this.tableDataxz中
this.tableDataxz = [];
this.tableDataxz = this.tableDataxz.concat(this.tablejymx.filter(item => this.ids.includes(item.id)));
this.dialogmx = false;
},
// 借用明细取消
cancelAdd() {
this.dialogTableOpenAdd = false
}
}
}
</script>
......
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/warehouseEquipmentLoan/index.vue
<template>
<div>
<div class="app-container">
<!-- 搜索条件 -->
<el-form
:model="queryForm"
ref="queryForm"
size="small"
:inline="true"
label-width="68px"
style="margin-left: 15px; margin-top: 10px"
>
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="申请人">
<el-input
v-model="queryForm.name"
placeholder="请输入"
clearable
></el-input>
<el-input v-model="queryForm.borrowBy" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="变更日期">
<el-date-picker
v-model="queryForm.name"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
<el-date-picker v-model="queryForm.startTime" type="date" placeholder="选择" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-model="queryForm.endTime" type="date" placeholder="选择" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="getList"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 表格 -->
<el-table stripe :data="tableData" border style="width: 98%">
<el-table-column
align="center"
type="index"
label="序号"
width="55"
/>
<el-table-column align="center" prop="name" label="申请人" />
<el-table-column align="center" prop="name" label="借用状态" />
<el-table-column align="center" prop="name" label="借用明细" />
<el-table-column align="center" prop="name" label="申请时间" />
<el-table-column align="center" prop="name" label="借用时间" />
<el-table-column align="center" prop="name" label="归还时间" />
<el-table-column align="center" prop="name" label="备注" />
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="borrowBy" label="申请人" />
<el-table-column align="center" prop="borrowState" label="借用状态" />
<el-table-column align="center" prop="schoolTeacherBorrowDetailList" label="借用明细">
<template slot-scope="{ row }">
<div v-for="detail in row.schoolTeacherBorrowDetailList" :key="detail.id">
{{ detail.instrumentName }}
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="applyTime" label="申请时间" />
<el-table-column align="center" prop="borrowTime" label="借用时间" />
<el-table-column align="center" prop="returnTime" label="归还时间" />
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
@click="handleLook(scope.row)"
type="text"
size="small"
>详情</el-button
>
<el-button
@click="returnItem(scope.row)"
type="text"
size="small"
>归还</el-button
>
<el-button
@click="processItem(scope.row)"
type="text"
size="small"
>借用</el-button
>
<el-button @click="handleLook(scope.row)" type="text" size="small">详情</el-button>
<el-button @click="processItem(scope.row)" type="text" size="small">借用</el-button>
<el-button @click="returnItem(scope.row)" type="text" size="small">归还</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
/>
<!-- 借用弹窗 -->
<el-dialog
:title="title"
:visible.sync="dialogTableProcessItem"
width="42%"
show-close
>
<!-- 办理弹窗 -->
<el-dialog :title="title" :visible.sync="openbl" width="42%" show-close>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-row>
<el-col>
<el-form-item label="借用人">
<el-input
v-model="form.name"
placeholder="请输入"
clearable
></el-input>
<el-input v-model="form.borrowBy" placeholder="请输入" clearable :disabled="isEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用明细">
<el-table stripe :data="tableData" border>
<el-table-column
align="center"
type="index"
label="序号"
width="55"
/>
<el-table-column
align="center"
prop="name"
label="仪器名称"
/>
<el-table-column
align="center"
prop="name"
label="仪器型号"
/>
<el-table-column
align="center"
prop="name"
label="借用数量"
/>
<el-table stripe :data="tableDatabl" border>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="borrowNum" label="借用数量">
<template slot-scope="scope">
<el-input v-model="scope.row.borrowNum" size="mini"></el-input>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
......@@ -141,80 +71,51 @@
<el-row>
<el-col>
<el-form-item label="备注">
<el-input
v-model="form.name"
placeholder="请输入"
type="textarea"
clearable
></el-input>
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitparentForm"
>确定</el-button
>
<el-button type="primary" @click="submitparentForm">确定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 归还弹窗 -->
<el-dialog
:title="title"
:visible.sync="dialogTableReturnItem"
width="50%"
show-close
>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-dialog :title="title" :visible.sync="opengh" width="50%" show-close>
<el-form :model="postForm" ref="postForm" size="small" label-width="110px">
<el-row>
<el-col :span="10">
<el-form-item label="借用人">
<el-input v-model="form.name"></el-input>
<el-input v-model="postForm.borrowBy" :disabled="isEdit"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="借用状态">
<el-input v-model="form.name"></el-input>
<el-input v-model="postForm.borrowState" :disabled="isEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="申请时间">
<el-input v-model="form.name"></el-input>
<el-input v-model="postForm.applyTime" :disabled="isEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用明细">
<el-table stripe :data="tableData" border>
<el-table-column
align="center"
type="index"
label="序号"
width="55"
/>
<el-table-column
align="center"
prop="name"
label="仪器名称"
/>
<el-table-column
align="center"
prop="name"
label="仪器型号"
/>
<el-table-column
align="center"
prop="name"
label="借用数量"
/>
<el-table-column
align="center"
prop="name"
label="损坏数量"
/>
<el-table stripe :data="tableDatagh" border>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="borrowNum" label="借用数量" />
<el-table-column align="center" prop="damageNum" label="损坏数量">
<template slot-scope="scope">
<el-input v-model="scope.row.damageNum" size="mini"></el-input>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
......@@ -222,91 +123,59 @@
<el-row>
<el-col>
<el-form-item label="备注">
<el-input
v-model="form.name"
placeholder="请输入"
type="textarea"
clearable
></el-input>
<el-input v-model="postForm.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancelReturnItem">取 消</el-button>
</div>
</el-dialog>
<!-- 接触归还详情弹窗 -->
<el-dialog
:title="title"
:visible.sync="dialogTableHandleLook"
width="50%"
show-close
>
<el-form :model="form" ref="form" size="small" label-width="110px">
<el-dialog title="详细信息" :visible.sync="openxq" width="50%" show-close>
<el-form :model="formxq" ref="formxq" size="small" label-width="110px" :disabled="isEdit">
<el-row>
<el-col :span="10">
<el-form-item label="借用人">
<el-input v-model="form.name"></el-input>
<el-input v-model="formxq.borrowBy"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="借用状态">
<el-input v-model="form.name"></el-input>
<el-input v-model="formxq.borrowState"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="申请时间">
<el-input v-model="form.name"></el-input>
<el-input v-model="formxq.applyTime"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="借用时间">
<el-input v-model="form.name"></el-input>
<el-input v-model="formxq.borrowTime"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="归还时间">
<el-input v-model="form.name"></el-input>
<el-input v-model="formxq.returnTime"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="借用明细">
<el-table stripe :data="tableData" border>
<el-table-column
align="center"
type="index"
label="序号"
width="55"
/>
<el-table-column
align="center"
prop="name"
label="仪器名称"
/>
<el-table-column
align="center"
prop="name"
label="仪器型号"
/>
<el-table-column
align="center"
prop="name"
label="借用数量"
/>
<el-table-column
align="center"
prop="name"
label="损坏数量"
/>
<el-table stripe :data="tableDataxq" border>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="instrumentNum" label="借用数量" />
<el-table-column align="center" prop="damageNum" label="损坏数量" />
</el-table>
</el-form-item>
</el-col>
......@@ -314,21 +183,24 @@
<el-row>
<el-col>
<el-form-item label="备注">
<el-input
v-model="form.name"
placeholder="请输入"
type="textarea"
clearable
></el-input>
<el-input v-model="formxq.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- 分页 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import {
getTeacherBorrow,
getTeacherBorrowlxq,
teacherBorrow,
getReturnInstrument
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentBorrowManagement/warehouseEquipmentLoan'
export default {
name: 'warehouseEquipmentLoan',
data() {
......@@ -336,66 +208,152 @@ export default {
queryForm: {
pageNum: 1,
pageSize: 10,
name: ''
borrowBy: "",
daterange: "",
startTime: "",
endTime: "",
},
//表格数据
tableData: [
{
name: 111222
}
],
title: '',
// 弹窗
//归还
tableDatagh: [
],
//详情
tableDataxq: [
],
//办理
tableDatabl: [
],
formxq: {},
postForm: {
},
form: {},
isEdit: false,
title: '',
// 总计
total: 0,
// 借用弹窗
dialogTableProcessItem: false,
openbl: false,
// 归还弹窗
dialogTableReturnItem: false,
opengh: false,
// 详情弹窗
dialogTableHandleLook: false
openxq: false
}
},
created() {
this.getList();
},
methods: {
// 搜索
getList() {},
getList() {
getTeacherBorrow(this.queryForm).then(res => {
this.tableData = res.rows
this.total = res.total
})
},
// 重置
resetQuery() {},
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
borrowBy: "",
daterange: "",
startTime: "",
endTime: "",
},
this.getList();
},
// 归还
returnItem() {
returnItem(row) {
this.dialogTableReturnItem = true
getTeacherBorrowlxq(row.id).then(response => {
this.postForm = response.data;
this.tableDatagh = response.data.schoolTeacherBorrowDetailList;
this.opengh = true
this.isEdit = true;
})
this.title = '归还'
},
// 详情
handleLook() {
this.dialogTableHandleLook = true
this.title = '借出归还详情'
handleLook(row) {
getTeacherBorrowlxq(row.id).then(response => {
this.formxq = response.data;
this.tableDataxq = response.data.schoolTeacherBorrowDetailList;
this.isEdit = true;
this.openxq = true;
})
},
// 借用
processItem() {
this.dialogTableProcessItem = true
// 办理
processItem(row) {
getTeacherBorrowlxq(row.id).then(response => {
this.form = response.data;
this.tableDatabl = response.data.schoolTeacherBorrowDetailList;
this.openbl = true
this.isEdit = true;
})
this.title = '借用'
},
// 借用确定
submitparentForm() {
this.dialogTableProcessItem = false
this.$refs["form"].validate(valid => {
if (valid) {
const params = {
id: this.form.id,
remark: this.form.remark,
schoolTeacherBorrowDetailList: this.form.schoolTeacherBorrowDetailList.map(detail => ({
instrumentId: detail.instrumentId,
borrowNum: detail.borrowNum
}))
};
teacherBorrow(params).then(response => {
console.log('this.form', this.form);
this.$modal.msgSuccess("借用成功");
this.openbl = false
this.getList();
});
}
});
},
// 借用取消
cancel() {
this.dialogTableProcessItem = false
this.openbl = false
},
// 归还确定
submitForm() {
this.dialogTableReturnItem = false
this.$refs["postForm"].validate(valid => {
if (valid) {
const params = {
id: this.postForm.id,
borrowState: this.postForm.borrowState,
schoolTeacherBorrowDetailList: this.postForm.schoolTeacherBorrowDetailList.map(detail => ({
id: detail.id,
damageNum: detail.damageNum
}))
};
getReturnInstrument(params).then(response => {
console.log('this.postForm', this.postForm);
this.$modal.msgSuccess("归还成功");
this.opengh = false;
this.getList();
});
}
});
},
// 归还取消
cancelReturnItem() {
this.dialogTableReturnItem = false
this.opengh = false
}
}
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentClassification/index.vue
<template>
<div>
<div class="app-container">
<!-- 搜索条件 -->
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true">
<el-form-item label="仪器名称">
<el-input v-model="queryForm.name" placeholder="请输入" clearable></el-input>
<el-input v-model="queryForm.instrumentTypeName" style="width: 100%" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="仪器分类">
<el-select v-model="queryForm.name" placeholder="请选择" clearable>
<el-option> </el-option>
</el-select>
<treeselect v-model="queryForm.id" :options="tableData" :normalizer="normalizer" placeholder="选择分类编码"
clearable style="width:192px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -19,81 +17,74 @@
<!-- 操作按钮 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handAdd()"
v-hasPermi="['system:student:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:student:edit']">编辑
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" size="mini" icon="el-icon-view" :disabled="single" @click="handleDelete">删除
</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
</el-col>
</el-row>
<!-- 表格 -->
<el-table :data="tableData" style="width: 100%" row-key="name" border lazy :load="load"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-model="selectedRows"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
</el-row>
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column prop="name" label="仪器名称" width="180" />
<el-table-column prop="name" label="排序" width="180" />
<el-table-column prop="name" label="是否为消耗品" />
<el-table-column prop="name" label="备注" />
<!-- 表格 -->
<el-table :data="tableData" v-loading="loading" row-key="id" :default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column prop="instrumentTypeName" label="仪器名称" />
<el-table-column prop="orderNum" label="排序" />
<el-table-column prop="isConsumables" label="是否为消耗品">
<template slot-scope="{ row }">
{{ row.isConsumables === '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button @click="handleUpdate(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
<template slot-scope="{ row }">
<div>
<el-button type="text" size="small" @click="handleOption(1, row)">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete(row)">删除</el-button>
</div>
</template>
</el-table-column>
</el-table>
<!-- 弹窗 -->
<el-dialog :title="title" :visible.sync="dialogTableVisible" width="30%" show-close>
<el-form :model="form" ref="form" size="small" label-width="108px">
<el-form :model="form" ref="form" size="small" :rules="rules" label-width="108px">
<el-row>
<el-col :span="20">
<el-form-item label="上级分类">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-form-item label="上级分类" prop="parentId">
<treeselect v-model="form.parentId" :options="tableData" :normalizer="normalizer"
placeholder="选择" clearable style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="仪器名称">
<el-input v-model="form.name" placeholder="请输入" clearable>
<el-form-item label="仪器名称" prop="instrumentTypeName">
<el-input v-model="form.instrumentTypeName" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="排序">
<el-input v-model="form.name" placeholder="请输入" clearable></el-input>
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="是否为消耗品">
<el-radio-group v-model="form.resource">
<el-radio label="是"></el-radio>
<el-radio label="否"></el-radio>
<el-form-item label="是否为消耗品" prop="isConsumables">
<el-radio-group v-model="form.isConsumables">
<el-radio label='1'>是</el-radio>
<el-radio label='0'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="备注">
<el-input v-model="form.name" placeholder="请输入" type="textarea" clearable></el-input>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -112,99 +103,183 @@
</template>
<script>
import {
addInst,//新增仪器
editInst,//修改仪器
getList,//查看列表
getInstxq,
deleteInst,
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentClassification'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'instrumentClassification',
components: { Treeselect },
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
name: ''
instrumentTypeName: "",
id: "",
},
selectedRows: [], // 用于存储选择的行数据
//表格数据
tableData: [
{
name: '1'
},
{
name: '2222'
},
{
name: '33',
hasChildren: true
},
{
name: '444'
}
],
nowType: 0, // 0新增、1编辑、2查看
title: '',
// 弹窗
form: {},
form: {
instrumentTypeName: "",
parentId: "",
orderNum: "",
isConsumables: "",
remark: "",
},
// 总计
total: 0,
single: false, // 添加 single 属性并设置初始值
multiple: false,
dialogTableVisible: false
dialogTableVisible: false,
// 展开
isExpandAll: true,
// 重新渲染表格状态
refreshTable: true,
rules: {
parentId: [
{ required: true, message: "上级分类不能为空", trigger: "blur" }
],
instrumentTypeName: [
{ required: true, message: "仪器名称不能为空", trigger: "blur" }
],
orderNum: [
{ required: true, message: "排序不能为空", trigger: "blur" }
],
isConsumables: [
{ required: true, message: "是否为消耗品不能为空", trigger: "blur" }
],
},
}
},
created() {
this.getList();
},
methods: {
// 搜索
getList() { },
getList() {
this.loading = true;
getList(this.queryForm).then(response => {
this.tableData = this.handleTree(response.rows, "id", 'parentId', 'children');
console.log('this.tableData', this.tableData);
this.loading = false;
})
},
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.instrumentTypeName,
children: node.children
};
},
// 重置
resetQuery() { },
//
load(tree, treeNode, resolve) {
setTimeout(() => {
resolve([
{
name: '5555'
},
{
name: '666'
}
])
}, 1000)
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
instrumentTypeName: "",
id: "",
},
this.getList();
},
// 新增
handAdd() {
// 0新增、1编辑、2查看
handleOption(type, item) {
this.form = {
id: '',
instrumentTypeName: "",
parentId: "",
orderNum: "",
isConsumables: "",
remark: "",
}
this.nowType = type;
if (type != 0) {
const id = item.id;
getInstxq(id).then(res => {
if (res.code == 200) {
Object.keys(this.form).forEach(key => {
if (res.data[key]) {
this.$set(this.form, key, res.data[key]);
}
});
}
})
}
this.dialogTableVisible = true
this.title = '仪器药品新增'
},
// 编辑
handleUpdate() {
this.dialogTableVisible = true
this.title = '仪器药品编辑'
//删除按钮操作
handleDelete(row) {
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
return deleteInst(row.id);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除班级成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
})
},
// 删除
handleDelete() { },
// 确定
submitparentForm() {
this.dialogTableVisible = false
// 确定按钮
submitparentForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != "") {
editInst(this.form).then(response => {
console.log('this.form', this.form);
this.$modal.msgSuccess("修改成功");
this.dialogTableVisible = false;
this.getList();
});
} else {
addInst(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.dialogTableVisible = false;
this.getList();
});
}
}
});
},
reset() {
// 这里需要重置对话框表单
this.form = {
instrumentTypeName: "",
parentId: "",
orderNum: "",
isConsumables: "",
remark: "",
};
},
// 取消
//取消按钮
cancel() {
this.dialogTableVisible = false
this.dialogTableVisible = false;
this.dialogTableInventory = false;
this.reset();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
}
}
}
</script>
<style lang="scss" scoped>
.el-form {
margin-top: 15px;
margin-left: 10px;
}
.el-table {
margin-left: 10px;
}
</style>
\ No newline at end of file
<style scoped></style>
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentDetails/index.vue
<template>
<div>
<el-form
:model="queryForm"
ref="queryForm"
size="small"
:inline="true"
label-width="68px"
>
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" @submit.native.prevent label-width="78px">
<el-form-item label="仪器名称">
<el-input
v-model="queryForm.name"
placeholder="请输入"
clearable
></el-input>
<el-input v-model="queryForm.instrumentName" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="仪器分类">
<el-select
v-model="queryForm.name"
placeholder="请选择"
clearable
>
<el-option> </el-option>
</el-select>
<treeselect v-model="queryForm.instrumentTypeId" :options="equiList" :normalizer="normalizer"
placeholder="选择分类编码" clearable style="width: 192px" />
</el-form-item>
<el-form-item label="变更日期">
<el-date-picker
v-model="queryForm.name"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
<el-date-picker v-model="queryForm.startTime" type="date" placeholder="选择开始日期" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-model="queryForm.endTime" type="date" placeholder="选择结束日期" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="getList"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 表格 -->
<el-table stripe :data="tableData" border style="width: 98%">
<el-table-column
align="center"
type="index"
label="序号"
width="55"
/>
<el-table-column align="center" prop="name" label="仪器名称" />
<el-table-column align="center" prop="name" label="仪器分类" />
<el-table-column align="center" prop="name" label="仪器型号" />
<el-table-column align="center" prop="name" label="变动类型" />
<el-table-column align="center" prop="name" label="变动数量" />
<el-table-column align="center" prop="name" label="旧库存数量" />
<el-table-column align="center" prop="name" label="新库存数量" />
<el-table-column align="center" prop="name" label="变更时间" />
<el-table-column align="center" prop="name" label="备注" />
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentTypeName" label="仪器分类" />
<el-table-column align="center" prop="variationType" label="仪器型号" />
<el-table-column align="center" prop="variationType" label="变动类型" />
<el-table-column align="center" prop="variationNum" label="变动数量" />
<el-table-column align="center" prop="oldStockNum" label="旧库存数量" />
<el-table-column align="center" prop="newStockNum" label="新库存数量" />
<el-table-column align="center" prop="variationTime" label="变更时间" />
<el-table-column align="center" prop="remark" label="备注" />
</el-table>
<!-- 分页 -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import {
getListrk,
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentManagement';
import {
getList,//查看列表
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentClassification';
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'instrumentDetails',
components: { Treeselect },
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
name: ''
instrumentName: "",
instrumentTypeId: "",
daterange: "",
startTime: "",
endTime: "",
},
//表格数据
tableData: [
{
name: 111222
}
],
equiList: [],
// 总计
total: 0
}
},
created() {
this.getList();
this.getListequ();
},
methods: {
// 搜索
getList() {},
getList() {
getListrk({ ...this.queryForm }).then(res => {
if (res.code == 200) {
this.total = res.total;
this.tableData = res.rows;
console.log(this.tableData);
this.loading = false
}
})
},
getListequ() {
this.loading = true;
getList(this.queryForm).then(response => {
this.equiList = this.handleTree(response.rows, "id", 'parentId', 'children');
console.log('this.tableData', this.tableData);
this.loading = false;
})
},
/** 转换分类编码数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.instrumentTypeName,
children: node.children
};
},
// 重置
resetQuery() {}
resetQuery() {
this.queryForm = {
pageNum: 1,
pageSize: 10,
instrumentName: "",
instrumentTypeId: "",
startTime: "",
endTime: "",
},
this.getList();
}
}
}
</script>
<style lang="scss" scoped>
.el-form {
margin-top: 15px;
margin-left: 10px;
}
.el-table {
margin-left: 10px;
}
</style>
\ No newline at end of file
<style scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentManagement/index.vue
<template>
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="78px">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true">
<el-form-item label="仪器名称">
<el-input v-model="queryForm.instrumentName" placeholder="请输入" clearable></el-input>
<el-input v-model="queryForm.instrumentName" style="width: 100%" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="仪器分类">
<el-input v-model="queryForm.instrumentTypeId" placeholder="请输入实验名称" clearable></el-input>
<treeselect v-model="queryForm.instrumentTypeId" :options="equiList" :normalizer="normalizer"
placeholder="选择分类编码" clearable style="width: 192px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 操作按钮 -->
<el-row class="mb8" :gutter="8">
<el-col :span="1.5" :offset="2.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handAdd()">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
@click="handleOut">出库</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" size="mini" plain icon="el-icon-view" :disabled="single"
@click="handleIn">入库</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleOption(0)">新增</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleDelete()">批量删除</el-button>
</el-col>
</el-row>
<!-- 表格 -->
<el-table stripe :data="tableData" border style="width: 98%">
<el-table stripe :data="tableData" border style="width: 98%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="55" />
<el-table-column align="center" prop="instrumentName" label="仪器名称" />
<el-table-column align="center" prop="instrumentTypeName" label="仪器分类" />
<el-table-column align="center" prop="instrumentModel" label="仪器型号" />
<el-table-column align="center" prop="instrumentNum" label="仪器数量" />
<el-table-column align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small">详情</el-button>
<el-button @click="handleUpdate(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleOut(scope.row)" type="text" size="small">出库</el-button>
<el-button @click="handleIn(scope.row)" type="text" size="small">入库</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
<template slot-scope="{ row }">
<div>
<el-button type="text" size="small" @click="handleOption(2, row)">查看</el-button>
<el-button type="text" size="small" @click="handleOption(1, row)">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete(row)">删除</el-button>
<el-button @click="handleOut(row)" type="text" size="small">出库</el-button>
<el-button @click="handleIn(row)" type="text" size="small">入库</el-button>
</div>
</template>
</el-table-column>
</el-table>
<!--仪器新增 弹窗 -->
<el-dialog :title="title" :visible.sync="dialogTableVisible" width="30%" show-close>
<el-form :model="form" ref="form" size="small" label-width="108px">
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="30%" show-close>
<el-form :model="form" ref="form" :rules="rules" size="small" label-width="108px">
<el-row>
<el-col :span="20">
<el-form-item label="仪器名称">
<el-input v-model="form.instrumentName" placeholder="请输入" clearable></el-input>
<el-form-item label="仪器名称" prop="instrumentName">
<el-input v-model="form.instrumentName" placeholder="请输入" clearable
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="父分类编码" prop="parentId">
<treeselect v-model="postForm.parentId" :options="assetsList" :normalizer="normalizer"
placeholder="选择分类编码" />
<el-col :span="20">
<el-form-item label="仪器分类" prop="instrumentTypeName">
<treeselect v-model="form.instrumentTypeName" :options="equiList" :normalizer="normalizer"
placeholder="选择" clearable style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="仪器型号">
<el-input v-model="form.instrumentModel" placeholder="请输入" clearable></el-input>
<el-form-item label="仪器型号" prop="instrumentModel">
<el-input v-model="form.instrumentModel" placeholder="请输入" clearable
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable></el-input>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable
:disabled="nowType == 2 ? true : false"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -90,47 +89,52 @@
<!-- 仪器库存修改弹窗 -->
<el-dialog title="仪器库存" :visible.sync="dialogTableInventory" width="30%" show-close>
<el-dialog title="仪器库存" :visible.sync="open" width="30%" show-close>
<el-form :model="form" ref="form" size="small" label-width="108px">
<el-row>
<el-col :span="20">
<el-form-item label="仪器名称">
<el-input v-model="form.instrumentId"></el-input>
<el-input v-model="postForm.instrumentName" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="旧库存数量">
<el-input v-model="form.oldStockNum"> </el-input>
<el-input v-model="postForm.instrumentNum" :disabled="true"> </el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="变动类型">
<el-input v-model="form.variationType" placeholder="请输入"></el-input>
<el-select v-model="postForm.variationType" clearable placeholder="请选择" :disabled="true">
<el-option v-for="dict in dict.type.variation_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="变动数量">
<el-input v-model="form.variationType"></el-input>
<el-input v-model="postForm.variationNum" @input="updateNewStockNum"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="新库存数量">
<el-input v-model="form.newStockNum"></el-input>
<el-input v-model="postForm.newStockNum" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="请输入" type="textarea" clearable></el-input>
<el-input v-model="postForm.remark" placeholder="请输入" type="textarea" clearable
:disabled="isEdit"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -152,46 +156,89 @@
import {
addInst,//新增仪器
editInst,//修改仪器
getList,//查看仪器列表
getListyq,//查看仪器列表
getInstxq,
deleteInst,
getListrk,
getInstrumentDetail
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentManagement'
import {
getProductCategory,//获取设备分类下拉框
} from '@/api/smartSchool/schoolProperty/classiFication.js'
getList,//查看列表
} from '@/api/smartSchool/InstrumentDrugAdministration/instrumentClassification'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: 'instrumentManagement',
components: { Treeselect },
dicts: ['variation_type'],
data() {
return {
queryForm: {
pageNum: 1,
pageSize: 10,
name: ''
instrumentName: "",
instrumentTypeId: "",
},
//表格数据
tableData: [
],
sbflOptions: {},
isEdit: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
equiList: [],
// 列表
assetsList: [],
tablekc: [],
title: '',
// 弹窗
form: {},
form: {
instrumentName: "",
instrumentTypeId: "",
instrumentTypeName: "",
instrumentModel: "",
instrumentNum: "",
remark: "",
},
postForm: {
instrumentId: "",
variationType: "",
oldStockNum: "",
newStockNum: "",
remark: "",
},
// 总计
total: 0,
rules: {
instrumentName: [
{ required: true, message: "仪器名称不能为空", trigger: "blur" }
],
instrumentTypeId: [
{ required: true, message: "仪器分类不能为空", trigger: "blur" }
],
instrumentTypeName: [
{ required: true, message: "仪器类名不能为空", trigger: "blur" }
],
instrumentModel: [
{ required: true, message: "仪器型号不能为空", trigger: "blur" }
],
instrumentNum: [
{ required: true, message: "仪器数量不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
},
//仪器新增/修改弹窗
dialogTableVisible: false,
// 仪器查看弹窗
dialogTablesee: false,
// 库存弹窗
dialogTableInventory: false,
open: false,
nowType: 0, // 0新增、1编辑、2查看
// 非单个禁用
single: true,
// 非多个禁用
......@@ -199,104 +246,237 @@ export default {
}
},
created() {
this.getListequ();
this.getList();
this.enuqLeader();
},
methods: {
// 搜索
getList() {
this.loading = true
getList({ ...this.queryForm }).then(res => {
getListyq({ ...this.queryForm }).then(res => {
if (res.code == 200) {
this.total = res.total
this.total = res.total;
this.tableData = res.rows;
console.log(this.tableData);
this.loading = false
}
})
},
//设备分类下拉框
enuqLeader() {
getProductCategory().then(((res) => {
if (res.code == 200) {
this.sbflOptions = res.data;
// console.log('this.sbflOptions', this.sbflOptions);
}
}))
//查询表单数据
getListequ() {
this.loading = true;
getList(this.queryForm).then(response => {
this.equiList = this.handleTree(response.rows, "id", 'parentId', 'children');
console.log('this.tableData', this.tableData);
this.loading = false;
})
},
/** 转换分类编码数据结构 */
normalizer(node) {
console.log(node);
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.instrumentTypeName,
children: node.children
};
},
// 重置
resetQuery() {
this.getList();
},
// 详情
handleLook(row) {
this.dialogTablesee = true
},
//
handAdd() {
this.dialogTableVisible = true
this.title = '新增仪器信息'
this.queryForm = {
pageNum: 1,
pageSize: 10,
instrumentName: "",
instrumentTypeId: "",
},
this.getList();
},
// 编辑
handleUpdate() {
// 0新增、1编辑、2查看
handleOption(type, item) {
this.collectionForm = {
id: '',
instrumentName: "",
instrumentTypeId: "",
instrumentTypeName: "",
instrumentModel: "",
instrumentNum: "",
remark: "",
}
this.nowType = type;
if (type != 0) {
const id = item.id;
getInstxq(id).then(res => {
if (res.code == 200) {
Object.keys(this.form).forEach(key => {
if (res.data[key]) {
this.$set(this.form, key, res.data[key]);
}
});
}
})
}
this.dialogTableVisible = true
this.title = '修改仪器信息'
},
// 出库
handleOut() {
this.dialogTableInventory = true
// 计算新库存数量
updateNewStockNum() {
const variationNum = parseFloat(this.postForm.variationNum);
const instrumentNum = parseFloat(this.postForm.instrumentNum);
if (this.postForm.variationType === '2') {
// 入库操作，新库存等于旧库存加上变动数量
this.postForm.newStockNum = isNaN(variationNum) || isNaN(instrumentNum) ? 0 : variationNum + instrumentNum;
} else if (this.postForm.variationType === '1') {
// 出库操作，新库存等于旧库存减去变动数量
this.postForm.newStockNum = isNaN(variationNum) || isNaN(instrumentNum) ? 0 : instrumentNum - variationNum;
}
},
// 入库
handleIn() {
this.dialogTableInventory = true
handleIn(row) {
this.open = true;
const id = row.id;
getInstxq(id).then(res => {
if (res.code == 200) {
this.postForm = res.data;
this.postForm.variationType = '2';
this.loading = false;
this.isEdit = true;
// 初始化新库存数量
this.updateNewStockNum();
}
})
},
// 库存确定
// 出库
handleOut(row) {
this.open = true;
const id = row.id;
getInstxq(id).then(res => {
if (res.code == 200) {
this.postForm = res.data;
console.log(this.postForm);
this.postForm.variationType = '1';
console.log(this.postForm);
this.loading = false
// 初始化新库存数量
this.updateNewStockNum();
}
})
},
// 入库/出库提交
submitInventory() {
this.dialogTableInventory = false
if (!this.postForm.variationNum || isNaN(this.postForm.variationNum)) {
this.$message.error('请输入正确的变动数量！');
return;
}
const postData = {
instrumentId: this.postForm.id,
variationType: this.postForm.variationType,
oldStockNum: this.postForm.instrumentNum,
newStockNum: this.postForm.newStockNum,
remark: this.postForm.remark,
};
getInstrumentDetail(postData).then(res => {
if (res.code == 200) {
this.$message.success('操作成功！');
this.open = false;
this.getList();
} else {
this.$message.error(res.msg);
}
})
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
// 仪器确定
submitparentForm() {
this.dialogTableVisible = false
submitparentForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
editInst(this.form).then(response => {
console.log('this.form', this.form);
this.$modal.msgSuccess("修改成功");
this.dialogTableVisible = false;
this.getList();
this.enuqLeader();
});
} else {
addInst(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.dialogTableVisible = false;
this.getList();
});
}
}
});
},
reset() {
// 这里需要重置对话框表单
this.form = {
id: null,
instrumentName: null,
instrumentTypeId: null,
instrumentTypeName: null,
instrumentModel: null,
instrumentNum: null,
remark: null,
};
},
//取消按钮
cancel() {
this.dialogTableVisible = false
this.dialogTableInventory = false
this.dialogTableVisible = false;
this.open = false;
this.reset();
},
//删除按钮操作
handleDelete(row) {
console.log(row);
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
return deleteInst(row);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除班级成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
})
},
if (row) {
// 单个删除
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
return deleteInst(row.id);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
});
} else {
// 批量删除
if (!this.ids || this.ids.length === 0) {
this.$modal.warning("请选择要删除的数据");
return;
}
this.$modal.confirm('是否确认删除选中数据？').then(() => {
this.$modal.loading('正在处理数据，请稍等...');
const deletePromises = this.ids.map(id => deleteInst(id));
return Promise.all(deletePromises);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
});
}
}
}
}
</script>
<style lang="scss" scoped>
.el-form {
margin-top: 15px;
margin-left: 10px;
}
.el-table {
margin-left: 10px;
}
.el-row {
margin-left: 10px;
}
</style>
\ No newline at end of file
<style scoped></style>
ruoyi-ui/src/views/smartSchool/classTeacherWork/laboratoryManagement/laboratoryApplicationrecords/index.vue
......@@ -40,7 +40,7 @@
</el-table-column>
<el-table-column align="center" prop="labName" label="实验室" />
<el-table-column align="center" prop="chapterContent" label="章节内容" />
<el-table-column align="center" prop="schoolAccessoryList" label="附件">
<el-table-column align="center" prop="schoolAccessoryList" label="附件" width="200">
<template slot-scope="scope">
<div v-for="(accessory, index) in scope.row.accessoryList" :key="index">
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{ accessory.accessoryName }}</a>
......@@ -62,7 +62,7 @@
<template v-else-if="scope.row.applyState === '1' && scope.row.state === '0'">
<div>
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
<el-button size="small" type="text" @click="upload.open = true">上传附件</el-button>
<el-button size="small" type="text" @click="handleUpload(scope.row)">上传附件</el-button>
</div>
</template>
<template v-else>
......@@ -166,11 +166,13 @@
</el-dialog>
<!-- 导入弹出框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<FileUploadlab @input="getFileList" :limit="1" :value="fileList"></FileUploadlab>
<el-dialog :title="upload.title" :visible.sync="opendr" width="400px" append-to-body>
<el-form ref="postForm" :model="postForm" label-width="110px">
<FileUploadlab @input="getFileList" :limit="1" :value="fileList"></FileUploadlab>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
<el-button type="primary" @click="submitFileForm()"> 确 定 </el-button>
<el-button @click="cancel = false">取 消</el-button>
</div>
</el-dialog>
......@@ -223,6 +225,11 @@ export default {
form: {
},
postForm: {
id: '',
accessoryUrl: '',
accessoryName: '',
},
upload: {
// 是否显示弹出层（用户导入）
open: false,
......@@ -242,6 +249,7 @@ export default {
isEdit: true,
total: 0,
dialogTableVisible: false,
opendr: false,
}
},
created() {
......@@ -293,58 +301,84 @@ export default {
this.getList();
},
//提交按钮
submitFileForm(data) {
console.log("getFileList", data);
submitFileForm() {
// 将 fileList 中的数据转换成 schoolAccessoryList 格式的数组
const schoolAccessoryList = this.fileList.map(item => ({
accessoryUrl: item.originalFilename,
accessoryName: item.url
accessoryUrl: item.fjlj,
accessoryName: item.fjmc
}));
// 定义请求的参数对象
const params = {
id: this.form.id,
id: this.postForm.id,
schoolAccessoryList: schoolAccessoryList
};
console.log(params);
// 发送上传文件列表请求
uploadFilelist(params).then(response => {
console.log(params);
this.opendr = false;
this.getList();
console.log("schoolAccessoryList", schoolAccessoryList);
});
},
//上传附件按钮操作
handleUpload() {
handleUpload(row) {
console.log(row);
this.postForm.id = row.id;
this.opendr = true;
},
//取消按钮
cancle() {
this.dialogTableVisible = false;
this.opendr = false;
},
//上传按钮
// getFileList(data) {
// console.log('data', data);
// this.fileList = data;
// if (this.fileList.length !== 0) {
// const file = data[0]; // 获取第一个文件的信息
// console.log('file', file);
// this.accessoryUrl = file.originalFilename;
// this.accessoryName = file.url;
// console.log(this.accessoryUrl, this.accessoryName);
// } else {
// this.form.accessoryUrl = '';
// this.form.accessoryName = '';
// }
// },
getFileList(data) {
console.log('data', data);
this.fileList = data;
if (this.fileList.length !== 0) {
const file = data[0]; // 获取第一个文件的信息
console.log('file', file);
this.accessoryUrl = file.originalFilename;
this.accessoryName = file.url;
console.log(this.accessoryUrl, this.accessoryName);
console.log(this.fileList);
if (this.fileList.length != 0) {
this.postForm.accessoryUrl = data[0].fjlj;
this.postForm.accessoryName = data[0].fjmc;
console.log('this.postForm', this.postForm);
} else {
this.form.accessoryUrl = '';
this.form.accessoryName = '';
}
this.postForm.accessoryUrl = '';
this.postForm.accessoryName = '';
}
},
}
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
<style lang="scss" scoped>
.el-table__column--ellipsis .cell {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/classTeacherWork/laboratoryManagement/personalLaboratoryapp/index.vue
......@@ -51,7 +51,13 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="schoolAccessoryList" label="实验结果" />
<el-table-column align="center" prop="schoolAccessoryList" label="实验结果" width="200px">
<template slot-scope="scope">
<div v-for="(accessory, index) in scope.row.accessoryList" :key="index">
<a :href="baseUrl + accessory.accessoryUrl" target="_blank">{{ accessory.accessoryName }}</a>
</div>
</template>
</el-table-column>
<el-table-column align="center" prop="declareState" label="申报状态">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.declare_state, row.declareState) }}</div>
......@@ -263,11 +269,13 @@
</el-dialog>
<!-- 导入弹出框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<FileUploadlab @input="getFileList" :limit="1" :value="fileList"></FileUploadlab>
<el-dialog :title="upload.title" :visible.sync="opendr" width="400px" append-to-body>
<el-form ref="postForm" :model="postForm" label-width="110px">
<FileUploadlab @input="getFileList" :limit="1" :value="fileList"></FileUploadlab>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
<el-button type="primary" @click="submitFileForm()"> 确 定 </el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
......@@ -343,12 +351,19 @@ export default {
url: process.env.VUE_APP_BASE_API + '/school/student/importData'
},
schoolTeacherExperimentApplyLabsList: [],
schoolAccessoryList: [],
//级部
gradeList: [],
gradeLists: [],
total: 0,
postForm: {
id: '',
accessoryUrl: '',
accessoryName: '',
},
dialogTableVisible: false,
open: false,
opendr: false,
rules: {
sub: [
{ required: true, message: "学科不能为空", trigger: "blur" }
......@@ -394,7 +409,12 @@ export default {
getApplylist(this.queryForm)
.then(response => {
this.tableData = response.rows;
this.tableData = response.rows.map(item => {
item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
return item;
});
console.log('response', response);
console.log(response.rows.a);
this.total = response.total;
this.loading = false;
})
......@@ -503,39 +523,38 @@ export default {
getFileList(data) {
console.log('data', data);
this.fileList = data;
if (this.fileList.length !== 0) {
const file = data[0]; // 获取第一个文件的信息
console.log('file', file);
this.accessoryUrl = file.accessoryUrl;
this.accessoryName = file.accessoryName;
setTimeout(() => {
console.log(this.accessoryUrl, this.accessoryName);
}, 100); // 等待100毫秒后再打印
console.log(this.fileList);
if (this.fileList.length != 0) {
this.postForm.accessoryUrl = data[0].fjlj;
this.postForm.accessoryName = data[0].fjmc;
console.log('this.postForm', this.postForm);
} else {
this.form.accessoryUrl = '';
this.form.accessoryName = '';
this.postForm.accessoryUrl = '';
this.postForm.accessoryName = '';
}
},
//提交按钮
submitFileForm(data) {
console.log("getFileList", data);
submitFileForm() {
// 将 fileList 中的数据转换成 schoolAccessoryList 格式的数组
const schoolAccessoryList = this.fileList.map(item => ({
accessoryUrl: item.originalFilename,
accessoryName: item.url
accessoryUrl: item.fjlj,
accessoryName: item.fjmc
}));
// 定义请求的参数对象
const params = {
id: this.form.id,
id: this.postForm.id,
schoolAccessoryList: schoolAccessoryList
};
console.log(params);
// 发送上传文件列表请求
getResult(params).then(response => {
console.log(params);
this.opendr = false;
this.getList();
console.log("schoolAccessoryList", schoolAccessoryList);
});
},
......@@ -688,18 +707,23 @@ export default {
},
//上传附件按钮操作
handleResult() {
handleResult(row) {
console.log(row);
this.upload.title = '实验结果'
this.upload.open = true
this.opendr = true;
this.postForm.id = row.id;
},
//取消按钮
cancel() {
this.dialogTableVisible = false;
this.open = false;
this.opendr = false;
},
},
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
<style lang="scss" scoped>
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
......@@ -38,16 +38,12 @@
</template>
</el-table-column>
<el-table-column label="证书照片" align="center" prop="schoolAccessoryList">
<!-- <template slot-scope="scope">
<ListImage :image-url="pev + scope.row.accessoryUrl"></ListImage>
</template> -->
<template slot-scope="scope">
<!-- <ListImage :image-url="pev+scope.row.picUrl"></ListImage> -->
<!-- previewSrcList 开启预览大图的功能。-->
<el-image style="width: 100px; height: 100px" :src="scope.row.url" :preview-src-list="srcList">
</el-image>
<el-image style="width: 100px; height: 100px" :src="scope.row.pictureUrl"
:preview-src-list="scope.row.previewUrls"></el-image>
</template>
</el-table-column>
<el-table-column label="备注1" align="center" prop="remark1" />
<el-table-column label="备注2" align="center" prop="remark2" />
<el-table-column label="备注3" align="center" prop="remark3" />
......@@ -118,14 +114,16 @@
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="证书照片">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:http-request="uploadImage" :disabled="nowType == 2 ? true : false">
<img v-if="imageUrl" :src="imageUrl" style="width: 178px; height: 178px;" class="avatar" alt="" />
<!-- :preview-src-list="[imageUrl]"-->
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<el-form-item prop="schoolAccessoryList" label="证书照片">
<el-form-item prop="schoolAccessoryList" label="证书照片">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:http-request="uploadImage">
<img v-if="form.schoolAccessoryList && form.schoolAccessoryList.length > 0"
:src="form.schoolAccessoryList[0].accessoryUrl" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-form-item>
</el-col>
<el-col :span="10">
......@@ -156,7 +154,10 @@
</div>
</el-dialog>
<el-dialog ref="previewDialog" title="预览图片" :visible.sync="previewDialogVisible">
<el-image style="width: 100%; max-height: 80vh; object-fit: contain" :src="previewImageUrl"
fit="contain"></el-image>
</el-dialog>
</div>
</template>
......@@ -178,6 +179,8 @@ export default {
components: { picAvatar },
data() {
return {
//缩略图
srcList: [],
// 图片路径
imageUrl: undefined,
pev: process.env.VUE_APP_BASE_API,
......@@ -185,6 +188,7 @@ export default {
pageNum: 1,
pageSize: 10,
},
previewImageUrl: '',
//获取子组件传来的信息
pic: [],
// 图片路径
......@@ -199,6 +203,7 @@ export default {
dialogTitle: '', //弹窗标题
dialogVisible: false,
nowOption: null,
uploadedFiles: [],
form: {
schoolYear: '',
teacherId: '',
......@@ -210,9 +215,10 @@ export default {
remark1: '',
remark2: '',
remark3: '',
schoolAccessoryList: '',
schoolAccessoryList: [],
},
previewDialogVisible: false,
teacherList: [],
rules: {},
nowType: 0, // 0新增、1编辑、2查看
......@@ -232,15 +238,25 @@ export default {
this.getTeacher();
},
methods: {
handlePreview(url) {
this.previewImageUrl = url;
this.$refs.previewDialog.open();
},
//获取列表数据
getList() {
getCompetition(this.queryForm).then(response => {
this.competitionData = response.rows;
console.log('response', response);
this.total = response.total
this.loading = false
})
this.total = response.total;
this.loading = false;
this.competitionData.forEach(item => {
item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
});
});
},
//获取图片信息
getSchoolInfoPic(val) {
this.pic = val
......@@ -277,14 +293,19 @@ export default {
.then(response => {
this.uploadLoading = false
this.$modal.msgSuccess('上传成功')
this.imageUrl = this.pev + response.url
this.form.avatar = response.url
this.imageUrl = process.env.VUE_APP_BASE_API + response.url
// 添加以下代码将文件信息添加到 uploadedFiles 数组中
this.uploadedFiles.push({
accessoryUrl: process.env.VUE_APP_BASE_API + response.url,
accessoryName: fileData.name
})
})
.catch(error => {
this.uploadLoading = false
})
},
//重置
resetQuery() {
......@@ -330,10 +351,13 @@ export default {
const id = row.id
getCompetitionxq(id).then(response => {
if (response.code == 200) {
console.log(response);
Object.keys(this.form).forEach(key => {
if (response.data[key]) {
this.$set(this.form, key, response.data[key]);
}
if (response.data.schoolAccessoryList && response.data.schoolAccessoryList.length > 0) {
this.imageUrl = response.data.schoolAccessoryList[0].accessoryUrl; // 将图片地址赋值给 imageUrl
}
})
......@@ -353,11 +377,19 @@ export default {
},
/** 提交按钮 */
submitForm: function () {
let fileList = []; // 添加这行代码定义 fileList 变量
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != "") {
// 清空原有图片
this.form.schoolAccessoryList = [];
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
updateCompetition(this.form).then(({ code }) => {
if (code == 200) {
this.$modal.msgSuccess('修改成功')
......@@ -368,12 +400,14 @@ export default {
this.$modal.msgError("修改失败");
});
} else {
for (let i = 0; i < fileList.length; i++) {
const file = fileList[i];
// 将照片信息添加到 schoolAccessoryList 数组中
// 清空原有图片
this.form.schoolAccessoryList = [];
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.url,
accessoryName: file.name
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
......@@ -389,6 +423,7 @@ export default {
});
},
cancel() {
this.dialogVisible = false;
},
......
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
......@@ -236,7 +236,8 @@ export default {
getProductCategory().then(((res) => {
if (res.code == 200) {
this.sbflOptions = res.data;
// console.log('this.sbflOptions', this.sbflOptions);
// console.log(this.sbflOptions);
console.log('this.sbflOptions', this.sbflOptions);
}
}))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment