p_graphite_digester
/
graphite_digester_bg
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

~~

master
sige 2 years ago
parent
c211d39174
commit
25bc215ae5
11 changed files with 23 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/src/main/resources/static/css/app.a74fd712.css
  2. 1
      src/src/main/resources/static/img/heating.b1a3f43f.svg
  3. BIN
      src/src/main/resources/static/img/login-pic.8b43ef5b.png
  4. 2
      src/src/main/resources/static/index.html
  5. 2
      src/src/main/resources/static/js/app.249db83d.js
  6. 1
      src/src/main/resources/static/js/app.249db83d.js.map
  7. BIN
      src/web/src/assets/img/login-pic.png
  8. 4
      src/web/src/pages/login/Page.vue
  9. 4
      src/web/src/pages/main/contents/AcidManagement.vue
  10. 32
      src/web/src/pages/main/contents/Operation.vue
  11. 4
      src/web/src/utils/ApiClient.js

1
src/src/main/resources/static/css/app.a74fd712.css
File diff suppressed because it is too large
View File

1
src/src/main/resources/static/img/heating.b1a3f43f.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="30" height="30" viewBox="0 0 30 30"><g><g><ellipse cx="15.000000953674316" cy="15.000000953674316" rx="15.000000953674316" ry="15.000000953674316" fill="#4F85FB" fill-opacity="1"/></g><g><path d="M15.572964310913086,17.493189699554442L15.572964310913086,12.622559699554444C15.572964310913086,12.326459699554444,15.321594310913085,12.085319699554443,15.012934310913085,12.085319699554443L14.968584310913087,12.085319699554443C14.667314310913085,12.085319699554443,14.425184310913085,12.319369699554443,14.425184310913085,12.606599699554444L14.425184310913085,17.493189699554442C13.589774310913086,17.72538969955444,12.977994310913086,18.441689699554445,12.977994310913086,19.296389699554446C12.977994310913086,20.340689699554446,13.881794310913087,21.186389699554443,15.000004310913086,21.186389699554443C16.116354310913085,21.186389699554443,17.020154310913085,20.338889699554443,17.020154310913085,19.296389699554446C17.018304310913088,18.441689699554445,16.406534310913088,17.727189699554444,15.572964310913086,17.493189699554442ZM18.546824310913088,15.335339699554444C18.421144310913085,15.236049699554444,18.34721431091309,15.101299699554444,18.34721431091309,14.962999699554443L18.34721431091309,9.455879699554444C18.34721431091309,7.723599699554443,16.844574310913085,6.315789699554443,14.998154310913087,6.315789699554443C13.151734310913085,6.315789699554443,11.649094310913085,7.723599699554443,11.649094310913085,9.455879699554444L11.649094310913085,14.806969699554443C11.649094310913085,15.039239699554443,11.549284310913086,15.253779699554443,11.377394310913086,15.393849699554444C10.166784310913085,16.374389699554442,9.473684310913086,17.798089699554446,9.473684310913086,19.298089699554446C9.473684310913086,22.150989699554444,11.952204310913086,24.473689699554445,15.000004310913086,24.473689699554445C18.047794310913083,24.473689699554445,20.526284310913084,22.152789699554443,20.526284310913084,19.298089699554446C20.52448431091309,17.762689699554443,19.803684310913084,16.317589699554443,18.546824310913088,15.335339699554444ZM14.998154310913087,22.830089699554442C12.909614310913085,22.830089699554442,11.212904310913085,21.244989699554445,11.212904310913085,19.296389699554446C11.212904310913085,18.08178969955444,11.874584310913086,16.964789699554444,12.981694310913086,16.310519699554444L13.249694310913085,16.152719699554446C13.336564310913086,16.101299699554446,13.390164310913086,16.009099699554444,13.390164310913086,15.911589699554444L13.390164310913086,9.455879699554444C13.390164310913086,8.629629699554442,14.112834310913087,7.957639699554443,15.000004310913086,7.957639699554443C15.887164310913086,7.957639699554443,16.609844310913086,8.629629699554442,16.609844310913086,9.455879699554444L16.609844310913086,15.911579699554443C16.609844310913086,16.009099699554444,16.663444310913086,16.101299699554446,16.750304310913087,16.152719699554446L17.018304310913088,16.310519699554444C18.125414310913087,16.964789699554444,18.785254310913086,18.079989699554446,18.785254310913086,19.296389699554446C18.783404310913085,21.244989699554445,17.084844310913084,22.830089699554442,14.998154310913087,22.830089699554442Z" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>

BIN
src/src/main/resources/static/img/login-pic.8b43ef5b.png
View File

Side by Side

Before

Width: 1028  |  Height: 762  |  Size: 201 KiB

2
src/src/main/resources/static/index.html
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>vue3-demo</title><script defer="defer" src="/js/chunk-vendors.ca93a0b6.js"></script><script defer="defer" src="/js/app.249db83d.js"></script><link href="/css/app.a74fd712.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue3-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>vue3-demo</title><script defer="defer" src="/js/chunk-vendors.ca93a0b6.js"></script><script defer="defer" src="/js/app.7abc112c.js"></script><link href="/css/app.425bb5aa.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue3-demo doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
src/src/main/resources/static/js/app.249db83d.js
File diff suppressed because it is too large
View File

1
src/src/main/resources/static/js/app.249db83d.js.map
File diff suppressed because it is too large
View File

BIN
src/web/src/assets/img/login-pic.png
View File

Side by Side Swipe Overlay

Before

Width: 1028  |  Height: 762  |  Size: 201 KiB

After

Width: 701  |  Height: 517  |  Size: 133 KiB

4
src/web/src/pages/login/Page.vue
View File

@ -6,11 +6,11 @@
</div>
</a-col>
<a-col :span="10" class="flex flex-row items-center p-10">
<div class="bg-gray-100 p-20 rounded-2xl w-full">
<div class="bg-gray-100 py-14 rounded-2xl w-full">
<div class="text-center">
<img src="@/assets/icon/logo.svg" class="w-20" />
</div>
<div class="text-center my-8">
<div class="text-center my-6">
<span style="font-size:30px;font-weight:500;color:#8799AB;">长春黄金研究院有限公司</span>
</div>
<div class="p-10">

4
src/web/src/pages/main/contents/AcidManagement.vue
View File

@ -29,12 +29,12 @@
<span class="inline-block p-1 rounded-2xl mr-5" style="background:#DCE8F7;">3000g</span>
<span class="inline-block py-1">5000g</span>
</div>
<div class="p-5 text-3xl bg-blue-500 text-white mt-10 rounded-3xl">加载</div>
<div class="py-3 px-5 text-3xl bg-blue-500 text-white mt-10 rounded-3xl">加载</div>
</div>
</a-col>
<a-col :span="4" class="p-5">
<div class="flex flex-col justify-center items-center h-full bg-gray-50 rounded-3xl">
<div v-for="i in 8" :key="i" class="bg-white bg-gray-200 p-5 mb-5 w-3/4 text-center rounded-3xl text-xl text-gray-500" :class="{'!bg-blue-500 !text-white':i==2}">
<div v-for="i in 8" :key="i" class="bg-white bg-gray-200 p-3 mb-5 w-3/4 text-center rounded-3xl text-xl text-gray-500" :class="{'!bg-blue-500 !text-white':i==2}">
硫酸
</div>
</div>

32
src/web/src/pages/main/contents/Operation.vue
View File

@ -11,7 +11,7 @@
</div>
</div>
<div class="mt-3">
<a-button>拍照</a-button>
<a-button><CameraOutlined /></a-button>
</div>
</div>
</a-col>
@ -20,10 +20,10 @@
<a-col :span="10" class="p-1">
<div class="h-full flex flex-col bg-white rounded-2xl p-5">
<div class="h-0 grow flex flex-col">
<div class="text-xl text-blue-500 mb-3">
<!-- <div class="text-xl text-blue-500 mb-3">
<img src="../../../assets/icon/heating.svg" class="inline-block w-6 h-6 mr-2" />
<span>石墨加热区</span>
</div>
</div> -->
<div class="heating-plate h-0 grow bg-green-400 flex flex-col justify-center items-center rounded-full">
<div class="relative w-1/4 h-1/4">
<div v-for="tubeRackSlot in tubeRackSlots" :key="tubeRackSlot.index" class="tube-rack-slot absolute h-full w-full"
@ -47,13 +47,13 @@
<div class="mt-3">
<a-row>
<a-col :span="13" class="text-left">
<a-button @click="actionPresetSetup">预设</a-button>
<a-button class="ml-1" @click="actionAcidAdd">加酸</a-button>
<a-button class="ml-1" @click="actionHeating">加热</a-button>
<a-button @click="actionPresetSetup"><SettingOutlined /></a-button>
<a-button class="ml-1" @click="actionAcidAdd"><ExperimentOutlined /></a-button>
<a-button class="ml-1" @click="actionHeating"><FireOutlined /></a-button>
</a-col>
<a-col :span="11" class="text-right">
<a-button class="ml-1" @click="actionSampleAdd">添加样本</a-button>
<a-button class="ml-1" @click="actionSampleTakeOut">取出样本</a-button>
<a-button class="ml-1" @click="actionSampleAdd"><PlusCircleOutlined /></a-button>
<a-button class="ml-1" @click="actionSampleTakeOut"><CheckCircleOutlined /></a-button>
</a-col>
</a-row>
</div>
@ -63,10 +63,10 @@
<!-- 温度 -->
<a-col :span="5" class="p-1">
<div class="h-full flex flex-col bg-white rounded-2xl p-5">
<a-row class="mb-3 text-blue-500">
<!-- <a-row class="mb-3 text-blue-500">
<a-col :span="20" class="text-xl">加热温度</a-col>
<a-col :span="4" class="text-right text-xl">℃</a-col>
</a-row>
</a-row> -->
<div class="h-0 grow">
<div v-for="tubeRackSlot in tubeRackSlots" :key="tubeRackSlot.index" class="bg-gray-100 mb-2 flex flex-row p-2 rounded-2xl">
<div class="flex flex-row items-center">
@ -102,12 +102,12 @@
</div>
<!-- 添加样品弹框 -->
<a-modal v-model:visible="sampleAdd.enable" title="添加样本" @ok="actionSampleAddOk" @cancel="actionSampleAddCancel">
<a-modal v-model:visible="sampleAdd.enable" title="添加样本" @ok="actionSampleAddOk" @cancel="actionSampleAddCancel" ok-text="确认" cancel-text="取消">
<p>放入样本后点击确认完成添加</p>
</a-modal>
<!-- 取出样品 -->
<a-modal v-model:visible="sampleTakeout.enable" title="取出样本" @ok="actionSampleTakeOutOk" @cancel="actionSampleTakeOutCancel">
<a-modal v-model:visible="sampleTakeout.enable" title="取出样本" @ok="actionSampleTakeOutOk" @cancel="actionSampleTakeOutCancel" ok-text="确认" cancel-text="取消">
<a-form :label-col="{span:4}" :wrapper-col="{span:20}" label-align="left" class="py-5">
<a-form-item label="位置">
<a-radio-group v-model:value="sampleTakeout.slotIndex" button-style="solid">
@ -122,7 +122,7 @@
</a-modal>
<!-- 执行预设 -->
<a-modal v-model:visible="presetSetup.enable" title="执行预设" @ok="actionPresetSetupOk" @cancel="actionPresetSetupCancel">
<a-modal v-model:visible="presetSetup.enable" title="执行预设" @ok="actionPresetSetupOk" @cancel="actionPresetSetupCancel" ok-text="确认" cancel-text="取消">
<a-form :label-col="{span:4}" :wrapper-col="{span:20}" label-align="left" class="py-5">
<a-form-item label="位置">
<a-radio-group v-model:value="presetSetup.slotIndex" button-style="solid">
@ -142,7 +142,7 @@
</a-modal>
<!-- 加酸 -->
<a-modal v-model:visible="acidAdd.enable" title="加酸" @ok="acidAddOk" @cancel="acidAddCancel">
<a-modal v-model:visible="acidAdd.enable" title="加酸" @ok="acidAddOk" @cancel="acidAddCancel" ok-text="确认" cancel-text="取消">
<a-form :label-col="{span:4}" :wrapper-col="{span:20}" label-align="left" class="py-5">
<a-form-item label="位置">
<a-radio-group v-model:value="acidAdd.slotIndex" button-style="solid">
@ -169,7 +169,7 @@
</a-modal>
<!-- 加热 -->
<a-modal v-model:visible="heating.enable" title="加热" @ok="actionHeatingOk" @cancel="actionHeatingCancel">
<a-modal v-model:visible="heating.enable" title="加热" @ok="actionHeatingOk" @cancel="actionHeatingCancel" ok-text="确认" cancel-text="取消">
<a-form :label-col="{span:4}" :wrapper-col="{span:20}" label-align="left" class="py-5">
<a-form-item label="位置">
<a-radio-group v-model:value="heating.slotIndex" button-style="solid">
@ -202,7 +202,7 @@ const presetSetup = ref({enable:false,slotIndex:0,name:''});
/** @var {Object} */
const acidAdd = ref({enable:false,slotIndex:0,liquidIndex:0,liquidVolume:100,shakeTimes:3});
/** @var {Object} */
const heating = ref({enable:false,slotIndex:0,temperature:0,duration:0});
const heating = ref({enable:false,slotIndex:0,temperature:100,duration:10});
/** @var {Array} */
const tubeRackSlots = ref([]);
/** @var {Array} */

4
src/web/src/utils/ApiClient.js
View File

@ -27,8 +27,8 @@ export default class ApiClient {
let headers = {};
headers['App-Access-Token'] = appStore.accessToken;
let baseURL = 'http://localhost:8080/api';
if ( '192.168.8.10' === window.location.host ) {
let baseURL = `http://${window.location.hostname}:8080/api`;
if ( '192.168.8.10' === window.location.hostname ) {
baseURL = 'http://192.168.8.10/api';
}

Write Preview
Loading…
Cancel
Save