Skip to content

M
mmc-stl-vue2
提交 caa9c6da 作者: 翁进城
操作

UI: 天目将V4 UI适配

上级 68d83db7
流水线 #10439 已失败 于阶段
正在显示 包含 872 行增加 和 629 行删除
index.js
import Vue from "vue"; import Vue from "vue";
import VueClipBoard from "vue-clipboard2"; import VueClipBoard from "vue-clipboard2";
import interact from "./src/directives/interact"; import interact from "./src/directives/interact";
import hover from './src/directives/hover';
// import "./src/style/index.css"; // import "./src/style/index.css";
import "./src/style/index.scss"; import "./src/style/index.scss";
...@@ -30,6 +31,7 @@ export default { ...@@ -30,6 +31,7 @@ export default {
install: function (Vue, options) { install: function (Vue, options) {
Vue.use(VueClipBoard); Vue.use(VueClipBoard);
Vue.directive(interact.name, interact.directive); Vue.directive(interact.name, interact.directive);
Vue.directive(hover.name, hover.directive);
components.forEach((component) => { components.forEach((component) => {
Vue.component(component.name, component); Vue.component(component.name, component);
}); });
......
src/components/MMCDataTransferPanel/components/throttleGauge/index.vue
...@@ -35,6 +35,7 @@ export default { ...@@ -35,6 +35,7 @@ export default {
<style scoped> <style scoped>
.throttle-gauge { .throttle-gauge {
position: relative; position: relative;
z-index: 1;
} }
.img1 { .img1 {
......
src/components/MMCDataTransferPanel/index.vue
...@@ -72,7 +72,8 @@ export default { ...@@ -72,7 +72,8 @@ export default {
.nest_control { .nest_control {
display: flex; display: flex;
align-items: center; align-items: center;
background: rgba(9, 32, 87, 0.7); background: #222222;
backdrop-filter: blur(1px);
padding: 0 60px 0 40px; padding: 0 60px 0 40px;
} }
} }
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/assets/images/ai.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 34</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-20.000000, -136.000000)">
<g id="编组-13备份-6" transform="translate(12.000000, 128.000000)">
<g id="编组-34" transform="translate(8.000000, 8.000000)">
<g id="人脸识别" fill="#4E4E4E" fill-rule="nonzero">
<rect id="矩形" opacity="0" x="0" y="0" width="20" height="19.9999942"></rect>
<path d="M19.989697,2.50386706 L19.989697,17.4961354 C19.882929,18.9711292 18.6089128,20.0854289 17.1328361,19.9948468 L2.85686086,19.9948468 C1.38078422,20.0854289 0.106767945,18.9711292 0,17.4961354 L0,2.50386706 C0.106767955,1.02887328 1.38078422,-0.0854263383 2.85686086,0.00515568209 L17.1328361,0.00515568209 C18.6089127,-0.0854263383 19.882929,1.02887328 19.989697,2.50386706 Z M3.00678359,13.1650357 C2.8388124,13.1536198 2.67321333,13.2095881 2.54660738,13.3205637 C2.42000144,13.4315392 2.34282005,13.5883784 2.33213131,13.7563974 L2.33213131,16.1884765 C2.39009897,17.0567133 3.1284142,17.7211968 3.99793939,17.6877033 L6.38004496,17.6877033 C6.59431966,17.687742 6.7923342,17.57345 6.89948272,17.3878892 C7.00663123,17.2023284 7.00663123,16.9736968 6.89948272,16.788136 C6.7923342,16.6025751 6.59431966,16.4882832 6.38004496,16.4883218 L4.37274621,16.4883218 C4.20035866,16.499728 4.03052758,16.4420009 3.90079994,16.3279032 C3.7710723,16.2138054 3.69213357,16.052735 3.68143586,15.8803021 L3.68143586,13.7647264 C3.65910334,13.4136203 3.35808669,13.14605 3.00678359,13.1650357 Z M17.003736,13.1649199 C16.6600992,13.1649199 16.3713711,13.4232109 16.3332482,13.7647264 L16.3332482,15.8803021 C16.3225505,16.052735 16.2436118,16.2138054 16.1138842,16.3279032 C15.9841565,16.4420009 15.8143254,16.499728 15.6419379,16.4883218 L13.609652,16.4883218 C13.3953773,16.4882832 13.1973628,16.6025751 13.0902143,16.788136 C12.9830658,16.9736968 12.9830658,17.2023284 13.0902143,17.3878892 C13.1973628,17.57345 13.3953773,17.6877186 13.609652,17.6877186 L15.9917576,17.6877186 C16.4306065,17.6895188 16.8547,17.5293717 17.1828104,17.2379353 C17.4951813,16.9791038 17.6754394,16.594146 17.6742299,16.1884765 L17.6742299,13.7647264 C17.6361009,13.4232109 17.3473728,13.1649199 17.003736,13.1649199 Z M9.83789398,6.76047604 L8.1155923,6.76047604 L5.5987236,13.636364 L7.18785763,13.636364 L7.69389472,12.0605472 L10.1930077,12.0605472 L10.7079227,13.636364 L12.3059345,13.636364 L9.83789398,6.76047604 Z M14.441056,6.36985103 L13.0117231,6.36985103 L13.0117231,13.636364 L14.441056,13.636364 L14.441056,6.36985103 Z M8.95898745,7.94566783 C8.97970242,8.19424738 9.0152138,8.39399881 9.06552158,8.54492211 L9.84677183,10.9286225 L8.0134971,10.9286225 L8.79918627,8.52716643 C8.86133117,8.34073176 8.90128147,8.1468989 8.91903716,7.94566783 Z M6.38004496,2.31229919 L3.97295227,2.31229919 C3.10342707,2.27880569 2.36511185,2.94328921 2.3071442,3.81152604 L2.3071442,6.24360512 C2.31783294,6.41162409 2.39501433,6.56846327 2.52162027,6.67943881 C2.6482262,6.79041436 2.81382528,6.84638269 2.98179646,6.83496682 C3.33309956,6.85395248 3.6341162,6.58638221 3.65644873,6.2352761 L3.65644873,4.11970044 C3.66714644,3.94726752 3.74608517,3.78619711 3.87581281,3.67209934 C4.00554046,3.55800156 4.17537154,3.50027449 4.3477591,3.51168066 L6.38004496,3.51168066 C6.73134805,3.53066632 7.03236469,3.26309605 7.05469723,2.91198993 C7.0323647,2.56088381 6.73134806,2.29331353 6.38004496,2.31229919 Z M15.9834285,2.31229919 L13.609652,2.31229919 C13.2583489,2.29331352 12.9573323,2.5608838 12.9349997,2.91198993 C12.9573323,3.26309606 13.2583489,3.53066633 13.609652,3.51168066 L15.6336088,3.51168066 C15.8059964,3.50027449 15.9758275,3.55800157 16.1055551,3.67209934 C16.2352828,3.78619712 16.3142215,3.94726752 16.3249192,4.11970044 L16.3249192,6.2352761 C16.3772562,6.5673233 16.6634248,6.81191921 16.9995715,6.81191921 C17.3357181,6.81191921 17.6218868,6.5673233 17.6742237,6.2352761 L17.6825528,3.81152604 C17.6805472,3.40474545 17.4973464,3.02002385 17.1828104,2.76206724 C16.8509306,2.47141923 16.424586,2.31154007 15.9834285,2.31229919 Z" id="形状结合"></path>
</g>
<g id="Al" transform="translate(5.598724, 6.369851)"></g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/assets/images/car.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>车牌识别</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-187.000000, -141.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="编组-44备份" transform="translate(122.000000, 134.000000)">
<g id="车牌识别" transform="translate(65.000000, 7.000000)">
<path d="M1.1,16.4989 L1.1,19.8 C1.1,20.3641194 1.52464421,20.8290579 2.07171676,20.8925995 L2.2,20.9 L5.5,20.9 L5.5,22 L2.2,22 C0.98497355,22 0,21.0150264 0,19.8 L0,16.5 L1.1,16.4989 Z M22,16.5 L22,19.8 C22,21.0150264 21.0150264,22 19.8,22 L16.5,22 L16.5,20.9 L19.8,20.9 C20.3641194,20.9 20.8290579,20.4753558 20.8925995,19.9282832 L20.9,19.8 L20.9,16.4989 L22,16.5 Z M19.8,0 C21.0150264,0 22,0.98497355 22,2.2 L22,5.5 L20.9,5.4989 L20.9,2.2 C20.9,1.63588058 20.4753558,1.17094212 19.9282832,1.1074005 L19.8,1.1 L16.5,1.1 L16.5,0 L19.8,0 Z M5.5,0 L5.5,1.1 L2.2,1.1 C1.63588058,1.1 1.17094212,1.52464421 1.1074005,2.07171676 L1.1,2.2 L1.1,5.4989 L0,5.5 L0,2.2 C0,0.98497355 0.98497355,0 2.2,0 L5.5,0 Z" id="Mask"></path>
<path d="M17.6181818,8.53333333 L16.2818182,8.53333333 C16.2181818,8.53333333 16.1545455,8.53333333 16.0909091,8.6 L15.5181818,6.66666667 C15.3909091,5.53333333 14.6909091,5 13.8,5 L8.2,5 C7.24545455,5 6.60909091,5.73333333 6.48181818,6.66666667 L5.84545455,8.6 C5.78181818,8.53333333 5.71818182,8.53333333 5.65454545,8.53333333 L4.38181818,8.53333333 C4.19090909,8.53333333 4,8.73333333 4,8.93333333 L4,9.26666667 C4,9.46666667 4.19090909,9.66666667 4.38181818,9.66666667 L4.89090909,9.73333333 C4.7,10.0666667 4.63636364,10.4666667 4.63636364,10.9333333 L4.44545455,13.2 L4.44545455,16.2666667 C4.44545455,16.6666667 4.76363636,17 5.08181818,17 L6.1,17 C6.48181818,17 6.73636364,16.6666667 6.73636364,16.2666667 L6.73636364,15.4 L15.2636364,15.4 L15.2636364,16.2666667 C15.2636364,16.6666667 15.5818182,17 15.9,17 L16.9181818,17 C17.3,17 17.5545455,16.6666667 17.5545455,16.2666667 L17.5545455,13.5333333 L17.5545455,13.4 L17.5545455,13.2 L17.3636364,10.9333333 C17.3636364,10.4666667 17.3,10.1333333 17.1090909,9.8 L17.6181818,9.66666667 C17.8090909,9.66666667 18,9.46666667 18,9.26666667 L18,8.93333333 C18,8.73333333 17.8090909,8.53333333 17.6181818,8.53333333 Z M6.86363636,8.13333333 L7.30909091,6.86666667 C7.37272727,6.6 7.5,6.53333333 7.62727273,6.33333333 L14.4363636,6.33333333 C14.5636364,6.53333333 14.6909091,6.6 14.6909091,6.8 L15.1363636,8.06666667 L15.3272727,8.8 C15.2636364,9.33333333 14.7545455,9.73333333 14.2454545,9.73333333 L7.81818182,9.73333333 C7.37272727,9.73333333 6.8,9.33333333 6.73636364,8.8 L6.86363636,8.13333333 L6.86363636,8.13333333 Z M7.18181818,14.1333333 C6.60909091,14.1333333 6.16363636,13.6666667 6.16363636,13.0666667 C6.16363636,12.4666667 6.60909091,12 7.18181818,12 C7.75454545,12 8.2,12.4666667 8.2,13.0666667 C8.2,13.6 7.75454545,14.1333333 7.18181818,14.1333333 Z M14.8181818,14.1333333 C14.2454545,14.1333333 13.8,13.6666667 13.8,13.0666667 C13.8,12.4666667 14.2454545,12 14.8181818,12 C15.3909091,12 15.8363636,12.4666667 15.8363636,13.0666667 C15.8363636,13.6 15.3909091,14.1333333 14.8181818,14.1333333 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/assets/images/collapse.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="36px" height="104px" viewBox="0 0 36 104" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 16</title>
<defs>
<linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
<stop stop-color="#505050" offset="0%"></stop>
<stop stop-color="#707070" offset="100%"></stop>
</linearGradient>
<path d="M0,0 L29.1799936,18.237496 C30.9342818,19.3339261 32,21.2567457 32,23.3254858 L32,76.6745142 C32,78.7432543 30.9342818,80.6660739 29.1799936,81.762504 L0,100 L0,100 L0,0 Z" id="path-2"></path>
<filter x="-7.8%" y="-3.5%" width="121.9%" height="107.0%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="1" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.324191434 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用" transform="translate(-594.000000, -425.000000)">
<g id="编组-16" transform="translate(595.000000, 427.000000)">
<g id="矩形">
<use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
<use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/assets/images/face.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>人脸识别</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-135.000000, -141.000000)">
<g id="编组-44备份" transform="translate(122.000000, 134.000000)">
<g id="人脸识别" transform="translate(13.000000, 7.000000)">
<g id="编组-14" transform="translate(5.000000, 4.000000)">
<path d="M7.06028076,11.5096154 C7.06028076,11.3980963 6.97115495,11.3076923 6.86121269,11.3076923 C6.75127044,11.3076923 6.66214463,11.3980963 6.66214463,11.5096154 C6.66214463,11.7963462 6.17243718,12.1153846 5.46773623,12.1153846 C4.76303527,12.1153846 4.27332783,11.7963462 4.27332783,11.5096154 C4.27332783,11.3980963 4.18420202,11.3076923 4.07425976,11.3076923 C3.9643175,11.3076923 3.8751917,11.3980963 3.8751917,11.5096154 C3.8751917,12.075 4.57392061,12.5192308 5.46773623,12.5192308 C6.36155185,12.5192308 7.06028076,12.075 7.06028076,11.5096154 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
<ellipse id="椭圆形" fill="#4E4E4E" cx="3.18508906" cy="7.53846154" rx="1" ry="1"></ellipse>
<ellipse id="椭圆形" fill="#4E4E4E" cx="7.96272266" cy="7.53846154" rx="1" ry="1"></ellipse>
<path d="M4.98997287,10.3923077 L5.25539696,10.3923077 C5.54857631,10.3923077 5.78624513,10.1512302 5.78624513,9.85384615 L5.78624513,7.96923077 C5.78624513,7.82053872 5.66741072,7.7 5.52082105,7.7 C5.37423137,7.7 5.25539696,7.82053872 5.25539696,7.96923077 L5.25539696,9.85384615 L4.98997287,9.85384615 C4.84338319,9.85384615 4.72454878,9.97438488 4.72454878,10.1230769 C4.72454878,10.271769 4.84338319,10.3923077 4.98997287,10.3923077 Z" id="路径" fill="#4E4E4E"></path>
<path d="M9.6685148,12.5899487 C10.0092066,11.6803775 10.1814911,10.7148417 10.1767135,9.74184615 C10.1767135,6.83989744 8.30246549,5.72169231 6.38150289,5.03210256 C4.40214699,4.32169231 2.37466085,4.05892308 2.37466085,2.25794872 C2.37466085,0.594820513 3.83024655,4.54747351e-13 5.55479533,4.54747351e-13 C7.37808187,4.54747351e-13 12,1.31169231 12,6.73112821 C11.9910878,8.91473382 11.1565815,11.0116475 9.6685148,12.5895897" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M2.90444733,3.55564103 C2.90444733,4.96784615 1.08823876,6.38723077 1.08823876,7.63430769 C1.10400562,8.41837514 1.33395936,9.18262554 1.75250678,9.842 C1.75250678,9.842 0,8.62364103 0,5.88538462 C0,3.14712821 1.53379733,1.83974359 2.51232747,1.45384615 M5.54063938,14 C6.53297157,14 10.0415241,12.1204103 10.0415241,8.49476923" id="形状" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M5.54063938,14 C4.61200897,14 1.47965082,12.3537436 1.08151469,9.17071795" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M1.52247257,10.7153846 C0.74154112,10.6166408 0.179668455,9.90577799 0.254453226,9.11112821 C0.252151854,8.81397431 0.345325323,8.52414441 0.519877315,8.28548718" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M2.90444733,3.55564103 L2.37466085,2.69230769 L2.65424089,0.952910516 L4.72454878,0 L7.79108175,0.368088793 L9.59636586,1.45384615 L10.8668502,2.69230769 L11.812356,4.65144111 L12,7.53846154 C11.7619312,8.65914222 11.5709447,9.42698837 11.4270405,9.842 C10.791481,11.6749179 10.1402158,12.2737175 9.77714939,12.2737175 C9.76639252,12.3477903 9.91880671,11.4873203 10.2343919,9.69230769 L9.77714939,7.53846154 C8.98300414,6.1025641 7.15494293,5.02564103 4.29296576,4.30769231 C4.28546625,4.24809717 3.91617402,4.06860999 3.18508906,3.76923077 L2.90444733,3.55564103 Z" id="路径-13" fill="#4E4E4E"></path>
<path d="M2.90444733,1.45384615 L2.90444733,3.97675978 L1.52247257,6.29497436 C1.06239744,7.77506935 1.11179167,8.90391994 1.67065529,9.68152615 C1.69019928,9.72165491 1.32376626,9.32606927 0.571356222,8.49476923 L0,7 L0,5.04850637 L0.571356222,3.25547103 L1.67065529,1.91650804 L2.90444733,1.45384615 Z" id="路径-14" fill="#4E4E4E"></path>
</g>
<path d="M1.1,16.4989 L1.1,19.8 C1.1,20.3641194 1.52464421,20.8290579 2.07171676,20.8925995 L2.2,20.9 L5.5,20.9 L5.5,22 L2.2,22 C0.98497355,22 0,21.0150264 0,19.8 L0,16.5 L1.1,16.4989 Z M22,16.5 L22,19.8 C22,21.0150264 21.0150264,22 19.8,22 L16.5,22 L16.5,20.9 L19.8,20.9 C20.3641194,20.9 20.8290579,20.4753558 20.8925995,19.9282832 L20.9,19.8 L20.9,16.4989 L22,16.5 Z M19.8,0 C21.0150264,0 22,0.98497355 22,2.2 L22,5.5 L20.9,5.4989 L20.9,2.2 C20.9,1.63588058 20.4753558,1.17094212 19.9282832,1.1074005 L19.8,1.1 L16.5,1.1 L16.5,0 L19.8,0 Z M5.5,0 L5.5,1.1 L2.2,1.1 C1.63588058,1.1 1.17094212,1.52464421 1.1074005,2.07171676 L1.1,2.2 L1.1,5.4989 L0,5.5 L0,2.2 C0,0.98497355 0.98497355,0 2.2,0 L5.5,0 Z" id="Mask备份" fill="#4E4E4E" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/components/normalTask/components/lineList/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="cpt-command-airway-list"> <div class="cpt-command-airway-list">
<div class="hd" v-interact> <div class="hd" v-interact>
<div class="left ml8"> <div class="left ml8">
<img src="../../../../../../assets/images/mount_head.png" /> <!-- <img src="../../../../../../assets/images/mount_head.png" /> -->
<div class="title">航空航线</div> <div class="title">航空航线</div>
</div> </div>
<div @click="close" class="close">关闭</div> <div @click="close" class="close">关闭</div>
...@@ -121,12 +121,12 @@ export default { ...@@ -121,12 +121,12 @@ export default {
4: "通过", 4: "通过",
5: "驳回", 5: "驳回",
}; };
this.airwayData = res.data.list && { this.airwayData = (res.data.list && {
current: this.airwayData.current, current: this.airwayData.current,
records: res.data.list, records: res.data.list,
size: this.airwayData.size, size: this.airwayData.size,
total: res.data.total, total: res.data.total,
} || { }) || {
current: this.airwayData.current, current: this.airwayData.current,
records: [], records: [],
size: this.airwayData.size, size: this.airwayData.size,
...@@ -135,17 +135,17 @@ export default { ...@@ -135,17 +135,17 @@ export default {
this.airwayData.records = this.airwayData.records?.map((item) => { this.airwayData.records = this.airwayData.records?.map((item) => {
let content = []; let content = [];
try{ try {
content = JSON.parse(item.content).content // TODO 待确认字段 content = JSON.parse(item.content).content; // TODO 待确认字段
}catch(e){ } catch (e) {
console.log(e); console.log(e);
} }
return { return {
...item, ...item,
status: statusMap[item.status], status: statusMap[item.status],
content content,
}; };
}) });
} }
} else { } else {
this.rootNode.$emit("airwayPageChange", { this.rootNode.$emit("airwayPageChange", {
...@@ -170,49 +170,30 @@ export default { ...@@ -170,49 +170,30 @@ export default {
.cpt-command-airway-list { .cpt-command-airway-list {
width: 600px; width: 600px;
position: absolute; position: absolute;
right: -600px; right: -213px;
top: 300px; top: 300px;
// width: 1132px;
// height: 689px;
box-sizing: border-box; box-sizing: border-box;
background: #222222;
// background: rgba(0, 23, 79, 0.7); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
// box-shadow: 0 2px 4px 0 rgba(1, 162, 255, 0.35), border-radius: 2px;
// inset 0 0 40px 0 rgba(0, 184, 255, 0.5);
// border-radius: 13px;
background: rgba(0, 23, 79, 0.7);
box-shadow: 0 2px 4px 0 rgba(1, 162, 255, 0.35),
inset 0 0 40px 0 rgba(0, 184, 255, 0.5);
border-radius: 10px;
.hd { .hd {
height: 32px; flex-shrink: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: rgba(16, 65, 215, 0.2); height: 32px;
box-shadow: inset 0 0 15px 0 rgba(0, 182, 255, 0.6); background: #3c3c3c;
border-radius: 10px 10px 0 0; border-radius: 2px 2px 0px 0px;
.left { .left {
display: flex; display: flex;
align-items: center; align-items: center;
.title { .title {
font-size: 20px; font-family: PingFangSC, PingFang SC;
font-family: YouSheBiaoTiHei; font-weight: 500;
color: #14faff; font-size: 14px;
line-height: 26px; color: #ffffff;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#e3aa77 0%,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
} }
...@@ -332,7 +313,7 @@ export default { ...@@ -332,7 +313,7 @@ export default {
padding: 0 !important; padding: 0 !important;
.tb-hd-box { .tb-hd-box {
display: flex; display: flex;
background: #081a3a; background: #303133;
// width: 1415.62px; // width: 1415.62px;
border-top: 1px solid rgba(207, 234, 255, 0.33); border-top: 1px solid rgba(207, 234, 255, 0.33);
border-bottom: 1px solid rgba(207, 234, 255, 0.33); border-bottom: 1px solid rgba(207, 234, 255, 0.33);
...@@ -375,7 +356,7 @@ export default { ...@@ -375,7 +356,7 @@ export default {
// // border: 1px solid #70f6f9; // // border: 1px solid #70f6f9;
// } // }
&:nth-of-type(2n - 1) { &:nth-of-type(2n - 1) {
background: rgba(73, 135, 210, 0.5); background: #3c3c3c;
} }
.td { .td {
// width: calc(100% / 7); // width: calc(100% / 7);
...@@ -385,19 +366,16 @@ export default { ...@@ -385,19 +366,16 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.last-td { .last-td {
width: 80px;
height: 32px;
text-align: center; text-align: center;
width: 170px; line-height: 32px;
div { margin: 0 auto;
background: url("../../../../../../assets/images/btn.png") no-repeat; color: #fff;
background-size: 100% 100%; background: #3388ff;
padding: 5px 12px; font-family: SourceHanSansCN, SourceHanSansCN;
} font-weight: 400;
.iconfont { font-size: 14px;
margin-right: 7px;
}
&:hover {
color: #43deff;
}
} }
} }
} }
...@@ -496,7 +474,7 @@ export default { ...@@ -496,7 +474,7 @@ export default {
// } // }
// } // }
.tb-tr::v-deep .td { .tb-tr::v-deep .td {
padding: 18px 0 !important; // padding: 18px 0 !important;
} }
// 提示框样式 // 提示框样式
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/components/taskList/index.vue
<template> <template>
<div class="task-list"> <div class="task-list">
<div class="task-list-header"> <div class="task-list-header">
<div <div class="task-list-header__item" :class="{active: tabIndex === 0 && useTimedTask}" @click="tabIndex = 0">
class="task-list-header__item" <label>常态飞行</label>
:class="{active: tabIndex === 0}" </div>
@click="tabIndex = 0"
>常态飞行</div>
<template v-if="useTimedTask"> <template v-if="useTimedTask">
<div <div class="task-list-header__item" :class="{active: tabIndex === 1}" @click="tabIndex = 1">
class="task-list-header__item" <label>定时飞行</label>
:class="{active: tabIndex === 1}" </div>
@click="tabIndex = 1" <div class="task-list-header__item" :class="{active: tabIndex === 2}" @click="tabIndex = 2">
>定时飞行</div> <label>周期飞行</label>
<div </div>
class="task-list-header__item"
:class="{active: tabIndex === 2}"
@click="tabIndex = 2"
>周期飞行</div>
</template> </template>
</div> </div>
<div class="task-list-main"> <div class="task-list-main">
...@@ -34,7 +28,7 @@ ...@@ -34,7 +28,7 @@
import NormalTask from "./components/normalTask"; import NormalTask from "./components/normalTask";
import TimedTask from "./components/timedTask"; import TimedTask from "./components/timedTask";
import PeriodTask from "./components/periodTask"; import PeriodTask from "./components/periodTask";
import { mapState } from 'vuex'; import { mapState } from "vuex";
export default { export default {
name: "hangarTaskList", name: "hangarTaskList",
...@@ -49,14 +43,14 @@ export default { ...@@ -49,14 +43,14 @@ export default {
}; };
}, },
computed: { computed: {
...mapState('MMCFlightControlCenter', ['useTimedTask']) ...mapState("MMCFlightControlCenter", ["useTimedTask"]),
}, },
watch: { watch: {
useTimedTask(){ useTimedTask() {
if(!this.useTimedTask){ if (!this.useTimedTask) {
this.tabIndex = 0; this.tabIndex = 0;
} }
} },
}, },
mounted() {}, mounted() {},
methods: {}, methods: {},
...@@ -67,13 +61,14 @@ export default { ...@@ -67,13 +61,14 @@ export default {
.task-list { .task-list {
width: 416px; width: 416px;
height: 254px; height: 254px;
background: rgba(9, 32, 87, 0.7); background: #222222;
border-radius: 10px 10px 0 0; border-radius: 10px 10px 0 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.task-list-header { .task-list-header {
border-radius: 10px 10px 0 0; background: #3c3c3c;
border-radius: 10px 10px 0px 0px;
height: 32px; height: 32px;
flex-shrink: 0; flex-shrink: 0;
display: flex; display: flex;
...@@ -89,25 +84,30 @@ export default { ...@@ -89,25 +84,30 @@ export default {
cursor: pointer; cursor: pointer;
&.active { &.active {
box-shadow: inset 0 0 10px 2px #3f9dff; background: #3388ff;
font-size: 20px; label {
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
font-size: 20px;
color: #14faff; color: #14faff;
line-height: 32px; line-height: 26px;
text-shadow: 0 1px 1px rgba(2, 32, 56, 0.2); text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
text-align: left;
font-style: normal;
background: linear-gradient( background: linear-gradient(
135deg, 45deg,
#e3aa77, #e3aa77 0%,
#f5cda9 38%, #f5cda9 38%,
#f9ecd3 58%, #f9ecd3 58%,
#fcdbb1 79%, #fcdbb1 79%,
#edb07a #edb07a 100%
); );
line-height: 32px;
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
} }
} }
} }
}
.task-list-main { .task-list-main {
flex: 1; flex: 1;
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlLeft/index.vue
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
</div> </div>
<TaskList class="task-list" v-if="openTask"></TaskList> <TaskList class="task-list" v-if="openTask"></TaskList>
<div class="left-bar-item item" @click="onClickAI"> <div class="left-bar-item item" @click="onClickAI">
<img class="left-bar-item__icon" src="./assets/images/ai.png" /> <img class="left-bar-item__icon" src="./assets/images/ai.svg" />
<div class="left-bar-item__text">智能识别</div> <div class="left-bar-item__text">智能识别</div>
</div> </div>
<div class="ai-list" :class="{ active: openAIList }"> <div class="ai-list" :class="{ active: openAIList }">
<div class="left-bar-item item" @click.stop="switchAI(0)"> <div class="left-bar-item item" @click.stop="switchAI(0)">
<img class="left-bar-item__icon" src="./assets/images/faceAI2.png" /> <img class="left-bar-item__icon" src="./assets/images/face.svg" />
<div class="left-bar-item__text">人脸识别</div> <div class="left-bar-item__text">人脸识别</div>
</div> </div>
<div class="left-bar-item item" @click.stop="switchAI(1)"> <div class="left-bar-item item" @click.stop="switchAI(1)">
<img class="left-bar-item__icon" src="./assets/images/carAI2.png" /> <img class="left-bar-item__icon" src="./assets/images/car.svg" />
<div class="left-bar-item__text">车辆识别</div> <div class="left-bar-item__text">车辆识别</div>
</div> </div>
<Face v-if="openFace" class="ai-dialog" :uavId="uav.deviceId" @close="openFace = false" /> <Face v-if="openFace" class="ai-dialog" :uavId="uav.deviceId" @close="openFace = false" />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- 展示视频 --> <!-- 展示视频 -->
<div class="left-video" :class="{collapse: playerCollapse}" v-if="showPanel && listCollapse"> <div class="left-video" :class="{collapse: playerCollapse}" v-if="showPanel && listCollapse">
<div class="collapse-btn" @click="playerCollapse = !playerCollapse"> <div class="collapse-btn" @click="playerCollapse = !playerCollapse">
<img src="./assets/images/hs.png" /> <img src="./assets/images/collapse.svg" />
</div> </div>
<div class="left-video-header"> <div class="left-video-header">
...@@ -170,7 +170,7 @@ export default { ...@@ -170,7 +170,7 @@ export default {
.control-left { .control-left {
position: absolute; position: absolute;
z-index: 2; z-index: 2;
left: 470px; left: 430px;
top: 13%; top: 13%;
transition: 0.3s; transition: 0.3s;
...@@ -183,7 +183,8 @@ export default { ...@@ -183,7 +183,8 @@ export default {
position: relative; position: relative;
width: 48px; width: 48px;
height: 48px; height: 48px;
background: rgba(9, 32, 87, 0.7); background: #ffffff;
border-radius: 2px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -200,7 +201,7 @@ export default { ...@@ -200,7 +201,7 @@ export default {
font-size: 16px; font-size: 16px;
transform: scale(0.6); transform: scale(0.6);
white-space: nowrap; white-space: nowrap;
color: #fff; color: #000;
} }
} }
...@@ -234,41 +235,48 @@ export default { ...@@ -234,41 +235,48 @@ export default {
left: -10px; left: -10px;
top: 308px; top: 308px;
z-index: 10; z-index: 10;
background: rgba(12, 34, 73, 0.7); background: #222222;
border-radius: 10px; border-radius: 10px;
border: 1px solid rgba(26, 92, 246, 0.5);
z-index: 1; z-index: 1;
transition: 0.3s; transition: 0.3s;
&.collapse { &.collapse {
transform: translateX(-100%); transform: translateX(-100%);
.collapse-btn {
&::before {
transform: translate(-63%, -50%) rotate(90deg) !important;
}
}
} }
.collapse-btn { .collapse-btn {
position: absolute; position: absolute;
cursor: pointer;
right: -35px;
top: 50%; top: 50%;
right: 0; transform: translate(0, -50%);
transform: translate(100%, -50%); z-index: 99;
img { &::before {
transform: rotate(180deg); content: "";
cursor: pointer; position: absolute;
top: 50%;
left: 50%;
transform: translate(-63%, -50%) rotate(-90deg);
width: 0px;
height: 0px;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 9px solid #fff;
} }
} }
.left-video-header { .left-video-header {
width: 100%; width: 100%;
height: 32px; height: 32px;
background-image: linear-gradient(
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.22) 40%,
#05091a 100%
);
border-radius: 10px 10px 0 0; border-radius: 10px 10px 0 0;
// border: 1px solid #70daf9; border-bottom: 1px solid rgba(207, 234, 255, 0.33);
box-shadow: inset 0 0 10px 2px #3f9dff;
box-sizing: inset 0px 0px 10px 2px #3f9dff;
background: url("./assets/images/line.png") no-repeat; background: url("./assets/images/line.png") no-repeat;
background-position: 60%; background-position: 60%;
font-size: 16px; font-size: 16px;
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlRight/assets/images/hangar.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 10备份</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="无人机应用健康管理" transform="translate(-1875.000000, -241.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="系统设置" transform="translate(1875.000000, 241.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="22" height="22"></rect>
<g id="编组" transform="translate(1.000000, 2.000000)">
<path d="M19.9995453,4.00194727 L19.9995453,14.9267407 C19.9995453,16.6239672 18.569726,18 16.8063125,18 L3.19530544,18 C1.43189192,18 0.0020726267,16.6239672 0.0020726267,14.9267407 L0.0020726267,4.00194727 L19.9995453,4.00194727 Z M10.3971225,8.90382038 L10.2462325,8.91276729 C10.0635718,8.93161904 9.8858834,8.98284498 9.72175334,9.06396985 C9.41832149,9.22172046 9.16745052,9.46212589 8.99911739,9.75645973 C8.96184937,9.82087739 8.92094546,9.83250837 8.85549918,9.83250835 C7.91652694,9.83071898 6.98028163,9.83071898 6.04221836,9.83071898 C5.9758631,9.83071898 5.87405779,9.85398091 5.85315134,9.82445615 C5.81951924,9.7761429 5.83678978,9.69472614 5.83406286,9.62583502 C5.83224491,9.45137051 5.83406286,9.27690602 5.83406286,9.10154682 L4.47696163,9.10154682 L4.47696163,9.82624553 L4.45605519,9.82892959 L4.43423976,9.83071898 C4.24971762,9.84234995 4.10882634,9.92645079 4.03429031,10.0892843 C3.97702483,10.2216984 3.98702356,10.4525284 4.1370046,10.5509442 C4.22881117,10.6108884 4.33243444,10.6618858 4.43969361,10.6914105 C4.99689592,10.8533494 5.55682516,11.007236 6.11220951,11.1611226 L7.02118555,11.4143198 L7.27024498,11.485895 L7.52657623,11.5628383 C7.39568368,11.6612542 7.27115396,11.7516179 7.14753321,11.8455603 L6.55942573,12.2911158 L6.3558151,12.4494759 C6.22037767,12.5550493 6.08584922,12.6606227 5.94495792,12.7590385 C5.76952555,12.8825057 5.68135486,13.0363923 5.68135488,13.2439604 L5.68317282,14.5546809 L5.68771771,14.6423605 L5.70226133,14.7300401 C5.77679736,15.1075991 6.22037767,15.2614858 6.53942824,15.0771797 C6.71428519,14.9780063 6.81892828,14.7916446 6.81121209,14.5931525 C6.81484799,14.2576439 6.81484799,13.9239246 6.81121209,13.5884159 C6.81121209,13.5239983 6.82757365,13.4837372 6.88756608,13.4506337 C7.22934106,13.2716958 7.57111605,13.0900737 7.91107308,12.9084517 C8.08923237,12.8145093 8.26557372,12.7187775 8.44282406,12.622151 C8.98820967,13.1437551 9.64903525,13.3889001 10.4062123,13.3862161 C11.1624804,13.3862161 11.821488,13.1419658 12.3559659,12.6194669 C12.4923123,12.6937262 12.6213869,12.7670908 12.7540974,12.8377712 C13.1449571,13.0462339 13.5367257,13.253802 13.9303124,13.46137 C13.982124,13.4882107 14.0048484,13.5231036 14.0048484,13.5866266 C14.0012125,13.9445025 14.0030305,14.3050624 14.0030305,14.663833 C14.0030305,14.6960419 14.0075753,14.7282507 14.0157561,14.7586701 C14.0702947,15.0020257 14.3448054,15.1577018 14.5702315,15.1559276 C14.853832,15.1514389 15.1137992,14.8919789 15.1137992,14.6316242 C15.1137992,14.1493864 15.1165261,13.6671486 15.1119812,13.1840162 C15.111315,13.027452 15.0328995,12.881105 14.9020077,12.7921421 C14.7129407,12.6543598 14.5293276,12.5129989 14.3438965,12.3725326 L13.5403617,11.7641435 L13.4558269,11.6988312 L13.2749406,11.5529967 L13.3503857,11.5368923 L13.3640203,11.5342083 L13.376746,11.5306295 L14.7956575,11.1324926 L15.347406,10.9741325 C15.7155413,10.8685591 16.0836766,10.7638804 16.4545388,10.6681486 C16.7345034,10.594784 16.8953922,10.2816426 16.7372304,10.0364976 C16.6390609,9.89513664 16.4999876,9.83071898 16.3145565,9.82803491 L16.3145565,9.10154682 L14.9601822,9.10154682 L14.9601822,9.83071898 L13.2458534,9.83071898 L11.9242023,9.82892959 C11.8887522,9.82892959 11.8387585,9.81819331 11.81967,9.79493138 C11.7387712,9.69025268 11.6751428,9.57036425 11.5878811,9.46926431 C11.4252559,9.27554558 11.2180323,9.12280065 10.9834121,9.02370882 C10.7520088,8.92202441 10.4970132,8.88369622 10.2453235,8.91276729 L10.3962136,8.90382038 L10.3971225,8.90382038 Z M15.6746374,8.167491 L15.498296,8.167491 L15.3983087,8.21401486 C15.2119686,8.31600949 15.1047094,8.46900144 14.9901784,8.6479394 C14.8474692,8.52984036 14.7065779,8.41263599 14.5629597,8.29632632 C14.4724658,8.21758806 14.3545999,8.1762463 14.2339104,8.18091135 C14.2248206,8.18091135 14.2139129,8.17285913 14.2039141,8.16838569 L12.4586802,8.16838569 L12.4441366,8.17643789 L12.428684,8.18091135 C12.2414349,8.18985824 12.1141782,8.25695998 12.0378243,8.38669 C11.9105676,8.60141554 12.1196321,8.8564021 12.428684,8.8564021 C14.5375083,8.85371804 16.6445148,8.85371804 18.7533392,8.8564021 C18.9533139,8.8564021 19.1169296,8.75440747 19.1732861,8.62736154 C19.2441862,8.46989614 19.1614694,8.31600951 19.0005807,8.24264494 C18.9187728,8.20596266 18.8215124,8.19254232 18.7306148,8.167491 L16.9871988,8.167491 L16.9144807,8.18091135 C16.8676098,8.18727547 16.8217774,8.19960608 16.7781343,8.21759362 C16.6927935,8.26054118 16.6113006,8.31052411 16.5345287,8.36700681 C16.4118169,8.4546864 16.294559,8.54415538 16.1673024,8.63899249 C16.0491355,8.44931827 15.9255148,8.26948563 15.6746374,8.167491 L15.6746374,8.167491 Z M3.81159118,8.167491 L2.06817515,8.167491 L2.05363153,8.17643789 L2.03817895,8.18091135 C1.87365429,8.19254232 1.7518515,8.2462237 1.66731672,8.35448116 C1.58005502,8.46363331 1.58187298,8.57278546 1.65913593,8.67835885 C1.73912582,8.78572162 1.85729271,8.8564021 2.03817895,8.8564021 L4.76783396,8.85461273 L8.35919827,8.85461273 L8.45373177,8.84834991 C8.56306404,8.83544824 8.66275008,8.7804371 8.73096947,8.69535796 C8.82913888,8.57815359 8.81914013,8.45915986 8.73096947,8.33927142 C8.6537065,8.24085555 8.52644985,8.20238389 8.39373936,8.16838569 L6.59214886,8.16838569 L6.49943331,8.18627948 C6.40783156,8.19814065 6.32067354,8.23227143 6.24582899,8.28559004 C6.1276621,8.38311122 5.99767853,8.47168551 5.87496678,8.56473325 C5.84497057,8.58799518 5.82042822,8.61394119 5.78770507,8.64525532 C5.6804459,8.44216075 5.5513713,8.26680155 5.29958494,8.16838569 L5.12415257,8.16838569 L5.01416647,8.23101397 C4.8387341,8.34016612 4.7096595,8.48152709 4.64057732,8.64346595 C4.61426526,8.62574029 4.58849935,8.60724171 4.56331435,8.58799518 C4.39606275,8.46989614 4.23790093,8.34553425 4.06246855,8.23638212 C3.99884023,8.19612108 3.89612594,8.18896356 3.81159118,8.16838569 L3.8106822,8.167491 L3.81159118,8.167491 Z" id="形状"></path>
<path d="M10.4434803,11.345429 C10.858742,11.3439371 11.1971579,11.6730353 11.2006573,12.0817586 C11.1870227,12.484369 10.8779708,12.8207724 10.4480252,12.8109308 C10.0098987,12.795721 9.70902768,12.536261 9.70175587,12.0817586 C9.6946363,11.8860339 9.77034396,11.6961755 9.91082035,11.5574704 C10.0514544,11.4180841 10.2439418,11.3414587 10.4434803,11.345429 L10.4434803,11.345429 Z M20,1.18322721 C19.9997488,1.83596436 19.461948,2.36491209 18.798788,2.3646652 L1.201921,2.3646652 C0.882478557,2.36296515 0.576540493,2.23762836 0.350210443,2.01573601 C0.00752897816,1.67744299 -0.0943458723,1.16926573 0.0920979951,0.72820649 C0.278541862,0.287147251 0.71657983,8.3295908e-05 1.201921,0.000894694122 L18.799697,0 C19.4628569,0.00114175708 20.0002508,0.530490054 20,1.18322721 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlRight/components/hangarMonitor/index.vue
...@@ -446,11 +446,8 @@ export default { ...@@ -446,11 +446,8 @@ export default {
height: 203px; height: 203px;
left: -400px; left: -400px;
top: 20px; top: 20px;
background: rgba(12, 34, 73, 1); background: #222222;
border-radius: 10px; border-radius: 10px;
border: 1px solid raba(26, 92, 246, 0.5);
backdrop-filter: blur(1px);
// border: 1px solid #70daf9;
z-index: 2; z-index: 2;
.titleBox { .titleBox {
// background: rgba(4, 18, 50, 0.5); // background: rgba(4, 18, 50, 0.5);
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlRight/components/logger/index.vue
<template> <template>
<div class="cpt-nest-logger" :class="{ chang: dakai == true, }"> <div class="cpt-nest-logger dialog1027" :class="{ chang: dakai == true, }">
<div class="title-box" v-interact> <div class="title-box dialog-header" v-interact>
<div class="title"> <div class="title">
<img src="../../../../../../../../assets/images/mount_head.png" /> <img src="../../../../../../../../assets/images/mount_head.png" />
<div class="font">运行监控日志</div> <div class="font">运行监控日志</div>
...@@ -330,10 +330,10 @@ export default { ...@@ -330,10 +330,10 @@ export default {
} }
&.end { &.end {
color: rgba(67, 222, 255, 0.6); color: #3388FF;
.radius { .radius {
background: rgba(67, 222, 255, 0.7); background: #3388FF;
border: 0; border: 0;
} }
} }
...@@ -347,15 +347,6 @@ export default { ...@@ -347,15 +347,6 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 32px; height: 32px;
background: linear-gradient(
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.title { .title {
display: flex; display: flex;
...@@ -363,7 +354,7 @@ export default { ...@@ -363,7 +354,7 @@ export default {
.font { .font {
font-size: 20px; font-size: 20px;
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
color: #14faff; color: #ACACAC;
line-height: 26px; line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2); text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient( background: linear-gradient(
...@@ -394,14 +385,14 @@ export default { ...@@ -394,14 +385,14 @@ export default {
.iconfont { .iconfont {
font-size: 18px; font-size: 18px;
color: #00ffff; color: #3388FF;
margin-right: 4px; margin-right: 4px;
} }
.icon-text { .icon-text {
font-family: MicrosoftYaHeiUI; font-family: MicrosoftYaHeiUI;
font-size: 14px; font-size: 14px;
color: #ccedff; color: #ACACAC;
font-weight: 400; font-weight: 400;
} }
} }
...@@ -531,7 +522,7 @@ export default { ...@@ -531,7 +522,7 @@ export default {
transform: rotate(270deg) !important; transform: rotate(270deg) !important;
} }
.close { .close {
color: #70daf9; color: #ACACAC;
cursor: pointer; cursor: pointer;
margin: 0 10px 0 20px; margin: 0 10px 0 20px;
} }
......
src/components/MMCFlightControlCenter/components/hangar/components/controlPanel/components/controlRight/index.vue
...@@ -10,20 +10,19 @@ ...@@ -10,20 +10,19 @@
:class="showHangar ? 'active' : ''" :class="showHangar ? 'active' : ''"
@click="onSwitchShow('showHangar')" @click="onSwitchShow('showHangar')"
> >
<!-- <img src="../../assets/images/hea.png" /> --> <img src="./assets/images/hangar.svg" />
<SymbolIcon icon="yingchao2" /> <span class="dib">机库</span>
<span class="dib f8">机库</span>
</div> </div>
<div slot="dialog"> <div slot="dialog">
<div class="hangar-ctrl" v-if="showHangar"> <div class="hangar-ctrl dialog1027" v-if="showHangar">
<div class="hangar-ctrl-header"> <div class="hangar-ctrl-header dialog-header">
<span class="hangar-ctrl-header__title"> <span class="dialog-header__title">
<img <img
class="hangar-ctrl-header__icon" class="hangar-ctrl-header__icon"
src="../../../../../../assets/images/mount_head.png" src="../../../../../../assets/images/mount_head.png"
/>操作区域 />操作区域
</span> </span>
<span class="hangar-ctrl-header__close" @click="showHangar = false;">关闭</span> <span class="dialog-header__close" @click="showHangar = false;">关闭</span>
</div> </div>
<div class="hangar-ctrl-list"> <div class="hangar-ctrl-list">
<div <div
...@@ -198,7 +197,6 @@ export default { ...@@ -198,7 +197,6 @@ export default {
.hangar-ctrl { .hangar-ctrl {
width: 416px; width: 416px;
min-height: 100px; min-height: 100px;
background: rgba(9, 32, 87, 0.7);
position: absolute; position: absolute;
right: 71px; right: 71px;
top: 50px; top: 50px;
...@@ -210,34 +208,9 @@ export default { ...@@ -210,34 +208,9 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 32px; height: 32px;
background: linear-gradient(
180deg,
#9198ff,
rgba(45, 81, 153, 0.45) 40%,
#05091a
);
box-shadow: inset 0 0 10px 2px #3f9dff;
border-radius: 10px 10px 0 0;
border: 1px solid #427dff;
.hangar-ctrl-header__title { .hangar-ctrl-header__title {
display: flex;
align-items: center;
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#e3aa77,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
.hangar-ctrl-header__close { .hangar-ctrl-header__close {
...@@ -252,35 +225,27 @@ export default { ...@@ -252,35 +225,27 @@ export default {
} }
.hangar-ctrl-list { .hangar-ctrl-list {
box-sizing: border-box; box-sizing: border-box;
justify-content: center; padding: 8px 16px 14px;
padding: 10px 0px;
display: flex; display: flex;
width: 100%; width: 100%;
gap: 15px; gap: 28px;
flex-wrap: wrap; flex-wrap: wrap;
.hangar-ctrl-item { .hangar-ctrl-item {
width: 48px; width: 54px;
height: 48px; height: 54px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 5px; background: #3E3E3E;
background-image: linear-gradient(
179deg,
#1773b6,
#3484c3 36%,
#2a7abd 56%,
#084681
);
box-shadow: 0 0 5px 0 #0c1c47;
border-radius: 4.5px; border-radius: 4.5px;
cursor: pointer; cursor: pointer;
gap: 3px;
.hangar-ctrl-item__icon { .hangar-ctrl-item__icon {
width: 28px; width: 22px;
height: 28px; height: 22px;
vertical-align: -0.15em; vertical-align: -0.15em;
fill: currentColor; fill: currentColor;
overflow: hidden; overflow: hidden;
......
src/components/MMCFlightControlCenter/components/hangar/components/list/assets/images/collapse.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="36px" height="104px" viewBox="0 0 36 104" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 16</title>
<defs>
<linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
<stop stop-color="#505050" offset="0%"></stop>
<stop stop-color="#707070" offset="100%"></stop>
</linearGradient>
<path d="M0,0 L29.1799936,18.237496 C30.9342818,19.3339261 32,21.2567457 32,23.3254858 L32,76.6745142 C32,78.7432543 30.9342818,80.6660739 29.1799936,81.762504 L0,100 L0,100 L0,0 Z" id="path-2"></path>
<filter x="-7.8%" y="-3.5%" width="121.9%" height="107.0%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="1" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.324191434 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用" transform="translate(-594.000000, -425.000000)">
<g id="编组-16" transform="translate(595.000000, 427.000000)">
<g id="矩形">
<use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
<use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/hangar/components/list/index.vue
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<template> <template>
<div class="list" :class="{ collapse: listCollapse }"> <div class="list" :class="{ collapse: listCollapse }">
<div class="list-header"> <div class="list-header">
<div>
<img class="list-header__icon" src="./assets/images/uav_list_header.png" />
<span class="list-header__text">机库列表</span> <span class="list-header__text">机库列表</span>
</div>
<div class="list-header__count"> <div class="list-header__count">
共{{ count.sumCount }}架 / 共{{ count.sumCount }}架 /
<span class="online">{{ count.onlineCount }}在线</span> <span class="online">{{ count.onlineCount }}在线</span>
...@@ -23,13 +20,13 @@ ...@@ -23,13 +20,13 @@
</div> </div>
</div> </div>
<!-- 未进入机库或者进入机库后列表是展开的情况下，才显示收纳按钮 --> <!-- 未进入机库或者进入机库后列表是展开的情况下，才显示收纳按钮 -->
<img <div
v-if="!hangar || (hangar && !listCollapse)" class="hangar-list_btn"
@click="listCollapse = !listCollapse;" @click="listCollapse = !listCollapse;"
style="transform: rotate(180deg)" v-if="!hangar || (hangar && !listCollapse)"
src="./assets/images/hs.png" >
class="nsetLeftBox_btn" <img style src="./assets/images/collapse.svg" />
/> </div>
</div> </div>
<!-- </Dialog> --> <!-- </Dialog> -->
</template> </template>
...@@ -86,7 +83,10 @@ export default { ...@@ -86,7 +83,10 @@ export default {
}, },
methods: { methods: {
async getList() { async getList() {
let res = await Control_API.getUavTree({ name: "", deviceType: this.deviceType }); let res = await Control_API.getUavTree({
name: "",
deviceType: this.deviceType,
});
this.list = res.data; this.list = res.data;
}, },
}, },
...@@ -98,26 +98,46 @@ export default { ...@@ -98,26 +98,46 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: absolute; position: absolute;
width: 460px; width: 420px;
height: 85%; height: 85%;
left: 0; left: 0;
top: 60px; top: 60px;
// height: 86vh; // height: 86vh;
z-index: 99; z-index: 99;
transition: 0.3s; transition: 0.3s;
border-radius: 10px 10px 0px 0px; border-radius: 5px 5px 0px 0px;
overflow: visible; overflow: visible;
&.collapse { &.collapse {
transform: translateX(-100%); transform: translateX(-100%);
.hangar-list_btn {
&::before {
transform: translate(-63%, -50%) rotate(90deg) !important;
}
}
} }
.nsetLeftBox_btn { .hangar-list_btn {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
right: -22px; right: -35px;
top: 50%; top: 50%;
transform: translate(0, -50%); transform: translate(0, -50%);
z-index: 99;
&::before {
content: "";
position: absolute;
top: 50%;
left: 50%;
transform: translate(-63%, -50%) rotate(-90deg);
width: 0px;
height: 0px;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 9px solid #fff;
}
} }
} }
.healthy { .healthy {
...@@ -145,7 +165,7 @@ export default { ...@@ -145,7 +165,7 @@ export default {
display: flex; display: flex;
flex: 1; flex: 1;
flex-direction: column; flex-direction: column;
background: rgba(12, 34, 73, 0.7); background: #222222;
overflow-y: auto; overflow-y: auto;
.search-box { .search-box {
...@@ -223,32 +243,15 @@ export default { ...@@ -223,32 +243,15 @@ export default {
align-items: center; align-items: center;
// width: 100%; // width: 100%;
height: 33px; height: 33px;
background: linear-gradient( background: #3c3c3c;
180deg, padding: 0 16px;
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.list-header__text { .list-header__text {
vertical-align: bottom; vertical-align: bottom;
font-size: 20px; font-family: PingFangSC, PingFang SC;
font-family: YouSheBiaoTiHei; font-weight: 600;
color: #14faff; font-size: 16px;
line-height: 26px; color: #ffffff;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#f7b67d 38%,
#f9eacb 58%,
#f5d2a6 79%,
#f59743 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
.list-header__icon { .list-header__icon {
...@@ -259,7 +262,6 @@ export default { ...@@ -259,7 +262,6 @@ export default {
.list-header__count { .list-header__count {
color: #fff; color: #fff;
font-weight: 500; font-weight: 500;
margin-right: 16px;
font-size: 14px; font-size: 14px;
.online { .online {
......
src/components/MMCFlightControlCenter/components/mapSearch/index.vue
...@@ -187,7 +187,6 @@ export default { ...@@ -187,7 +187,6 @@ export default {
padding-right: 10px; padding-right: 10px;
height: 50.4px; height: 50.4px;
background: rgba(22, 29, 45, 0.58); background: rgba(22, 29, 45, 0.58);
border: 1px solid #70daf9;
} }
.autocomplete { .autocomplete {
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/fly.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 13</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用备份-2" transform="translate(-861.000000, -903.000000)">
<g id="编组-8" transform="translate(832.000000, 893.000000)">
<g id="编组-45" transform="translate(24.000000, 10.000000)">
<g id="编组-13" transform="translate(5.000000, 0.000000)">
<rect id="矩形" x="0" y="0" width="22" height="22"></rect>
<g id="编组-12" transform="translate(0.000000, 1.000000)" fill="#FFFFFF" fill-rule="nonzero">
<g id="编组">
<path d="M6.99087985,0.000797680989 C8.26689952,-0.0125466314 9.49647402,0.141519527 10.6820478,0.464209265 C11.960512,0.811161386 12.8845262,1.33522892 14.1691016,2.3142162 L15.2324513,3.12215367 C16.163799,3.8027136 16.8665876,4.17756745 17.7478234,4.40806011 L18.171941,4.50996215 L18.5960587,4.59124113 C19.7249598,4.78127701 20.8798783,4.75781595 22,4.52209333 L19.7173449,12.9807054 C19.5564266,12.8327611 19.34549,12.750125 19.1259986,12.7499996 C18.6432479,12.7499996 18.2517474,13.1417495 18.2517474,13.6249995 L18.2517474,12.8749996 C18.25188,12.6430678 18.1598725,12.4205826 17.9959655,12.2564883 C17.8320584,12.0923939 17.6096783,12.0001322 17.3777461,12 C16.8949954,12 16.5034948,12.3917496 16.5034948,12.8749996 L16.503,12.867 L16.5034948,12.3749996 C16.5036054,12.1817231 16.4397297,11.9950068 16.3235811,11.8431748 L16.247713,11.7564883 C16.0838059,11.592394 15.8614258,11.5001323 15.6294936,11.5 C15.1467429,11.5 14.7554923,11.8917497 14.7554923,12.3749996 L14.7554923,10 C14.755625,9.73491603 14.6504479,9.48063662 14.4630987,9.29310026 C14.2757496,9.10556389 14.0215752,9.00013258 13.7564909,9 C13.2047401,9 12.7574895,9.44749995 12.7574895,10 L12.7572667,15.1177099 C12.331585,14.8507457 11.8967791,14.5262037 11.4092813,14.127572 L10.5781573,13.4482252 C9.58814209,12.663337 8.87313107,12.2617945 7.90144944,12.0215969 C6.61198512,11.7037596 5.22963049,11.595792 3.75438553,11.6952678 L3.57593834,11.707399 L1.43457203,19.4689363 L1.39423807,19.5793301 C1.23470986,19.921151 0.838124443,20.0848999 0.481402616,19.9562372 C0.124680788,19.8275744 -0.0734628127,19.4493182 0.0253280928,19.0855906 L2.00413636,11.900285 L4.87151387,1.27578608 L4.92407022,1.1144412 C5.14337698,0.538847201 5.65903126,0.125876012 6.27220212,0.0347650286 L6.44209362,0.0177813418 L6.99087985,0.000797680989 Z" id="形状结合"></path>
</g>
<path d="M19,17.5454538 C19,18.9009764 17.9022029,20 16.5479055,20 L15.3218582,20 C14.617636,20.0006355 13.9473318,19.6976125 13.4825829,19.1685218 L11.048693,16.6024994 C10.7355607,16.2722415 10.7422713,15.7527183 11.0638294,15.4306586 C11.2170335,15.277235 11.4249547,15.1910241 11.6417734,15.1910241 C11.8585921,15.1910241 12.0665134,15.277235 12.2197174,15.4306586 L13.0743096,16.2860676 L13.0743096,11.8181817 C13.0743096,11.3661363 13.4402419,11 13.8916744,11 C14.1085615,11.0001085 14.3165224,11.0863705 14.4698081,11.2398093 C14.6230937,11.3932481 14.7091477,11.6012949 14.7090392,11.8181817 L14.7090392,13.7613633 C14.7090392,13.365977 15.0291533,13.0454543 15.4241311,13.0454543 C15.6138938,13.0455628 15.7958412,13.1210496 15.929947,13.2553086 C16.0640527,13.3895676 16.1393316,13.5716009 16.1392231,13.7613633 L16.1392231,14.1704542 C16.1392231,13.7750679 16.4595417,13.4545452 16.8545195,13.4545452 C17.0442822,13.4546536 17.2262296,13.5301405 17.3603354,13.6643995 C17.4944411,13.7986585 17.56972,13.9806918 17.5696115,14.1704542 L17.5696115,14.7840905 C17.5696115,14.3887042 17.8899301,14.0681815 18.2849079,14.0681815 C18.4746706,14.0682899 18.656618,14.1437768 18.7907238,14.2780358 C18.9248295,14.4122948 19.0001084,14.5943281 19,14.7840905 L19,17.5454538 Z" id="路径"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/manual.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 17</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-1072.000000, -923.000000)">
<g id="编组-25" transform="translate(1059.000000, 916.000000)">
<g id="编组-17" transform="translate(13.000000, 7.000000)">
<rect id="矩形" x="0" y="0" width="22" height="22"></rect>
<path d="M15.8851398,2.2006884 C18.4513254,2.2006884 20.5316299,4.34209967 20.5316299,6.98366435 C20.5316299,9.62522902 18.4513254,11.7666403 15.8851398,11.7666403 C13.3189542,11.7666403 11.2386497,9.62522902 11.2386497,6.98366435 C11.2386497,4.34209967 13.3189542,2.2006884 15.8851398,2.2006884 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
<path d="M4.07412626,9.38141381 C2.93497627,9.38141381 2.01151275,8.43082449 2.01151275,7.25821315 C2.01151275,6.08560181 2.93497627,5.1350125 4.07412626,5.1350125 C5.21327625,5.1350125 6.13673978,6.08560181 6.13673978,7.25821315 C6.13673978,8.43082449 5.21327625,9.38141381 4.07412626,9.38141381 L4.07412626,9.38141381 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
<path d="M7.78746356,5.5594665 C6.64837243,5.5594665 5.72493331,4.60897169 5.7248501,3.43642094 C5.72476689,2.2638702 6.6480711,1.31323655 7.78716221,1.31306522 C8.92625333,1.31289388 9.84982739,2.26324972 9.85007712,3.43580045 C9.850197,3.9989889 9.6329395,4.53915287 9.24611143,4.93743089 C8.85928337,5.33570892 8.33458102,5.5594665 7.78746356,5.5594665 L7.78746356,5.5594665 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
<path d="M11.4438326,19.3760946 C13.8976211,19.3567809 16.3492167,19.5318262 18.7769164,19.8996809 C18.6033789,20.1815037 18.4983837,20.5022294 18.4708249,20.8346897 C16.5583183,20.6652804 14.1154641,20.5628902 11.4438326,20.5628902 C5.69003612,20.5628902 0.963477237,21.0329544 0.420922173,21.6333333 C0.388765361,21.5789522 0.370130228,21.5172484 0.366666667,21.453685 C0.366666667,20.3064493 5.32607207,19.3760946 11.4438326,19.3760946 Z M17.0194901,1.27722864 C17.0425487,1.28327896 17.064703,1.29212177 17.0877616,1.29863749 C17.1108203,1.30515321 17.1270969,1.30468781 17.1465384,1.30980733 C20.2783269,2.07257018 22.2164465,5.30430294 21.4754496,8.52808447 C20.7344528,11.751866 17.59494,13.7469158 14.4631515,12.984153 L12.4837298,15.8157077 L13.0262848,15.8157077 C13.7778855,15.8859857 14.360153,16.5229174 14.3826725,17.299435 C14.3814616,17.4595724 14.3598772,17.6188566 14.3184701,17.7732224 C15.913582,18.0571225 16.9824155,18.5686082 16.9824155,19.154094 C16.9809982,19.2018663 16.9718291,19.2490583 16.9552878,19.293717 C16.7653935,18.96793 15.549618,19.154094 13.8518728,19.0172634 C13.6838982,19.1627519 13.4723007,19.2441235 13.2528016,19.2476414 L10.087897,19.2476414 C9.85125189,19.2442624 9.62405888,19.1515108 9.44949056,18.9870118 C7.53743608,19.1103455 6.13764401,18.9404708 5.93282951,19.2941824 C5.91631263,19.2495165 5.9071444,19.2023288 5.90570176,19.1545594 C5.90570176,18.5169476 7.17166356,17.9672984 9.00549968,17.7038763 C8.97481916,17.5710172 8.95859341,17.4350569 8.95712184,17.2985041 C8.95712184,16.478917 9.46305444,15.8147769 10.0874449,15.8147769 L11.6943121,15.8147769 L13.7044787,12.769599 C13.5472439,12.7129244 13.3924704,12.6492585 13.2405941,12.5787808 C13.2207004,12.5699381 13.2003546,12.5624915 13.1804609,12.5531833 C13.0389445,12.4866296 12.9028535,12.4135603 12.7685712,12.3353714 C12.7414434,12.3200129 12.7138635,12.3060506 12.6871879,12.2888304 C12.5599483,12.2120974 12.4356687,12.130278 12.3146335,12.0435593 C12.285245,12.0226158 12.2549524,12.0030686 12.2242076,11.9816597 C12.1075583,11.8960243 11.998143,11.8048039 11.8864671,11.7107911 C11.8566265,11.6851935 11.8258817,11.6600614 11.7960412,11.6339984 C11.6911915,11.5402607 11.5898414,11.442454 11.4922104,11.3407901 L11.4017846,11.2477081 C11.3081938,11.1467141 11.2209329,11.0424623 11.130507,10.935418 C11.1015708,10.8995814 11.0726345,10.8637448 11.0446025,10.8269774 C10.9626163,10.7205536 10.8845487,10.611958 10.8103995,10.5011904 L10.728112,10.3750643 C10.6584841,10.2646069 10.5923225,10.152288 10.5296273,10.0381074 C10.5034038,9.99156638 10.4780846,9.94083666 10.4527653,9.89150321 C10.3951623,9.77919803 10.3408818,9.66512011 10.2899988,9.54942682 C10.2655838,9.49357762 10.2447859,9.43679758 10.220823,9.38001758 C10.1756101,9.26738833 10.1303972,9.15429369 10.0942269,9.03840659 C10.0790966,8.97295723 10.0617544,8.90807069 10.042232,8.8438652 C10.0087156,8.73300435 9.97855909,8.62109664 9.95180615,8.50830457 C9.93462523,8.43430437 9.92106135,8.35937334 9.9065932,8.28444231 C9.88534312,8.17693259 9.86409307,8.06942287 9.84872069,7.95865529 C9.83696531,7.87348525 9.83018338,7.78738438 9.82204505,7.70174894 C9.81209822,7.60028954 9.80079497,7.49929557 9.79582157,7.39643994 C9.79084817,7.29358431 9.79356091,7.19817526 9.79582157,7.09857752 C9.79582157,7.0054955 9.79310879,6.91567137 9.79582157,6.82305478 C9.80124712,6.70297899 9.81571526,6.5824378 9.82837487,6.46189657 C9.83606108,6.38836177 9.83967809,6.31529241 9.85007707,6.24175761 C9.87765694,6.04675079 9.91427941,5.85081317 9.96130086,5.65534095 C10.3323119,4.11070926 11.2847264,2.78130799 12.6086737,1.96007893 C13.932621,1.13884986 15.5194489,0.89318879 17.0194901,1.27722864 Z M13.4784141,18.003135 L10.7656387,18.003135 C10.5159347,18.003135 10.3135095,18.2115061 10.3135095,18.468545 C10.3135095,18.7255839 10.5159347,18.9339551 10.7656387,18.9339551 L13.4784141,18.9339551 C13.7281181,18.9339551 13.9305433,18.7255839 13.9305433,18.468545 C13.9305433,18.2115061 13.7281181,18.003135 13.4784141,18.003135 Z M13.2523494,16.8735848 L10.0874449,16.8735848 C9.71308192,16.8735848 9.40925108,16.8065657 9.40925108,17.2985041 C9.40925108,17.7904425 9.71308192,17.7234235 10.0874449,17.7234235 L13.2523494,17.7234235 C13.6267124,17.7234235 13.9305433,17.7904426 13.9305433,17.2985041 C13.9305433,16.8065657 13.6267124,16.8735848 13.2523494,16.8735848 Z M5.56615269,13.8144445 C6.19041287,13.8144445 6.69647573,14.3353725 6.69647573,14.9779696 C6.69647573,15.6205668 6.19041287,16.1414947 5.56615269,16.1414947 C4.94189251,16.1414947 4.43582965,15.6205668 4.43582965,14.9779696 C4.43582965,14.3353725 4.94189251,13.8144445 5.56615269,13.8144445 Z M7.6007342,11.7200993 C8.22499437,11.7200993 8.73105725,12.2410272 8.73105725,12.8836244 C8.73105725,13.1922105 8.61197,13.4881576 8.3999933,13.7063609 C8.1880166,13.9245642 7.9005145,14.0471496 7.60073418,14.0471496 C6.97647401,14.0471496 6.47041117,13.5262216 6.47041117,12.8836244 C6.47041117,12.2410273 6.97647403,11.7200993 7.6007342,11.7200993 Z M3.53157122,11.7200993 C4.15583139,11.7200993 4.66189427,12.2410272 4.66189427,12.8836244 C4.66189427,13.1922105 4.54280701,13.4881576 4.33083032,13.7063609 C4.11885362,13.9245642 3.83135152,14.0471496 3.5315712,14.0471496 C2.90731103,14.0471496 2.40124819,13.5262216 2.40124819,12.8836244 C2.40124819,12.2410273 2.90731105,11.7200993 3.53157122,11.7200993 Z M15.6938472,2.07726852 C13.7371468,2.07726852 11.9731157,3.29057916 11.2243188,5.1514356 C10.475522,7.01229204 10.8894222,9.15423045 12.2730183,10.5784683 C13.6566145,12.0027062 15.737431,12.4287642 17.5451865,11.6579722 C19.352942,10.8871802 20.5316299,9.0713325 20.5316299,7.05715601 C20.5316299,4.30684009 18.3656808,2.07726852 15.6938472,2.07726852 Z M5.56615271,9.62575412 C6.19041288,9.62575412 6.69647576,10.146682 6.69647576,10.7892792 C6.69647576,11.0978652 6.57738851,11.3938124 6.36541181,11.6120157 C6.15343511,11.830219 5.86593301,11.9528043 5.56615269,11.9528043 C4.94189252,11.9528043 4.43582968,11.4318764 4.43582968,10.7892792 C4.43582968,10.146682 4.94189254,9.62575412 5.56615271,9.62575412 Z M12.0392868,7.02736978 L12.6483048,7.1953828 C12.551277,7.73410365 12.6749886,8.29014528 12.9901145,8.73170139 L12.5443151,9.19431897 C12.0726108,8.5845918 11.8876634,7.79102923 12.0392868,7.02736978 Z M14.545439,3.5875241 L14.545439,4.23909818 C13.5952179,4.31491998 12.8400303,5.09150061 12.7654063,6.0695559 L12.134686,6.0695559 C12.2108376,4.7327597 13.2468036,3.66616323 14.545439,3.5875241 Z" id="形状结合" fill="#4E4E4E" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/return.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 16</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-990.000000, -923.000000)">
<g id="编组-23" transform="translate(977.000000, 916.000000)">
<g id="编组-16" transform="translate(13.000000, 7.000000)">
<rect id="矩形" x="0" y="0" width="22" height="22"></rect>
<path d="M7.46458035,12.5411039 C4.24490352,13.1715967 2.35719643,14.2497543 2.35719643,16.0878138 C2.35719643,18.4818805 6.22710847,20.0287697 11,20.0287697 C15.7728915,20.0287697 19.6428036,18.4818805 19.6428036,16.0878138 C19.6428036,14.2497543 17.7550965,13.1715967 14.5354196,12.5411039 L14.5354196,12.1468578 C19.2498125,12.5411039 22,14.5544674 22,16.8763059 C22,19.7052471 17.0748619,22 11,22 C4.92513807,22 0,19.7052471 0,16.8763059 C0,14.5552198 2.35719643,12.5411039 7.46458035,12.1468578 L7.46458035,12.5411039 L7.46458035,12.5411039 Z M9.76402809,15.4430258 L13.0212041,15.4430258 L12.8344583,13.9262318 L14.564669,13.9262318 L15.7143929,18.1673865 L13.3571964,18.1673865 L13.1524511,16.5031264 L9.63353106,16.5031264 L9.42878571,18.1673865 L7.07158928,18.1673865 L8.22131315,13.9262318 L9.95152383,13.9262318 L9.76402809,15.4430258 L9.76402809,15.4430258 Z" id="形状" fill="#4E4E4E" fill-rule="nonzero"></path>
<path d="M6.28560715,7.4174098 L9.42803573,7.4174098 C9.42803573,5.84117792 9.89752506,3.92863307 12.1782232,2.29371569 C14.9284107,0.323990117 19.6428036,0.323990117 22,4.26494603 C15.7143929,0.323990117 12.9642054,5.44693185 12.9642054,7.4174098 L16.1066339,7.4174098 L11,13.3288437 L6.28560715,7.4174098 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/start.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 9</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-826.000000, -923.000000)">
<g id="编组-19" transform="translate(813.000000, 916.000000)">
<g id="编组-9" transform="translate(13.000000, 7.000000)">
<rect id="矩形" x="0" y="0" width="22" height="22"></rect>
<path d="M6.99087985,1.00079768 C8.26689952,0.987453369 9.49647402,1.14151953 10.6820478,1.46420927 C11.960512,1.81116139 12.8845262,2.33522892 14.1691016,3.3142162 L15.2324513,4.12215367 C16.163799,4.8027136 16.8665876,5.17756745 17.7478234,5.40806011 L18.171941,5.50996215 L18.5960587,5.59124113 C19.7249598,5.78127701 20.8798783,5.75781595 22,5.52209333 L19.7173449,13.9807054 C19.5564266,13.8327611 19.34549,13.750125 19.1259986,13.7499996 C18.6432479,13.7499996 18.2517474,14.1417495 18.2517474,14.6249995 L18.2517474,13.8749996 C18.25188,13.6430678 18.1598725,13.4205826 17.9959655,13.2564883 C17.8320584,13.0923939 17.6096783,13.0001322 17.3777461,13 C16.8949954,13 16.5034948,13.3917496 16.5034948,13.8749996 L16.503,13.867 L16.5034948,13.3749996 C16.5036054,13.1817231 16.4397297,12.9950068 16.3235811,12.8431748 L16.247713,12.7564883 C16.0838059,12.592394 15.8614258,12.5001323 15.6294936,12.5 C15.1467429,12.5 14.7554923,12.8917497 14.7554923,13.3749996 L14.7554923,11 C14.755625,10.734916 14.6504479,10.4806366 14.4630987,10.2931003 C14.2757496,10.1055639 14.0215752,10.0001326 13.7564909,10 C13.2047401,10 12.7574895,10.4475 12.7574895,11 L12.7572667,16.1177099 C12.331585,15.8507457 11.8967791,15.5262037 11.4092813,15.127572 L10.5781573,14.4482252 C9.58814209,13.663337 8.87313107,13.2617945 7.90144944,13.0215969 C6.61198512,12.7037596 5.22963049,12.595792 3.75438553,12.6952678 L3.57593834,12.707399 L1.43457203,20.4689363 L1.39423807,20.5793301 C1.23470986,20.921151 0.838124443,21.0848999 0.481402616,20.9562372 C0.124680788,20.8275744 -0.0734628127,20.4493182 0.0253280928,20.0855906 L2.00413636,12.900285 L4.87151387,2.27578608 L4.92407022,2.1144412 C5.14337698,1.5388472 5.65903126,1.12587601 6.27220212,1.03476503 L6.44209362,1.01778134 L6.99087985,1.00079768 Z" id="形状结合" fill="#4E4E4E" fill-rule="nonzero"></path>
<path d="M19,18.5454538 C19,19.9009764 17.9022029,21 16.5479055,21 L15.3218582,21 C14.617636,21.0006355 13.9473318,20.6976125 13.4825829,20.1685218 L11.048693,17.6024994 C10.7355607,17.2722415 10.7422713,16.7527183 11.0638294,16.4306586 C11.2170335,16.277235 11.4249547,16.1910241 11.6417734,16.1910241 C11.8585921,16.1910241 12.0665134,16.277235 12.2197174,16.4306586 L13.0743096,17.2860676 L13.0743096,12.8181817 C13.0743096,12.3661363 13.4402419,12 13.8916744,12 C14.1085615,12.0001085 14.3165224,12.0863705 14.4698081,12.2398093 C14.6230937,12.3932481 14.7091477,12.6012949 14.7090392,12.8181817 L14.7090392,14.7613633 C14.7090392,14.365977 15.0291533,14.0454543 15.4241311,14.0454543 C15.6138938,14.0455628 15.7958412,14.1210496 15.929947,14.2553086 C16.0640527,14.3895676 16.1393316,14.5716009 16.1392231,14.7613633 L16.1392231,15.1704542 C16.1392231,14.7750679 16.4595417,14.4545452 16.8545195,14.4545452 C17.0442822,14.4546536 17.2262296,14.5301405 17.3603354,14.6643995 C17.4944411,14.7986585 17.56972,14.9806918 17.5696115,15.1704542 L17.5696115,15.7840905 C17.5696115,15.3887042 17.8899301,15.0681815 18.2849079,15.0681815 C18.4746706,15.0682899 18.656618,15.1437768 18.7907238,15.2780358 C18.9248295,15.4122948 19.0001084,15.5943281 19,15.7840905 L19,18.5454538 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/assets/images/task.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 6</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用备份-2" transform="translate(-1037.000000, -903.000000)">
<g id="编组-8" transform="translate(832.000000, 893.000000)">
<g id="编组-50" transform="translate(200.000000, 10.000000)">
<g id="编组-6" transform="translate(5.000000, 0.000000)">
<rect id="矩形" x="0" y="0" width="22" height="22"></rect>
<g id="批量控制_active" transform="translate(11.000000, 11.366667) rotate(-270.000000) translate(-11.000000, -11.366667) translate(0.733333, 0.733333)" fill-rule="nonzero">
<g id="编组" transform="translate(10.266667, 10.633333) rotate(-90.000000) translate(-10.266667, -10.633333) translate(-0.366667, 0.366667)">
<path d="M15.5184731,1.1006884 C18.0846588,1.1006884 20.1649632,3.24209967 20.1649632,5.88366435 C20.1649632,8.52522902 18.0846588,10.6666403 15.5184731,10.6666403 C12.9522875,10.6666403 10.871983,8.52522902 10.871983,5.88366435 C10.871983,3.24209967 12.9522875,1.1006884 15.5184731,1.1006884 Z" id="路径" fill="#FFFFFF"></path>
<path d="M7.42079689,4.4594665 C6.28170576,4.4594665 5.35826664,3.50897169 5.35818343,2.33642094 C5.35810022,1.1638702 6.28140443,0.213236552 7.42049555,0.213065216 C8.55958666,0.212893879 9.48316072,1.16324972 9.48341046,2.33580045 C9.48353033,2.8989889 9.26627283,3.43915287 8.87944477,3.83743089 C8.4926167,4.23570892 7.96791435,4.4594665 7.42079689,4.4594665 L7.42079689,4.4594665 Z" id="路径" fill="#FFFFFF"></path>
<path d="M3.7074596,8.28141381 C2.56830961,8.28141381 1.64484608,7.33082449 1.64484608,6.15821315 C1.64484608,4.98560181 2.56830961,4.0350125 3.7074596,4.0350125 C4.84660958,4.0350125 5.77007311,4.98560181 5.77007311,6.15821315 C5.77007311,7.33082449 4.84660958,8.28141381 3.7074596,8.28141381 L3.7074596,8.28141381 Z" id="路径" fill="#FFFFFF"></path>
<path d="M10.3989721,16.903135 L13.1117474,16.903135 C13.3614515,16.903135 13.5638766,17.1115061 13.5638766,17.368545 C13.5638766,17.6255839 13.3614515,17.8339551 13.1117474,17.8339551 L10.3989721,17.8339551 C10.149268,17.8339551 9.94684285,17.6255839 9.94684285,17.368545 C9.94684285,17.1115061 10.149268,16.903135 10.3989721,16.903135 L10.3989721,16.903135 Z" id="路径" fill="#22B3F1"></path>
<path d="M14.0964848,11.884153 L12.1170631,14.7157077 L12.6596182,14.7157077 C13.4112188,14.7859857 13.9934864,15.4229174 14.0160058,16.199435 C14.0147949,16.3595724 13.9932105,16.5188566 13.9518035,16.6732224 C15.5469154,16.9571225 16.6157488,17.4686082 16.6157488,18.054094 C16.6143315,18.1018663 16.6051625,18.1490583 16.5886211,18.193717 C16.3987268,17.86793 15.1829514,18.054094 13.4852061,17.9172634 C13.3172315,18.0627519 13.1056341,18.1441235 12.8861349,18.1476414 L9.72123036,18.1476414 C9.48458522,18.1442624 9.25739222,18.0515108 9.08282389,17.8870118 C7.17076941,18.0103455 5.77097735,17.8404708 5.56616284,18.1941824 C5.54964596,18.1495165 5.54047773,18.1023288 5.53903509,18.0545594 C5.53903509,17.4169476 6.80499689,16.8672984 8.63883301,16.6038763 C8.6081525,16.4710172 8.59192675,16.3350569 8.59045517,16.1985041 C8.59045517,15.378917 9.09638777,14.7147769 9.72077825,14.7147769 L11.3276455,14.7147769 L13.337812,11.669599 C13.1805772,11.6129244 13.0258037,11.5492585 12.8739274,11.4787808 C12.8540337,11.4699381 12.8336879,11.4624915 12.8137942,11.4531833 C12.6722778,11.3866296 12.5361869,11.3135603 12.4019045,11.2353714 C12.3747767,11.2200129 12.3471969,11.2060506 12.3205212,11.1888304 C12.1932816,11.1120974 12.0690021,11.030278 11.9479668,10.9435593 C11.9185784,10.9226158 11.8882857,10.9030686 11.8575409,10.8816597 C11.7408916,10.7960243 11.6314763,10.7048039 11.5198004,10.6107911 C11.4899599,10.5851935 11.4592151,10.5600614 11.4293745,10.5339984 C11.3245248,10.4402607 11.2231747,10.342454 11.1255437,10.2407901 L11.0351179,10.1477081 C10.9415271,10.0467141 10.8542662,9.94246228 10.7638404,9.83541796 C10.7349041,9.79958137 10.7059678,9.76374482 10.6779358,9.72697741 C10.5959497,9.62055365 10.517882,9.51195797 10.4437329,9.40119038 C10.4157008,9.35930348 10.3885731,9.31741657 10.3614453,9.27506427 C10.2918174,9.16460694 10.2256559,9.05228798 10.1629606,8.93810737 C10.1367371,8.89156638 10.1114179,8.84083666 10.0860986,8.79150321 C10.0284956,8.67919803 9.97421516,8.56512011 9.92333213,8.44942682 C9.89891715,8.39357762 9.87811922,8.33679758 9.85415636,8.28001758 C9.80894344,8.16738833 9.7637305,8.05429369 9.72756019,7.93840659 C9.71242991,7.87295723 9.69508775,7.80807069 9.6755653,7.7438652 C9.64204896,7.63300435 9.61189242,7.52109664 9.58513948,7.40830457 C9.56795856,7.33430437 9.55439468,7.25937334 9.53992654,7.18444231 C9.51867645,7.07693259 9.4974264,6.96942287 9.48205402,6.85865529 C9.47029865,6.77348525 9.46351671,6.68738438 9.45537838,6.60174894 C9.44543155,6.50028954 9.4341283,6.39929557 9.4291549,6.29643994 C9.4241815,6.19358431 9.42689424,6.09817526 9.4291549,5.99857752 C9.4291549,5.9054955 9.42644212,5.81567137 9.4291549,5.72305478 C9.43458045,5.60297899 9.4490486,5.4824378 9.4617082,5.36189657 C9.46939441,5.28836177 9.47301142,5.21529241 9.48341041,5.14175761 C9.51099028,4.94675079 9.54761274,4.75081317 9.59463419,4.55534095 C9.96564527,3.01070926 10.9180597,1.68130799 12.242007,0.860078925 C13.5659544,0.0388498641 15.1527823,-0.20681121 16.6528234,0.177228642 C16.675882,0.183278961 16.6980363,0.192121775 16.721095,0.198637493 C16.7441536,0.205153211 16.7604302,0.204687812 16.7798718,0.209807334 C19.9116602,0.972570184 21.8497798,4.20430294 21.108783,7.42808447 C20.3677861,10.651866 17.2282733,12.6469158 14.0964848,11.884153 L14.0964848,11.884153 Z M9.72077825,15.7735848 C9.34641525,15.7735848 9.04258442,15.7065657 9.04258442,16.1985041 C9.04258442,16.6904425 9.34641525,16.6234235 9.72077825,16.6234235 L12.8856828,16.6234235 C13.2600458,16.6234235 13.5638766,16.6904426 13.5638766,16.1985041 C13.5638766,15.7065657 13.2600458,15.7735848 12.8856828,15.7735848 L9.72077825,15.7735848 L9.72077825,15.7735848 Z M15.3271806,0.977268515 C13.3704801,0.977268515 11.606449,2.19057916 10.8576522,4.0514356 C10.1088553,5.91229204 10.5227555,8.05423045 11.9063516,9.4784683 C13.2899478,10.9027062 15.3707644,11.3287642 17.1785199,10.5579722 C18.9862754,9.78718022 20.1649632,7.9713325 20.1649632,5.95715601 C20.1649632,3.20684009 17.9990141,0.977268515 15.3271806,0.977268515 L15.3271806,0.977268515 Z M12.4010003,4.9695559 L11.7680193,4.9695559 C11.8441709,3.6327597 12.8801369,2.56616323 14.1787723,2.4875241 L14.1787723,3.13909818 C13.2285512,3.21491998 12.4733637,3.99150061 12.3987396,4.9695559 L12.4010003,4.9695559 Z M12.6270649,7.63170139 L12.1776484,8.09431897 C11.7059442,7.4845918 11.5209968,6.69102923 11.6726201,5.92736978 L12.2816382,6.0953828 C12.1846103,6.63410365 12.3083219,7.19014528 12.6234478,7.63170139 L12.6270649,7.63170139 Z M7.23406751,12.9471496 C6.60980734,12.9471496 6.10374451,12.4262216 6.10374451,11.7836244 C6.10374451,11.1410273 6.60980737,10.6200993 7.23406754,10.6200993 C7.8583277,10.6200993 8.36439059,11.1410272 8.36439059,11.7836244 C8.36439059,12.0922105 8.24530333,12.3881576 8.03332663,12.6063609 C7.82134994,12.8245642 7.53384783,12.9471496 7.23406751,12.9471496 L7.23406751,12.9471496 Z M5.19948602,10.8528043 C4.57522585,10.8528043 4.06916302,10.3318764 4.06916302,9.68927921 C4.06916302,9.04668205 4.57522588,8.52575412 5.19948604,8.52575412 C5.82374621,8.52575412 6.32980909,9.04668203 6.32980909,9.68927919 C6.32980909,9.99786525 6.21072184,10.2938124 5.99874514,10.5120157 C5.78676844,10.730219 5.49926634,10.8528043 5.19948602,10.8528043 Z M3.16490453,12.9471496 C2.54064436,12.9471496 2.03458152,12.4262216 2.03458152,11.7836244 C2.03458152,11.1410273 2.54064438,10.6200993 3.16490455,10.6200993 C3.78916472,10.6200993 4.2952276,11.1410272 4.2952276,11.7836244 C4.2952276,12.0922105 4.17614035,12.3881576 3.96416365,12.6063609 C3.75218695,12.8245642 3.46468485,12.9471496 3.16490453,12.9471496 L3.16490453,12.9471496 Z M5.19948602,12.7144445 C5.8237462,12.7144445 6.32980906,13.2353725 6.32980906,13.8779696 C6.32980906,14.5205668 5.8237462,15.0414947 5.19948602,15.0414947 C4.57522584,15.0414947 4.06916298,14.5205668 4.06916298,13.8779696 C4.06916298,13.2353725 4.57522584,12.7144445 5.19948602,12.7144445 L5.19948602,12.7144445 Z M18.4102497,18.7996809 C18.2367122,19.0815037 18.131717,19.4022294 18.1041582,19.7346897 C16.1916516,19.5652804 13.7487974,19.4628902 11.0771659,19.4628902 C5.32336945,19.4628902 0.596810571,19.9329544 0.0542555064,20.5333333 C0.0220986944,20.4789522 0.00346356089,20.4172484 -5.61554477e-13,20.353685 C-5.61554477e-13,19.2064493 4.95940541,18.2760946 11.0771659,18.2760946 C13.5309544,18.2567809 15.98255,18.4318262 18.4102497,18.7996809 L18.4102497,18.7996809 Z" id="形状" fill="#FFFFFF"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlBottom/index.vue
<template> <template>
<div class="control-bottom"> <div class="control-bottom">
<div class="control-bottom-item" @click="onStartTask"> <div class="control-bottom-item" @click="onStartTask">
<SymbolIcon icon="yijianrenwu" /> <img src="./assets/images/start.svg" />
<span class="dib f8">一键任务</span> <span class="dib">一键任务</span>
</div> </div>
<div class="control-bottom-item" @click="onReturnFlight"> <div class="control-bottom-item" @click="onReturnFlight">
<SymbolIcon icon="yijianfanhang2" /> <img src="./assets/images/return.svg" />
<span class="dib f8">一键返航</span> <span class="dib">一键返航</span>
</div> </div>
<div class="control-bottom-item" @click="onLand" v-if="isHangar"> <div class="control-bottom-item" @click="onLand" v-if="isHangar">
<SymbolIcon icon="anquanjiangla1" /> <SymbolIcon icon="anquanjiangla1" />
<span class="dib f8">紧急迫降</span> <span class="dib">紧急迫降</span>
</div> </div>
<div class="control-bottom-item" @click="onTaskEnd" v-else> <div class="control-bottom-item" @click="onTaskEnd" v-else>
<SymbolIcon icon="renwujieshu1" /> <SymbolIcon icon="renwujieshu1" />
<span class="dib f8">任务结束</span> <span class="dib">任务结束</span>
</div> </div>
<template v-if="uav.network === 1"> <template v-if="uav.network === 1">
<div v-if="controlType === 0" class="control-bottom-item" @click="onModeManual"> <div v-if="controlType === 0" class="control-bottom-item" @click="onModeManual">
<SymbolIcon icon="zidong" /> <img src="./assets/images/manual.svg" />
<span class="dib f12">自动</span> <span class="dib">自动</span>
</div> </div>
<div v-else-if="controlType === 1" class="control-bottom-item" @click="onModeKeyboard"> <div v-else-if="controlType === 1" class="control-bottom-item" @click="onModeKeyboard">
<SymbolIcon icon="shoudong" /> <img src="./assets/images/manual.svg" />
<span class="dib f12">摇杆</span> <span class="dib">摇杆</span>
</div> </div>
<div v-else-if="controlType === 2" class="control-bottom-item" @click="onModeAuto"> <div v-else-if="controlType === 2" class="control-bottom-item" @click="onModeAuto">
<img src="../../assets/images/keyboard.png" alt /> <img src="../../assets/images/keyboard.png" alt />
<span class="dib f12">键盘</span> <span class="dib">键盘</span>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div v-if="controlType === 0" class="control-bottom-item" @click="onModeManual"> <div v-if="controlType === 0" class="control-bottom-item" @click="onModeManual">
<SymbolIcon icon="zidong" /> <SymbolIcon icon="zidong" />
<span class="dib f8">自动</span> <span class="dib">自动</span>
</div> </div>
<div v-if="controlType === 1" class="control-bottom-item" @click="onModeAuto"> <div v-if="controlType === 1" class="control-bottom-item" @click="onModeAuto">
<SymbolIcon icon="shoudong" /> <SymbolIcon icon="shoudong" />
<span class="dib f8">手动</span> <span class="dib">手动</span>
</div> </div>
</template> </template>
<!-- 键盘控制 --> <!-- 键盘控制 -->
...@@ -223,11 +223,13 @@ export default { ...@@ -223,11 +223,13 @@ export default {
/** /**
* 接管判断, 机库模块中不需要判断接管 * 接管判断, 机库模块中不需要判断接管
*/ */
async isTakeOver(){ async isTakeOver() {
if(this.isHangar){ if (this.isHangar) {
return true; return true;
} }
return await this.$store.dispatch("MMCFlightControlCenter/uav/isTakeOver"); return await this.$store.dispatch(
"MMCFlightControlCenter/uav/isTakeOver"
);
}, },
// 无人机接管更新状态 // 无人机接管更新状态
async updateTakeOver() { async updateTakeOver() {
...@@ -375,14 +377,15 @@ export default { ...@@ -375,14 +377,15 @@ export default {
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: center;
align-items: center; align-items: center;
background: rgba(9, 32, 87, 0.7); gap: 4px;
border: 1px solid transparent; background: #ffffff;
width: 60px; border-radius: 2px;
height: 60px; color: #000;
color: #fff; width: 48px;
font-size: 12px; height: 48px;
font-size: 10px;
flex-wrap: wrap; flex-wrap: wrap;
cursor: pointer; cursor: pointer;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/assets/images/ai.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 34</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-20.000000, -136.000000)">
<g id="编组-13备份-6" transform="translate(12.000000, 128.000000)">
<g id="编组-34" transform="translate(8.000000, 8.000000)">
<g id="人脸识别" fill="#4E4E4E" fill-rule="nonzero">
<rect id="矩形" opacity="0" x="0" y="0" width="20" height="19.9999942"></rect>
<path d="M19.989697,2.50386706 L19.989697,17.4961354 C19.882929,18.9711292 18.6089128,20.0854289 17.1328361,19.9948468 L2.85686086,19.9948468 C1.38078422,20.0854289 0.106767945,18.9711292 0,17.4961354 L0,2.50386706 C0.106767955,1.02887328 1.38078422,-0.0854263383 2.85686086,0.00515568209 L17.1328361,0.00515568209 C18.6089127,-0.0854263383 19.882929,1.02887328 19.989697,2.50386706 Z M3.00678359,13.1650357 C2.8388124,13.1536198 2.67321333,13.2095881 2.54660738,13.3205637 C2.42000144,13.4315392 2.34282005,13.5883784 2.33213131,13.7563974 L2.33213131,16.1884765 C2.39009897,17.0567133 3.1284142,17.7211968 3.99793939,17.6877033 L6.38004496,17.6877033 C6.59431966,17.687742 6.7923342,17.57345 6.89948272,17.3878892 C7.00663123,17.2023284 7.00663123,16.9736968 6.89948272,16.788136 C6.7923342,16.6025751 6.59431966,16.4882832 6.38004496,16.4883218 L4.37274621,16.4883218 C4.20035866,16.499728 4.03052758,16.4420009 3.90079994,16.3279032 C3.7710723,16.2138054 3.69213357,16.052735 3.68143586,15.8803021 L3.68143586,13.7647264 C3.65910334,13.4136203 3.35808669,13.14605 3.00678359,13.1650357 Z M17.003736,13.1649199 C16.6600992,13.1649199 16.3713711,13.4232109 16.3332482,13.7647264 L16.3332482,15.8803021 C16.3225505,16.052735 16.2436118,16.2138054 16.1138842,16.3279032 C15.9841565,16.4420009 15.8143254,16.499728 15.6419379,16.4883218 L13.609652,16.4883218 C13.3953773,16.4882832 13.1973628,16.6025751 13.0902143,16.788136 C12.9830658,16.9736968 12.9830658,17.2023284 13.0902143,17.3878892 C13.1973628,17.57345 13.3953773,17.6877186 13.609652,17.6877186 L15.9917576,17.6877186 C16.4306065,17.6895188 16.8547,17.5293717 17.1828104,17.2379353 C17.4951813,16.9791038 17.6754394,16.594146 17.6742299,16.1884765 L17.6742299,13.7647264 C17.6361009,13.4232109 17.3473728,13.1649199 17.003736,13.1649199 Z M9.83789398,6.76047604 L8.1155923,6.76047604 L5.5987236,13.636364 L7.18785763,13.636364 L7.69389472,12.0605472 L10.1930077,12.0605472 L10.7079227,13.636364 L12.3059345,13.636364 L9.83789398,6.76047604 Z M14.441056,6.36985103 L13.0117231,6.36985103 L13.0117231,13.636364 L14.441056,13.636364 L14.441056,6.36985103 Z M8.95898745,7.94566783 C8.97970242,8.19424738 9.0152138,8.39399881 9.06552158,8.54492211 L9.84677183,10.9286225 L8.0134971,10.9286225 L8.79918627,8.52716643 C8.86133117,8.34073176 8.90128147,8.1468989 8.91903716,7.94566783 Z M6.38004496,2.31229919 L3.97295227,2.31229919 C3.10342707,2.27880569 2.36511185,2.94328921 2.3071442,3.81152604 L2.3071442,6.24360512 C2.31783294,6.41162409 2.39501433,6.56846327 2.52162027,6.67943881 C2.6482262,6.79041436 2.81382528,6.84638269 2.98179646,6.83496682 C3.33309956,6.85395248 3.6341162,6.58638221 3.65644873,6.2352761 L3.65644873,4.11970044 C3.66714644,3.94726752 3.74608517,3.78619711 3.87581281,3.67209934 C4.00554046,3.55800156 4.17537154,3.50027449 4.3477591,3.51168066 L6.38004496,3.51168066 C6.73134805,3.53066632 7.03236469,3.26309605 7.05469723,2.91198993 C7.0323647,2.56088381 6.73134806,2.29331353 6.38004496,2.31229919 Z M15.9834285,2.31229919 L13.609652,2.31229919 C13.2583489,2.29331352 12.9573323,2.5608838 12.9349997,2.91198993 C12.9573323,3.26309606 13.2583489,3.53066633 13.609652,3.51168066 L15.6336088,3.51168066 C15.8059964,3.50027449 15.9758275,3.55800157 16.1055551,3.67209934 C16.2352828,3.78619712 16.3142215,3.94726752 16.3249192,4.11970044 L16.3249192,6.2352761 C16.3772562,6.5673233 16.6634248,6.81191921 16.9995715,6.81191921 C17.3357181,6.81191921 17.6218868,6.5673233 17.6742237,6.2352761 L17.6825528,3.81152604 C17.6805472,3.40474545 17.4973464,3.02002385 17.1828104,2.76206724 C16.8509306,2.47141923 16.424586,2.31154007 15.9834285,2.31229919 Z" id="形状结合"></path>
</g>
<g id="Al" transform="translate(5.598724, 6.369851)"></g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/assets/images/car.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>车牌识别</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-187.000000, -141.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="编组-44备份" transform="translate(122.000000, 134.000000)">
<g id="车牌识别" transform="translate(65.000000, 7.000000)">
<path d="M1.1,16.4989 L1.1,19.8 C1.1,20.3641194 1.52464421,20.8290579 2.07171676,20.8925995 L2.2,20.9 L5.5,20.9 L5.5,22 L2.2,22 C0.98497355,22 0,21.0150264 0,19.8 L0,16.5 L1.1,16.4989 Z M22,16.5 L22,19.8 C22,21.0150264 21.0150264,22 19.8,22 L16.5,22 L16.5,20.9 L19.8,20.9 C20.3641194,20.9 20.8290579,20.4753558 20.8925995,19.9282832 L20.9,19.8 L20.9,16.4989 L22,16.5 Z M19.8,0 C21.0150264,0 22,0.98497355 22,2.2 L22,5.5 L20.9,5.4989 L20.9,2.2 C20.9,1.63588058 20.4753558,1.17094212 19.9282832,1.1074005 L19.8,1.1 L16.5,1.1 L16.5,0 L19.8,0 Z M5.5,0 L5.5,1.1 L2.2,1.1 C1.63588058,1.1 1.17094212,1.52464421 1.1074005,2.07171676 L1.1,2.2 L1.1,5.4989 L0,5.5 L0,2.2 C0,0.98497355 0.98497355,0 2.2,0 L5.5,0 Z" id="Mask"></path>
<path d="M17.6181818,8.53333333 L16.2818182,8.53333333 C16.2181818,8.53333333 16.1545455,8.53333333 16.0909091,8.6 L15.5181818,6.66666667 C15.3909091,5.53333333 14.6909091,5 13.8,5 L8.2,5 C7.24545455,5 6.60909091,5.73333333 6.48181818,6.66666667 L5.84545455,8.6 C5.78181818,8.53333333 5.71818182,8.53333333 5.65454545,8.53333333 L4.38181818,8.53333333 C4.19090909,8.53333333 4,8.73333333 4,8.93333333 L4,9.26666667 C4,9.46666667 4.19090909,9.66666667 4.38181818,9.66666667 L4.89090909,9.73333333 C4.7,10.0666667 4.63636364,10.4666667 4.63636364,10.9333333 L4.44545455,13.2 L4.44545455,16.2666667 C4.44545455,16.6666667 4.76363636,17 5.08181818,17 L6.1,17 C6.48181818,17 6.73636364,16.6666667 6.73636364,16.2666667 L6.73636364,15.4 L15.2636364,15.4 L15.2636364,16.2666667 C15.2636364,16.6666667 15.5818182,17 15.9,17 L16.9181818,17 C17.3,17 17.5545455,16.6666667 17.5545455,16.2666667 L17.5545455,13.5333333 L17.5545455,13.4 L17.5545455,13.2 L17.3636364,10.9333333 C17.3636364,10.4666667 17.3,10.1333333 17.1090909,9.8 L17.6181818,9.66666667 C17.8090909,9.66666667 18,9.46666667 18,9.26666667 L18,8.93333333 C18,8.73333333 17.8090909,8.53333333 17.6181818,8.53333333 Z M6.86363636,8.13333333 L7.30909091,6.86666667 C7.37272727,6.6 7.5,6.53333333 7.62727273,6.33333333 L14.4363636,6.33333333 C14.5636364,6.53333333 14.6909091,6.6 14.6909091,6.8 L15.1363636,8.06666667 L15.3272727,8.8 C15.2636364,9.33333333 14.7545455,9.73333333 14.2454545,9.73333333 L7.81818182,9.73333333 C7.37272727,9.73333333 6.8,9.33333333 6.73636364,8.8 L6.86363636,8.13333333 L6.86363636,8.13333333 Z M7.18181818,14.1333333 C6.60909091,14.1333333 6.16363636,13.6666667 6.16363636,13.0666667 C6.16363636,12.4666667 6.60909091,12 7.18181818,12 C7.75454545,12 8.2,12.4666667 8.2,13.0666667 C8.2,13.6 7.75454545,14.1333333 7.18181818,14.1333333 Z M14.8181818,14.1333333 C14.2454545,14.1333333 13.8,13.6666667 13.8,13.0666667 C13.8,12.4666667 14.2454545,12 14.8181818,12 C15.3909091,12 15.8363636,12.4666667 15.8363636,13.0666667 C15.8363636,13.6 15.3909091,14.1333333 14.8181818,14.1333333 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/assets/images/face.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>人脸识别</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-135.000000, -141.000000)">
<g id="编组-44备份" transform="translate(122.000000, 134.000000)">
<g id="人脸识别" transform="translate(13.000000, 7.000000)">
<g id="编组-14" transform="translate(5.000000, 4.000000)">
<path d="M7.06028076,11.5096154 C7.06028076,11.3980963 6.97115495,11.3076923 6.86121269,11.3076923 C6.75127044,11.3076923 6.66214463,11.3980963 6.66214463,11.5096154 C6.66214463,11.7963462 6.17243718,12.1153846 5.46773623,12.1153846 C4.76303527,12.1153846 4.27332783,11.7963462 4.27332783,11.5096154 C4.27332783,11.3980963 4.18420202,11.3076923 4.07425976,11.3076923 C3.9643175,11.3076923 3.8751917,11.3980963 3.8751917,11.5096154 C3.8751917,12.075 4.57392061,12.5192308 5.46773623,12.5192308 C6.36155185,12.5192308 7.06028076,12.075 7.06028076,11.5096154 Z" id="路径" fill="#4E4E4E" fill-rule="nonzero"></path>
<ellipse id="椭圆形" fill="#4E4E4E" cx="3.18508906" cy="7.53846154" rx="1" ry="1"></ellipse>
<ellipse id="椭圆形" fill="#4E4E4E" cx="7.96272266" cy="7.53846154" rx="1" ry="1"></ellipse>
<path d="M4.98997287,10.3923077 L5.25539696,10.3923077 C5.54857631,10.3923077 5.78624513,10.1512302 5.78624513,9.85384615 L5.78624513,7.96923077 C5.78624513,7.82053872 5.66741072,7.7 5.52082105,7.7 C5.37423137,7.7 5.25539696,7.82053872 5.25539696,7.96923077 L5.25539696,9.85384615 L4.98997287,9.85384615 C4.84338319,9.85384615 4.72454878,9.97438488 4.72454878,10.1230769 C4.72454878,10.271769 4.84338319,10.3923077 4.98997287,10.3923077 Z" id="路径" fill="#4E4E4E"></path>
<path d="M9.6685148,12.5899487 C10.0092066,11.6803775 10.1814911,10.7148417 10.1767135,9.74184615 C10.1767135,6.83989744 8.30246549,5.72169231 6.38150289,5.03210256 C4.40214699,4.32169231 2.37466085,4.05892308 2.37466085,2.25794872 C2.37466085,0.594820513 3.83024655,4.54747351e-13 5.55479533,4.54747351e-13 C7.37808187,4.54747351e-13 12,1.31169231 12,6.73112821 C11.9910878,8.91473382 11.1565815,11.0116475 9.6685148,12.5895897" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M2.90444733,3.55564103 C2.90444733,4.96784615 1.08823876,6.38723077 1.08823876,7.63430769 C1.10400562,8.41837514 1.33395936,9.18262554 1.75250678,9.842 C1.75250678,9.842 0,8.62364103 0,5.88538462 C0,3.14712821 1.53379733,1.83974359 2.51232747,1.45384615 M5.54063938,14 C6.53297157,14 10.0415241,12.1204103 10.0415241,8.49476923" id="形状" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M5.54063938,14 C4.61200897,14 1.47965082,12.3537436 1.08151469,9.17071795" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M1.52247257,10.7153846 C0.74154112,10.6166408 0.179668455,9.90577799 0.254453226,9.11112821 C0.252151854,8.81397431 0.345325323,8.52414441 0.519877315,8.28548718" id="路径" stroke="#4E4E4E" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round"></path>
<path d="M2.90444733,3.55564103 L2.37466085,2.69230769 L2.65424089,0.952910516 L4.72454878,0 L7.79108175,0.368088793 L9.59636586,1.45384615 L10.8668502,2.69230769 L11.812356,4.65144111 L12,7.53846154 C11.7619312,8.65914222 11.5709447,9.42698837 11.4270405,9.842 C10.791481,11.6749179 10.1402158,12.2737175 9.77714939,12.2737175 C9.76639252,12.3477903 9.91880671,11.4873203 10.2343919,9.69230769 L9.77714939,7.53846154 C8.98300414,6.1025641 7.15494293,5.02564103 4.29296576,4.30769231 C4.28546625,4.24809717 3.91617402,4.06860999 3.18508906,3.76923077 L2.90444733,3.55564103 Z" id="路径-13" fill="#4E4E4E"></path>
<path d="M2.90444733,1.45384615 L2.90444733,3.97675978 L1.52247257,6.29497436 C1.06239744,7.77506935 1.11179167,8.90391994 1.67065529,9.68152615 C1.69019928,9.72165491 1.32376626,9.32606927 0.571356222,8.49476923 L0,7 L0,5.04850637 L0.571356222,3.25547103 L1.67065529,1.91650804 L2.90444733,1.45384615 Z" id="路径-14" fill="#4E4E4E"></path>
</g>
<path d="M1.1,16.4989 L1.1,19.8 C1.1,20.3641194 1.52464421,20.8290579 2.07171676,20.8925995 L2.2,20.9 L5.5,20.9 L5.5,22 L2.2,22 C0.98497355,22 0,21.0150264 0,19.8 L0,16.5 L1.1,16.4989 Z M22,16.5 L22,19.8 C22,21.0150264 21.0150264,22 19.8,22 L16.5,22 L16.5,20.9 L19.8,20.9 C20.3641194,20.9 20.8290579,20.4753558 20.8925995,19.9282832 L20.9,19.8 L20.9,16.4989 L22,16.5 Z M19.8,0 C21.0150264,0 22,0.98497355 22,2.2 L22,5.5 L20.9,5.4989 L20.9,2.2 C20.9,1.63588058 20.4753558,1.17094212 19.9282832,1.1074005 L19.8,1.1 L16.5,1.1 L16.5,0 L19.8,0 Z M5.5,0 L5.5,1.1 L2.2,1.1 C1.63588058,1.1 1.17094212,1.52464421 1.1074005,2.07171676 L1.1,2.2 L1.1,5.4989 L0,5.5 L0,2.2 C0,0.98497355 0.98497355,0 2.2,0 L5.5,0 Z" id="Mask备份" fill="#4E4E4E" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/taskList/components/lineList/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="cpt-command-airway-list"> <div class="cpt-command-airway-list">
<div class="hd" v-interact> <div class="hd" v-interact>
<div class="left ml8"> <div class="left ml8">
<img src="../../../../assets/images/mount_head.png" /> <!-- <img src="../../../../assets/images/mount_head.png" /> -->
<div class="title">航空航线</div> <div class="title">航空航线</div>
</div> </div>
<div @click="close" class="close">关闭</div> <div @click="close" class="close">关闭</div>
...@@ -118,12 +118,12 @@ export default { ...@@ -118,12 +118,12 @@ export default {
4: "通过", 4: "通过",
5: "驳回", 5: "驳回",
}; };
this.airwayData = res.data.list && { this.airwayData = (res.data.list && {
current: this.airwayData.current, current: this.airwayData.current,
records: res.data.list, records: res.data.list,
size: this.airwayData.size, size: this.airwayData.size,
total: res.data.total, total: res.data.total,
} || { }) || {
current: this.airwayData.current, current: this.airwayData.current,
records: [], records: [],
size: this.airwayData.size, size: this.airwayData.size,
...@@ -132,17 +132,17 @@ export default { ...@@ -132,17 +132,17 @@ export default {
this.airwayData.records = this.airwayData.records?.map((item) => { this.airwayData.records = this.airwayData.records?.map((item) => {
let content = []; let content = [];
try{ try {
content = JSON.parse(item.content).content // TODO 待确认字段 content = JSON.parse(item.content).content; // TODO 待确认字段
}catch(e){ } catch (e) {
console.log(e); console.log(e);
} }
return { return {
...item, ...item,
status: statusMap[item.status], status: statusMap[item.status],
content content,
}; };
}) });
} }
} else { } else {
this.rootNode.$emit("airwayPageChange", { this.rootNode.$emit("airwayPageChange", {
...@@ -169,47 +169,28 @@ export default { ...@@ -169,47 +169,28 @@ export default {
position: absolute; position: absolute;
right: -213px; right: -213px;
top: 300px; top: 300px;
// width: 1132px;
// height: 689px;
box-sizing: border-box; box-sizing: border-box;
background: #222222;
// background: rgba(0, 23, 79, 0.7); box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
// box-shadow: 0 2px 4px 0 rgba(1, 162, 255, 0.35), border-radius: 2px;
// inset 0 0 40px 0 rgba(0, 184, 255, 0.5);
// border-radius: 13px;
background: rgba(0, 23, 79, 0.7);
box-shadow: 0 2px 4px 0 rgba(1, 162, 255, 0.35),
inset 0 0 40px 0 rgba(0, 184, 255, 0.5);
border-radius: 10px;
.hd { .hd {
height: 32px; flex-shrink: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: rgba(16, 65, 215, 0.2); height: 32px;
box-shadow: inset 0 0 15px 0 rgba(0, 182, 255, 0.6); background: #3c3c3c;
border-radius: 10px 10px 0 0; border-radius: 2px 2px 0px 0px;
.left { .left {
display: flex; display: flex;
align-items: center; align-items: center;
.title { .title {
font-size: 20px; font-family: PingFangSC, PingFang SC;
font-family: YouSheBiaoTiHei; font-weight: 500;
color: #14faff; font-size: 14px;
line-height: 26px; color: #ffffff;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#e3aa77 0%,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
} }
...@@ -226,7 +207,6 @@ export default { ...@@ -226,7 +207,6 @@ export default {
// width: 1132px; // width: 1132px;
height: calc(100% - 56px); height: calc(100% - 56px);
box-sizing: border-box; box-sizing: border-box;
padding: 0 16px 0 16px;
.search-box { .search-box {
margin-left: 0 !important; margin-left: 0 !important;
// height: 80px; // height: 80px;
...@@ -329,7 +309,7 @@ export default { ...@@ -329,7 +309,7 @@ export default {
padding: 0 !important; padding: 0 !important;
.tb-hd-box { .tb-hd-box {
display: flex; display: flex;
background: #081a3a; background: #303133;
// width: 1415.62px; // width: 1415.62px;
border-top: 1px solid rgba(207, 234, 255, 0.33); border-top: 1px solid rgba(207, 234, 255, 0.33);
border-bottom: 1px solid rgba(207, 234, 255, 0.33); border-bottom: 1px solid rgba(207, 234, 255, 0.33);
...@@ -350,7 +330,7 @@ export default { ...@@ -350,7 +330,7 @@ export default {
} }
} }
.tb-bd-box { .tb-bd-box {
width: 570px; width: 100%;
max-height: 280px; max-height: 280px;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
...@@ -359,7 +339,7 @@ export default { ...@@ -359,7 +339,7 @@ export default {
color: #fff; color: #fff;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
width: 560px; width: 100%;
margin: 5px 0 0 0; margin: 5px 0 0 0;
// border: 1px solid; // border: 1px solid;
background: #081a3a; background: #081a3a;
...@@ -372,7 +352,7 @@ export default { ...@@ -372,7 +352,7 @@ export default {
// // border: 1px solid #70f6f9; // // border: 1px solid #70f6f9;
// } // }
&:nth-of-type(2n - 1) { &:nth-of-type(2n - 1) {
background: rgba(73, 135, 210, 0.5); background: #3c3c3c;
} }
.td { .td {
// width: calc(100% / 7); // width: calc(100% / 7);
...@@ -382,19 +362,16 @@ export default { ...@@ -382,19 +362,16 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.last-td { .last-td {
width: 80px;
height: 32px;
text-align: center; text-align: center;
width: 170px; line-height: 32px;
div { margin: 0 auto;
background: url("../../../../assets/images/btn.png") no-repeat; color: #fff;
background-size: 100% 100%; background: #3388ff;
padding: 5px 12px; font-family: SourceHanSansCN, SourceHanSansCN;
} font-weight: 400;
.iconfont { font-size: 14px;
margin-right: 7px;
}
&:hover {
color: #43deff;
}
} }
} }
} }
...@@ -492,9 +469,6 @@ export default { ...@@ -492,9 +469,6 @@ export default {
// -webkit-transform: translateX(-100%); // -webkit-transform: translateX(-100%);
// } // }
// } // }
.tb-tr::v-deep .td {
padding: 18px 0 !important;
}
// 提示框样式 // 提示框样式
.td::v-deep .el-tooltip { .td::v-deep .el-tooltip {
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/components/taskList/index.vue
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<el-button v-else class="select-airway__btn" @click="showFlywayDialog = true">选择航线</el-button> <el-button v-else class="select-airway__btn" @click="showFlywayDialog = true">选择航线</el-button>
</el-tooltip> </el-tooltip>
</el-form-item> </el-form-item>
<div class="btn" @click="onStartTask">一键任务</div> <div class="btn" @click="onStartTask" v-hover>一键任务</div>
<!-- <div class> <!-- <div class>
<span class="btn__add-line"> <span class="btn__add-line">
<span class="f8"></span> 创建航线 <span class="f8"></span> 创建航线
...@@ -206,12 +206,12 @@ export default { ...@@ -206,12 +206,12 @@ export default {
this.selectedAirway = res.data; this.selectedAirway = res.data;
} }
} else { } else {
this.rootNode.$emit('airwayGet', { this.rootNode.$emit("airwayGet", {
airwayId: this.selectedTask?.airwayId, airwayId: this.selectedTask?.airwayId,
callback: (airway) => { callback: (airway) => {
this.selectedAirway = airway; this.selectedAirway = airway;
} },
}) });
} }
}, },
}, },
...@@ -220,24 +220,20 @@ export default { ...@@ -220,24 +220,20 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.taskListBox { .taskListBox {
min-height: 254px; min-height: 254px;
width: 380px; width: 416px;
background: rgba(9, 32, 87, 0.7); background: #222222;
border-radius: 10px; border-radius: 12px;
transition: 0.3s; transition: 0.3s;
display: flex;
flex-direction: column;
.header { .header {
flex-shrink: 0;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 32px; height: 32px;
background: linear-gradient( background: #3c3c3c;
180deg, border-radius: 12px 12px 0px 0px;
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.title { .title {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -292,8 +288,11 @@ export default { ...@@ -292,8 +288,11 @@ export default {
} }
} }
.task-main::v-deep { .task-main::v-deep {
padding: 38px 30px; flex: auto;
padding: 38px 16px 16px;
position: relative; position: relative;
display: flex;
flex-direction: column;
.el-form-item__label { .el-form-item__label {
color: #fff; color: #fff;
...@@ -315,10 +314,11 @@ export default { ...@@ -315,10 +314,11 @@ export default {
text-align: center; text-align: center;
line-height: 32px; line-height: 32px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 10px;
color: #fff; color: #fff;
background: url("../../assets/images/btn_lan.png") no-repeat; background: #3388ff;
background-size: 100% 100%; font-family: SourceHanSansCN, SourceHanSansCN;
font-weight: 400;
font-size: 14px;
cursor: pointer; cursor: pointer;
} }
} }
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlLeft/index.vue
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
</div> </div>
<TaskList class="task-list" v-if="openTask"></TaskList> <TaskList class="task-list" v-if="openTask"></TaskList>
<div class="left-bar-item item" @click="onClickAI"> <div class="left-bar-item item" @click="onClickAI">
<img class="left-bar-item__icon" src="./assets/images/ai.png" /> <img class="left-bar-item__icon" src="./assets/images/ai.svg" />
<div class="left-bar-item__text">智能识别</div> <div class="left-bar-item__text">智能识别</div>
</div> </div>
<div class="ai-list" :class="{ active: openAIList }"> <div class="ai-list" :class="{ active: openAIList }">
<div class="left-bar-item item" @click.stop="switchAI(0)"> <div class="left-bar-item item" @click.stop="switchAI(0)">
<img class="left-bar-item__icon" src="./assets/images/faceAI2.png" /> <img class="left-bar-item__icon" src="./assets/images/face.svg" />
<div class="left-bar-item__text">人脸识别</div> <div class="left-bar-item__text">人脸识别</div>
</div> </div>
<div class="left-bar-item item" @click.stop="switchAI(1)"> <div class="left-bar-item item" @click.stop="switchAI(1)">
<img class="left-bar-item__icon" src="./assets/images/carAI2.png" /> <img class="left-bar-item__icon" src="./assets/images/car.svg" />
<div class="left-bar-item__text">车辆识别</div> <div class="left-bar-item__text">车辆识别</div>
</div> </div>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="left-bar-item item" @click.stop="switchAI(3)"> <div class="left-bar-item item" @click.stop="switchAI(3)">
<img class="left-bar-item__icon" src="./assets/images/ksjm.png" /> <img class="left-bar-item__icon" src="./assets/images/ksjm.png" />
<div class="left-bar-item__text">快速建模</div> <div class="left-bar-item__text">快速建模</div>
</div> --> </div>-->
<Face v-if="openFace" class="ai-dialog" :uavId="uav.deviceId" @close="openFace = false" /> <Face v-if="openFace" class="ai-dialog" :uavId="uav.deviceId" @close="openFace = false" />
<Car v-if="openPlate" class="ai-dialog" :uavId="uav.deviceId" @close="openPlate = false" /> <Car v-if="openPlate" class="ai-dialog" :uavId="uav.deviceId" @close="openPlate = false" />
<Traffic <Traffic
...@@ -158,7 +158,8 @@ export default { ...@@ -158,7 +158,8 @@ export default {
position: relative; position: relative;
width: 48px; width: 48px;
height: 48px; height: 48px;
background: rgba(9, 32, 87, 0.7); background: #ffffff;
border-radius: 2px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -166,24 +167,24 @@ export default { ...@@ -166,24 +167,24 @@ export default {
margin-bottom: 2px; margin-bottom: 2px;
.left-bar-item__icon { .left-bar-item__icon {
width: 20px; width: 24px;
height: 20px; height: 24px;
margin-bottom: 2px; margin-bottom: 2px;
} }
.left-bar-item__text { .left-bar-item__text {
font-size: 16px; font-size: 9px;
transform: scale(0.6); // transform: scale(0.6);
white-space: nowrap; white-space: nowrap;
color: #fff; color: #000;
} }
} }
.ai-list { .ai-list {
width: 0; // width: 0;
position: absolute; position: absolute;
left: 65px; left: 52px;
top: 62px; top: 60px;
display: none; display: none;
gap: 4px; gap: 4px;
...@@ -192,7 +193,6 @@ export default { ...@@ -192,7 +193,6 @@ export default {
} }
.left-bar-item { .left-bar-item {
padding-top: 3px;
} }
} }
} }
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/assets/images/files.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 4</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-1880.000000, -327.000000)" fill="#4E4E4E">
<g id="编组-13备份-11" transform="translate(1872.000000, 320.000000)">
<g id="编组-4" transform="translate(8.000000, 7.000000)">
<g id="24gf-folderOpen" fill-rule="nonzero">
<rect id="矩形" opacity="0" x="0" y="0" width="22" height="22"></rect>
<path d="M20.6416146,8.24999182 C20.9990664,8.24864567 21.3363549,8.41543316 21.5522656,8.7003125 C21.7698871,8.98340326 21.84207,9.35232627 21.7470573,9.69661458 L19.3720312,18.4049479 C19.2355666,18.9032086 18.783198,19.2490203 18.2665885,19.2499918 L1.35838542,19.2499918 C1.00142646,19.2499918 0.664888575,19.0835168 0.4481518,18.7998887 C0.231415025,18.5162607 0.159240965,18.1478266 0.252942701,17.8033854 L2.62796875,9.09505208 C2.76443336,8.59679145 3.21680204,8.25097968 3.73341145,8.24999182 Z M13.5447452,11.0003695 L13.355766,11.0116041 C12.2157709,11.1302254 11.2130744,12.0930345 10.3705598,13.8703761 C9.74647488,15.187072 9.15151393,15.9185696 8.60023891,16.047076 C8.04688362,16.1775594 7.41655785,15.7050514 6.68637849,15.1574167 L6.57612349,15.0763588 C4.93894071,13.85456 3.86967521,14.718518 2.12015715,16.3475832 C1.96205564,16.4938827 1.95997535,16.7350792 2.1139163,16.8853328 C2.19088677,16.9624366 2.29490093,17 2.39891508,17 C2.49876867,17 2.60070254,16.9644136 2.67767301,16.8912639 C4.60401514,15.098106 5.08248024,14.9280822 6.0830964,15.6734191 L6.3510654,15.8742981 C7.14766501,16.4691854 7.91192525,16.9865315 8.78954467,16.7845047 C9.61541705,16.5907567 10.349757,15.764362 11.0986589,14.1807684 C11.8059551,12.6900948 12.6151852,11.855792 13.4389773,11.7668261 C14.4520752,11.669952 15.2862687,12.6861407 15.2945898,12.6980028 L18.2839566,16.4503882 C18.4170947,16.616458 18.668809,16.6500673 18.8435527,16.521561 C19.0182965,16.3950316 19.0515811,16.1577892 18.9184429,15.9897424 L15.9332367,12.241311 C15.8895508,12.1839774 14.8223656,10.8633276 13.355766,11.0116041 Z M6.5,10 C5.67157288,10 5,10.6715729 5,11.5 C5,12.3284271 5.67157288,13 6.5,13 C7.32842712,13 8,12.3284271 8,11.5 C8,10.6715729 7.32842712,10 6.5,10 Z" id="形状结合"></path>
</g>
<path d="M1.74367187,8.85313801 L0,15.2464583 L0,2.97916667 C0.000710388293,2.34663488 0.513301537,1.83404373 1.14583333,1.83332902 L6.59026042,1.83332902 C6.89432195,1.83249776 7.18608127,1.9533378 7.40050781,2.16891926 L9.74774739,4.51615886 C9.79057653,4.55933082 9.84892744,4.58352762 9.90973958,4.58333333 L18.1041667,4.58333333 C18.7366985,4.58404373 19.2492896,5.09663488 19.25,5.72916667 L19.25,7.33332902 L3.73341145,7.33332902 C2.8038608,7.33484517 1.98968302,7.95673118 1.74367187,8.85313801 Z" id="路径"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/assets/images/health.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 10</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-1879.000000, -135.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="编组-13备份-4" transform="translate(1872.000000, 128.000000)">
<g id="系统设置" transform="translate(7.000000, 7.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="22" height="22"></rect>
<path d="M20.1734375,1.3015625 C20.8976562,1.3015625 21.4835937,1.8875 21.4835937,2.61171875 L21.4835937,16.8265625 C21.4835937,17.5507812 20.8976562,18.1367187 20.1734375,18.1367187 L14.928125,18.1367187 L14.928125,19.446875 C14.928125,20.1710937 14.3421875,20.7570312 13.6179687,20.7570312 L8.37265625,20.7570312 C7.6484375,20.7570312 7.0625,20.1710937 7.0625,19.446875 L7.0625,18.1367187 L1.8171875,18.1367187 C1.09296875,18.1367187 0.50703125,17.5507812 0.50703125,16.8265625 L0.50703125,2.61171875 C0.50703125,1.8875 1.09296875,1.3015625 1.8171875,1.3015625 Z M14.2718569,5.71628865 C14.0616716,5.23089043 13.3718331,5.2351991 13.1677275,5.72318493 L11.2046094,10.4167061 L10.1213339,7.75820913 L10.0779587,7.67177901 C9.88147465,7.34731066 9.42150821,7.28035428 9.14145059,7.56041189 L7.25160938,9.44970607 L5.32160938,9.45039063 C4.99023853,9.45039062 4.72160938,9.71901978 4.72160938,10.0503906 C4.72160938,10.3817615 4.99023853,10.6503906 5.32160938,10.6503906 L7.5,10.6503906 L7.59442725,10.6429162 C7.71857121,10.6231327 7.83424661,10.5646722 7.92426407,10.4746547 L9.35060938,9.04770607 L10.6419837,12.2148575 L10.6887384,12.3074102 C10.9352082,12.7086717 11.558392,12.6807317 11.7511352,12.2199118 L13.7306094,7.48570607 L14.8956112,10.1766895 C14.9906602,10.396194 15.2070084,10.5382721 15.4462082,10.5382721 L17.0164063,10.5382721 C17.3477771,10.5382721 17.6164063,10.269643 17.6164063,9.9382721 L17.6085533,9.84094898 C17.562053,9.55586171 17.31464,9.3382721 17.0164063,9.3382721 L15.8396094,9.33770607 Z" id="形状结合"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/assets/images/lamp.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 67</title>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用4-AI人脸" transform="translate(-1874.000000, -242.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="预警" transform="translate(1874.000000, 242.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="22" height="22"></rect>
<path d="M11.1396484,5.92786133 C15.2081445,5.92786133 18.5039551,9.22427344 18.5039551,13.288666 L18.5039551,20.0833145 L21.0178848,20.0833145 C21.5399551,20.0833145 21.9631973,20.5065566 21.9631973,21.028627 C21.9631973,21.5506973 21.5399551,21.9739395 21.0178848,21.9739395 L0.961361328,21.9739395 C0.439269531,21.9739395 0.0160488281,21.5506973 0.0160488281,21.028627 C0.0160488281,20.5065566 0.439269531,20.0833145 0.961361328,20.0833145 L3.77538477,20.0833145 L3.77536328,13.288666 C3.77536328,9.22425195 7.07115234,5.92786133 11.1396484,5.92786133 Z M11.6727402,8.89416602 L8.04024805,14.8743203 L10.9453867,14.8743203 L10.2180332,19.3594414 L13.8505469,13.3792871 L10.9453652,13.3792871 L11.6727402,8.89416602 Z M1.5393125,6.54699805 L3.80340039,7.86083203 L3.09115039,9.09914844 L0.829189453,7.78529297 C0.488189453,7.58899023 0.371615234,7.15103125 0.568046875,6.81018164 C0.762287109,6.46933203 1.19826953,6.35067383 1.5393125,6.54699805 Z M21.7090801,6.80588477 C21.9076816,7.15105273 21.7911074,7.58901172 21.4501074,7.78746289 L19.188125,9.09697852 L18.475875,7.85868359 L20.7378145,6.54699805 C21.0766875,6.35069531 21.5126484,6.46718359 21.7090801,6.80588477 Z M17.2391484,2.32510352 C17.5845098,2.52355469 17.701041,2.96151367 17.5046094,3.30238477 L16.198832,5.5719082 L14.9642539,4.85781055 L16.2700742,2.58828711 C16.464293,2.2474375 16.9002754,2.13094922 17.2391484,2.32510352 Z M6.00713867,2.58399023 L7.31510742,4.85566211 L6.08050781,5.56973828 L4.7746875,3.30021484 C4.57832031,2.95934375 4.69485156,2.52355469 5.03585156,2.32510352 C5.37474609,2.1287793 5.81070703,2.24526758 6.00713867,2.58399023 Z M11.1375,0.64453125 C11.5648672,0.64453125 11.910207,0.965980469 11.910207,1.3650957 L11.910207,3.936625 L10.3648145,3.936625 L10.3648145,1.36294727 C10.364793,0.966001953 10.7101328,0.64453125 11.1375,0.64453125 Z" id="形状结合"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/assets/images/mount.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 20</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-1879.000000, -279.000000)" fill="#4E4E4E">
<g id="编组-13备份-10" transform="translate(1872.000000, 272.000000)">
<g id="编组-20" transform="translate(7.000000, 7.000000)">
<circle id="椭圆形" cx="11" cy="11" r="2"></circle>
<g id="编组" fill-rule="nonzero">
<path d="M19.3636826,3.85384255 L14.6540622,8.55746524 C15.6369416,10.0375215 15.6428345,11.962233 14.6540622,13.436642 L19.3577898,18.1402647 C22.879754,14.033526 22.879754,7.97236669 19.3636826,3.85384255 L19.3636826,3.85384255 Z M17.2341514,13.1616482 L17.2341514,8.73866655 L19.9605799,10.9911609 L17.2341514,13.1616482 Z M7.3407811,8.56335796 L2.63705352,3.85948974 C-0.879017839,7.97236669 -0.879017839,14.0391732 2.63705352,18.1520502 L7.3407811,13.4425348 C6.35790165,11.9683712 6.35790165,10.0375215 7.3407811,8.56335796 Z M4.2927008,13.1616482 L1.56651782,10.9970536 L4.29294634,8.78556282 L4.29294634,13.1616482 L4.2927008,13.1616482 Z M8.55790161,14.6593826 L3.85392849,19.3630053 C7.97254448,22.8789982 14.033839,22.8789982 18.1465621,19.3630053 L13.4430801,14.6593826 C11.9627453,15.6481329 10.032098,15.6481329 8.55790161,14.6593826 Z M10.973973,19.7551171 L8.6747766,17.0346421 L13.4430801,17.0346421 L10.973973,19.7551171 L10.973973,19.7551171 Z M13.4371872,7.34651012 L18.1468077,2.63699471 C14.033839,-0.878998237 7.96689715,-0.878998237 3.85417403,2.63699471 L8.55765607,7.34651012 C10.032098,6.3636526 11.9627453,6.3636526 13.4371872,7.34651012 Z M11.0090846,2.05778889 L13.483839,4.77826388 L8.84444178,4.77826388 L11.0090846,2.05778889 L11.0090846,2.05778889 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/assets/images/uav.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组</title>
<g id="默认页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-鹰巢应用-定时飞行备份" transform="translate(-1879.000000, -231.000000)" fill="#4E4E4E" fill-rule="nonzero">
<g id="编组-13备份-9" transform="translate(1872.000000, 224.000000)">
<g id="编组" transform="translate(7.000000, 7.000000)">
<path d="M12.9708196,14.0250394 L16.4770601,17.5294181 C16.3560604,17.9446635 16.4110603,18.4002419 16.638393,18.7779045 L15.7666454,19.6505617 C15.6215933,19.7970308 15.6215933,20.0330036 15.7666454,20.1794726 C15.9130067,20.3239194 16.1482825,20.3239194 16.2946439,20.1794726 L17.1673082,19.3058988 C17.7668066,19.6670615 18.5633878,19.5900624 19.0794697,19.0767346 C19.5853061,18.5671832 19.6808159,17.7793282 19.3113858,17.163672 L20.1831334,16.2900981 C20.3275813,16.143738 20.3275813,15.908464 20.1831334,15.7621039 C20.036772,15.6176571 19.8014962,15.6176571 19.6551349,15.7621039 L18.7824705,16.6347611 C18.4068687,16.4096473 17.9544621,16.351187 17.5339739,16.4734295 L14.0249834,12.9708841 C14.8043662,11.7722566 14.8043662,10.2269712 14.0249834,9.02834358 L17.5303072,5.52304826 C17.9464728,5.64404696 18.4011382,5.58904755 18.7788039,5.36171668 L19.6523848,6.23345722 C19.8010982,6.35996916 20.0220127,6.35116989 20.1601925,6.21323066 C20.2983724,6.07529144 20.3075549,5.85439439 20.1813001,5.70546296 L19.3077191,4.83280576 C19.6765599,4.21810828 19.5822599,3.4316528 19.0785531,2.92157648 C18.569148,2.41543355 17.7810642,2.31989757 17.1654749,2.68966234 L16.2918939,1.81700514 C16.1454236,1.67195424 15.909449,1.67195424 15.7629787,1.81700514 C15.6179266,1.96347422 15.6179266,2.19944697 15.7629787,2.34591606 L16.6365597,3.21765659 C16.4110603,3.59348586 16.3523938,4.04539761 16.4743101,4.46614306 L12.9717362,7.97510501 C11.7728144,7.19556678 10.2271687,7.19556678 9.02824689,7.97510501 L5.52292302,4.46614306 C5.64485715,4.04623862 5.58639924,3.59452206 5.36159014,3.21948991 L6.23333777,2.34591606 C6.37838984,2.19944697 6.37838984,1.96347422 6.23333777,1.81700514 C6.0869764,1.6725584 5.85170058,1.6725584 5.70533921,1.81700514 L4.83267491,2.68966234 C4.21729704,2.32038024 3.4297706,2.41589441 2.92051341,2.92157648 C2.41513792,3.43015872 2.31925948,4.21680851 2.6876807,4.83188909 L1.81593304,5.70362965 C1.68677411,5.85224119 1.69458058,6.07544223 1.83380662,6.21466714 C1.97303266,6.35389204 2.19623552,6.36169845 2.34484827,6.23254057 L3.21567928,5.36080001 C3.59517824,5.58904755 4.05259367,5.64313029 4.46509256,5.52213161 L7.97041643,9.02742693 C7.18882012,10.2260624 7.18882012,11.7731654 7.97041643,12.9718008 L4.46417588,16.4761795 C4.04385177,16.3543657 3.59178093,16.4131577 3.21659593,16.6384277 L2.34301497,15.7666872 C2.1966536,15.6222404 1.96137776,15.6222404 1.81501639,15.7666872 C1.67056848,15.9130474 1.67056848,16.1483212 1.81501639,16.2946814 L2.68676402,17.166422 C2.31733387,17.7820782 2.41284366,18.5699331 2.91868007,19.0794846 C3.42846019,19.5845779 4.21614413,19.6789784 4.83084157,19.3086488 L5.7025892,20.1822226 C5.8513026,20.3087346 6.0722171,20.2999354 6.21039697,20.1619961 C6.34857684,20.0240569 6.35775935,19.8031597 6.23150446,19.6542283 L5.35609014,18.7788212 C5.58525618,18.4011586 5.64025604,17.9437469 5.51925638,17.5312514 L9.02458022,14.0268727 C10.2246562,14.8060916 11.7712773,14.8046543 12.9699029,14.0232061 L12.9699029,14.0241227 L12.9708196,14.0250394 Z" id="路径"></path>
<path d="M13.5877346,4.95288779 C13.6842095,4.94861411 13.7750051,4.90607511 13.8400333,4.83468232 C13.9050614,4.76328953 13.9389616,4.6689282 13.9342336,4.57247524 C13.8857654,3.5384677 14.2750961,2.53187293 15.0067307,1.79958864 C16.4418027,0.369988534 18.7627281,0.369988534 20.1978,1.79958864 C20.8884459,2.48656947 21.2753364,3.4214371 21.2721305,4.39556049 C21.2721305,5.3763832 20.8917148,6.29853986 20.1978,6.99061567 C19.4887928,7.70576271 18.5149076,8.09478253 17.5083073,8.06493737 C17.4117321,8.06173029 17.3178991,8.09735607 17.2477876,8.16384946 C17.1776761,8.23034284 17.1371337,8.32215802 17.135225,8.41876685 C17.1322668,8.51536074 17.1679481,8.60914686 17.234364,8.67934752 C17.3007799,8.74954818 17.3924471,8.79036771 17.4890574,8.7927628 L17.6045571,8.79553964 C18.7710505,8.79960715 19.8904486,8.3356716 20.7120487,7.50761007 C21.5396148,6.68492889 22.0034186,5.56520671 21.999981,4.39831045 C22.0034186,3.2314142 21.5396148,2.11169203 20.7120487,1.28901086 C18.99283,-0.426003636 16.2098675,-0.426003636 14.4906488,1.28901086 C13.6150566,2.16641852 13.1492438,3.37186563 13.2073189,4.61005816 C13.2120496,4.7062241 13.2549832,4.79652031 13.326584,4.86089168 C13.3981848,4.92526306 13.492525,4.95838024 13.5886512,4.95288779 L13.5877346,4.95288779 L13.5877346,4.95288779 Z M8.41958188,17.1361723 C8.32329614,17.1388097 8.23200635,17.1796072 8.16581399,17.2495814 C8.09962162,17.3195556 8.06395445,17.4129687 8.06666617,17.5092516 C8.0955162,18.5156672 7.70664558,19.4891631 6.99233572,20.1987224 C5.55715764,21.6289314 3.23552784,21.6289314 1.80034976,20.1987224 C0.369731221,18.7640782 0.369731221,16.4423396 1.80034976,15.0076954 C2.53339898,14.2772336 3.5394667,13.8881131 4.57325892,13.935207 C4.70294598,13.9412656 4.82601401,13.8776773 4.89610445,13.7683952 C4.9661949,13.6591131 4.97265937,13.5207398 4.91306274,13.4053991 C4.85346612,13.2900585 4.73686256,13.2152735 4.6071755,13.2092149 C3.36946071,13.15139 2.16449742,13.6168041 1.28701781,14.4916176 C-0.428409647,16.2102995 -0.428409647,18.9933684 1.28701781,20.7120502 C2.11109891,21.5370413 3.23034591,21.9999529 4.39634275,21.9981327 C5.56303947,22.0009793 6.68261803,21.5380392 7.50658434,20.7120502 C8.36247868,19.8620094 8.82863477,18.6957992 8.79449753,17.4900018 C8.78850896,17.28884 8.62075509,17.130521 8.41958188,17.1361723 L8.41958188,17.1361723 Z M17.3937243,13.2082982 C17.2970704,13.2123165 17.2060685,13.2549409 17.1411075,13.3266215 C17.0761464,13.398302 17.0426568,13.4930465 17.0481419,13.5896274 C17.0521786,13.6862638 17.094615,13.7772931 17.1660349,13.842517 C17.2374548,13.9077409 17.3319516,13.9417652 17.4285575,13.9370403 C18.4622804,13.8882059 19.4687986,14.2768352 20.2014667,15.0076954 C21.6320852,16.4423396 21.6320852,18.7640782 20.2014667,20.1987224 C19.5144367,20.8886268 18.5800315,21.2751262 17.6063904,21.2721275 C16.6325642,21.2756138 15.6978023,20.8894335 15.0103974,20.1996391 C14.294578,19.490636 13.9051783,18.5163147 13.9351503,17.5092516 C13.9383574,17.4128327 13.9028559,17.3191383 13.8365597,17.2490543 C13.7702635,17.1789703 13.6786836,17.1383227 13.5822346,17.1361723 C13.4857962,17.1334626 13.3922461,17.1692545 13.3222449,17.2356433 C13.2522437,17.3020321 13.2115505,17.3935559 13.2091523,17.4900018 C13.2091523,17.529418 13.205456,17.5660843 13.205456,17.6055005 C13.2011854,18.7720251 13.6651564,19.8914904 14.4933988,20.7129668 C15.3165197,21.5403296 16.4365698,22.0037949 17.6036404,21.9999766 C18.7698909,22.0028171 19.8888334,21.5390704 20.711132,20.7120502 C22.4265594,18.9933684 22.4265594,16.2102995 20.711132,14.4916176 C19.8354452,13.6162649 18.6314627,13.1503827 17.394641,13.2082982 L17.3937243,13.2082982 L17.3937243,13.2082982 Z M4.51000911,8.7927628 C4.64002366,8.78916041 4.75824019,8.71647029 4.82012767,8.60207411 C4.88201516,8.48767793 4.87817142,8.34895518 4.81004436,8.23816139 C4.7419173,8.1273676 4.61985703,8.06133498 4.48984248,8.06493737 C3.48343821,8.09367689 2.5099767,7.7048263 1.80034976,6.99061567 C0.369731221,5.55597147 0.369731221,3.23423284 1.80034976,1.79958864 C3.23552784,0.369379654 5.55715764,0.369379654 6.99233572,1.79958864 C7.72290038,2.53256888 8.11204127,3.53867282 8.06483284,4.57247524 C8.05877422,4.70216125 8.12236305,4.82522826 8.23164603,4.89531814 C8.34092901,4.96540801 8.47930346,4.97187242 8.59464505,4.91227629 C8.70998664,4.85268016 8.78477225,4.73607755 8.79083086,4.60639155 C8.84864463,3.3685125 8.38285182,2.16344975 7.507501,1.28626087 C5.78828233,-0.428753624 3.0053198,-0.428753624 1.28610113,1.28626087 C0.460675553,2.11022667 -0.00218766871,3.22927105 1.05979216e-05,4.39556049 C-0.00255484981,5.56210257 0.46073919,6.68139073 1.28701781,7.50486011 C2.135573,8.36300048 3.30281357,8.82956084 4.50909243,8.7927628 L4.51000911,8.7927628 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/alarmLamp/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="police" v-interact> <div class="police" v-interact>
<div class="police_head"> <div class="police_head">
<div class="police_name"> <div class="police_name">
<div class="police_icon"></div> <img src="../../assets/images/mount_head.png" />
<div class="police_font">警灯</div> <div class="police_font">警灯</div>
</div> </div>
<div class="police_font" @click="$emit('close')">关闭</div> <div class="police_font" @click="$emit('close')">关闭</div>
...@@ -161,39 +161,41 @@ export default { ...@@ -161,39 +161,41 @@ export default {
.police { .police {
width: 475px; width: 475px;
height: 200px; height: 200px;
background: rgba(0, 39, 121, 0.5);
border: 1px solid #43deff;
backdrop-filter: blur(2px);
pointer-events: auto; pointer-events: auto;
position: absolute; position: absolute;
left: -490px; left: -490px;
bottom: -89px; bottom: -89px;
border-radius: 12px 12px 0px 0px;
background: #222222;
.police_head { .police_head {
background: linear-gradient( flex-shrink: 0;
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
width: 100%;
height: 30px;
border-bottom: 1px solid #70daf9;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 0 10px 0 10px;
align-items: center; align-items: center;
box-sizing: border-box; height: 32px;
background: #3c3c3c;
border-radius: 12px 12px 0px 0px;
padding: 0 10px;
.police_name { .police_name {
display: flex; display: flex;
.police_icon { font-size: 20px;
width: 5px; font-family: YouSheBiaoTiHei;
height: 15px; color: #14faff;
background: #ffbd36; line-height: 26px;
margin: 0 10px 0 0; text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
} background: linear-gradient(
135deg,
#e3aa77 0%,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
} }
...@@ -216,7 +218,7 @@ export default { ...@@ -216,7 +218,7 @@ export default {
.police_font { .police_font {
font-weight: 700; font-weight: 700;
color: #2ddcfc; color: #fff;
cursor: pointer; cursor: pointer;
} }
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/controlList/index.vue
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
<SymbolIcon icon="yunhangrizhi2" /> <SymbolIcon icon="yunhangrizhi2" />
<span class="txt">运行日志</span> <span class="txt">运行日志</span>
</div> </div>
<div class="item" @click="guideFlight" v-if="uav.network === 1"> <div class="item" @click="guideFlight" v-if="uav && uav.network === 1">
<SymbolIcon icon="tiaozhuandaozuobiao" /> <SymbolIcon icon="tiaozhuandaozuobiao" />
<span class="txt">指点飞行</span> <span class="txt">指点飞行</span>
</div> </div>
<div class="item" @click="onInfieldControl" v-if="uav.network === 1"> <div class="item" @click="onInfieldControl" v-if="uav && uav.network === 1">
<img class="dib mt3" src="./assets/images/1.svg" alt /> <img class="dib mt3" src="./assets/images/1.svg" alt />
<span class="txt">内场控制</span> <span class="txt">内场控制</span>
</div> </div>
...@@ -129,8 +129,8 @@ export default { ...@@ -129,8 +129,8 @@ export default {
}, },
isHangar: { isHangar: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
data() { data() {
return { return {
...@@ -167,9 +167,12 @@ export default { ...@@ -167,9 +167,12 @@ export default {
if (!this.YGPermissionsSend) { if (!this.YGPermissionsSend) {
this.YGPermissionsSend = true; this.YGPermissionsSend = true;
// 发送抢权限指令 // 发送抢权限指令
this.$store.dispatch("MMCFlightControlCenter/uav/changeYGPermissions", { this.$store.dispatch(
"MMCFlightControlCenter/uav/changeYGPermissions",
{
callback: () => {}, callback: () => {},
}); }
);
setTimeout(() => { setTimeout(() => {
if (this.uavRealTimeData.rcState == 1) { if (this.uavRealTimeData.rcState == 1) {
this.$message.success("已切换内场权限，请使用摇杆控制！"); this.$message.success("已切换内场权限，请使用摇杆控制！");
...@@ -200,7 +203,7 @@ export default { ...@@ -200,7 +203,7 @@ export default {
"routeControl", "routeControl",
"isTakeOver", "isTakeOver",
]), ]),
async isTake(){ async isTake() {
// 判断是否已接管 // 判断是否已接管
if (!this.isHangar && !(await this.isTakeOver())) { if (!this.isHangar && !(await this.isTakeOver())) {
this.$message.warning("请先接管无人机"); this.$message.warning("请先接管无人机");
...@@ -221,7 +224,7 @@ export default { ...@@ -221,7 +224,7 @@ export default {
*/ */
async onPauseFly() { async onPauseFly() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
this.pauseFly({ this.pauseFly({
...@@ -235,7 +238,7 @@ export default { ...@@ -235,7 +238,7 @@ export default {
*/ */
async onContinueFly() { async onContinueFly() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
this.continueFly({ this.continueFly({
...@@ -249,7 +252,7 @@ export default { ...@@ -249,7 +252,7 @@ export default {
*/ */
async onLand() { async onLand() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
this.safetyNotice = false; this.safetyNotice = false;
...@@ -260,7 +263,7 @@ export default { ...@@ -260,7 +263,7 @@ export default {
*/ */
async onInfieldControl() { async onInfieldControl() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
if (this.online === 0) if (this.online === 0)
...@@ -302,7 +305,7 @@ export default { ...@@ -302,7 +305,7 @@ export default {
*/ */
async guideFlight() { async guideFlight() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
if (this.uav.online === 0) if (this.uav.online === 0)
...@@ -346,7 +349,7 @@ export default { ...@@ -346,7 +349,7 @@ export default {
*/ */
async onGuideFlightConfirm() { async onGuideFlightConfirm() {
// 判断是否已接管 // 判断是否已接管
if (!await this.isTake()) { if (!(await this.isTake())) {
return; return;
} }
console.log( console.log(
...@@ -399,10 +402,9 @@ export default { ...@@ -399,10 +402,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.nset_control_box { .nset_control_box {
min-height: 111px; min-height: 111px;
background: rgba(12, 34, 73, 0.7); background: #222222;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
border-radius: 10px; border-radius: 10px;
border: 1px solid rgba(26, 92, 246, 0.5);
backdrop-filter: blur(1px);
position: absolute; position: absolute;
right: 65px; right: 65px;
top: 126px; top: 126px;
...@@ -410,16 +412,9 @@ export default { ...@@ -410,16 +412,9 @@ export default {
.nset_control_box_header { .nset_control_box_header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 32px; height: 36px;
background: linear-gradient( background: #3c3c3c;
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.title { .title {
display: flex; display: flex;
...@@ -456,7 +451,7 @@ export default { ...@@ -456,7 +451,7 @@ export default {
} }
.nset_control_box_area { .nset_control_box_area {
padding: 10px; padding: 16px;
.yc { .yc {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -476,21 +471,13 @@ export default { ...@@ -476,21 +471,13 @@ export default {
.wrj { .wrj {
display: flex; display: flex;
gap: 10px; gap: 4px;
.item { .item {
flex-shrink: 0; flex-shrink: 0;
width: 58px; width: 58px;
height: 58px; height: 58px;
background-image: linear-gradient( background: #3c3c3c;
179deg,
#1773b6 0%,
#3484c3 36%,
#2a7abd 56%,
#084681 100%
);
box-shadow: 0 0 5px 0 #0c1c47;
border-radius: 4.5px;
color: #fff; color: #fff;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/health/index.vue
<template> <template>
<div class="nset_control_box"> <div class="nset_control_box">
<div v-if="!infoShow"> <div v-if="!infoShow">
<div class="nset_control_box_header lh34"> <div class="nset_control_box_header">
<div class="title ml10"> <div class="title ml10">
<img src="../../assets/images/mount_head.png" /> <img src="../../assets/images/mount_head.png" />
<div class="font">{{ uav.name || "" }}</div> <div class="font">{{ uav && uav.name || "" }}</div>
</div> </div>
<div class="exit" @click="$emit('exit')">关闭</div> <div class="exit" @click="$emit('exit')">关闭</div>
</div> </div>
...@@ -535,31 +535,24 @@ export default { ...@@ -535,31 +535,24 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.nset_control_box { .nset_control_box {
min-height: 111px; min-height: 111px;
background: rgba(12, 34, 73, 0.7); background: #222222;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
border-radius: 10px; border-radius: 10px;
border: 1px solid rgba(26, 92, 246, 0.5);
-webkit-backdrop-filter: blur(1px);
backdrop-filter: blur(1px);
position: absolute; position: absolute;
right: 70px; right: 70px;
top: -54px; top: -54px;
/* top: calc(50% - 14px); */ /* top: calc(50% - 14px); */
bottom: auto !important; bottom: auto !important;
min-width: 470px; width: 470px;
.nset_control_box_header { .nset_control_box_header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 32px; height: 36px;
background: linear-gradient( background: #3c3c3c;
180deg, box-shadow: inset 0px -1px 0px 0px #3c3c3c;
#9198ff 0%, align-items: center;
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.title { .title {
display: flex; display: flex;
...@@ -588,9 +581,8 @@ export default { ...@@ -588,9 +581,8 @@ export default {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #d2dfff; color: #d2dfff;
margin-right: 8px;
margin-top: 7px;
cursor: pointer; cursor: pointer;
margin-right: 16px;
} }
} }
...@@ -606,7 +598,7 @@ export default { ...@@ -606,7 +598,7 @@ export default {
.item { .item {
position: relative; position: relative;
background: url("./assets/images/bg.png") no-repeat; background: #3E3E3E;
background-size: 100% 100%; background-size: 100% 100%;
box-shadow: 0 0 5px 0 #0c1c47; box-shadow: 0 0 5px 0 #0c1c47;
border-radius: 4.5px; border-radius: 4.5px;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/mount/index.vue
...@@ -77,13 +77,10 @@ export default { ...@@ -77,13 +77,10 @@ export default {
* 挂载指令事件 * 挂载指令事件
*/ */
mountDirective(buffer) { mountDirective(buffer) {
this.$store.dispatch( this.$store.dispatch("MMCFlightControlCenter/uav/mountDirective", {
"MMCFlightControlCenter/uav/mountDirective",
{
buffer, buffer,
mountId: this.selectMount.mountId, mountId: this.selectMount.mountId,
} });
);
}, },
/** /**
* 挂载拍照 * 挂载拍照
...@@ -105,8 +102,9 @@ export default { ...@@ -105,8 +102,9 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.mountBox { .mountBox {
background: rgba(9, 32, 87, 0.7); background: #222222;
border: 1px solid #70daf9; box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
border-radius: 10px;
position: absolute; position: absolute;
// top: -152px; // top: -152px;
top: 63px; top: 63px;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/components/viewLib/index.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="content"> <div class="content">
<!-- 先注释，下次更新要用 --> <!-- 先注释，下次更新要用 -->
<div class="head"> <div class="head">
<div class="aitype mr60" v-if="viewLibTab == 1 && !moreShow"> <div class="aitype" v-if="viewLibTab == 1 && !moreShow">
<el-select popper-class="mmc" v-model="aiType" placeholder="全部" @change="onChangeAiType"> <el-select popper-class="mmc" v-model="aiType" placeholder="全部" @change="onChangeAiType">
<el-option <el-option
v-for="item in aiTypeList" v-for="item in aiTypeList"
...@@ -18,13 +18,19 @@ ...@@ -18,13 +18,19 @@
</el-select> </el-select>
</div> </div>
<div class="select" v-if="viewLibTab == 2"> <div class="select" v-if="viewLibTab == 2">
<div class="btns" :class="fileType == 0 ? 'bg' : ''" @click="onChangeFileType(0)">图片</div> <!-- <div class="btns" :class="fileType == 0 ? 'bg' : ''" @click="onChangeFileType(0)">图片</div>
<div class="btns" :class="fileType == 1 ? 'bg' : ''" @click="onChangeFileType(1)">视频</div> <div class="btns" :class="fileType == 1 ? 'bg' : ''" @click="onChangeFileType(1)">视频</div> -->
<el-radio-group v-model="fileType">
<el-radio-button label="图片" @click="onChangeFileType(0)"></el-radio-button>
<el-radio-button label="视频" @click="onChangeFileType(1)"></el-radio-button>
</el-radio-group>
<span class="iconfont icon-gengxin" @click="init"></span> <span class="iconfont icon-gengxin" @click="init"></span>
</div> </div>
<div class="select" v-if="viewLibTab == 1 && !moreShow"> <div class="select" v-if="viewLibTab == 1 && !moreShow">
<div class="btns" :class="fileType2 == 1 ? 'bg' : ''" @click="onChangeFileType2(1)">图片</div> <el-radio-group v-model="fileType2">
<div class="btns" :class="fileType2 == 2 ? 'bg' : ''" @click="onChangeFileType2(2)">视频</div> <el-radio-button label="图片" @click="onChangeFileType2(0)"></el-radio-button>
<el-radio-button label="视频" @click="onChangeFileType2(1)"></el-radio-button>
</el-radio-group>
<span class="iconfont icon-gengxin" @click="init"></span> <span class="iconfont icon-gengxin" @click="init"></span>
</div> </div>
<div class="select" v-if="viewLibTab == 1 && moreShow"> <div class="select" v-if="viewLibTab == 1 && moreShow">
...@@ -257,80 +263,37 @@ export default { ...@@ -257,80 +263,37 @@ export default {
top: 190px; top: 190px;
width: 470px; width: 470px;
height: 450px; height: 450px;
background: rgba(12, 34, 73, 0.7); background: #222222;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
border-radius: 10px; border-radius: 10px;
border: 1px solid rgba(26, 92, 246, 0.5);
backdrop-filter: blur(1px);
.stk_head { .stk_head {
display: flex; display: flex;
cursor: pointer; cursor: pointer;
background: #3c3c3c;
border-radius: 10px 10px 0px 0px;
div { div {
padding: 0 8px; padding: 0 8px;
// width: 243px; // width: 243px;
width: 100%; width: 100%;
text-align: center; text-align: center;
line-height: 32px; line-height: 36px;
font-size: 16px; font-size: 16px;
font-family: YouSheBiaoTiHei; font-family: YouSheBiaoTiHei;
color: #ffffff; color: #ffffff;
line-height: 21px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2); text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
height: 36px;
} }
.ac { .ac {
background: linear-gradient( background: #3388ff;
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 0px 0px 0px; border-radius: 10px 0px 0px 0px;
border: 1px solid #427dff;
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#e3aa77 0%,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
.bc { .bc {
background: linear-gradient( background: #3388ff;
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 0px 10px 0px 0px; border-radius: 0px 10px 0px 0px;
border: 1px solid #427dff;
font-size: 20px;
font-family: YouSheBiaoTiHei;
color: #14faff;
line-height: 26px;
text-shadow: 0px 1px 1px rgba(2, 32, 56, 0.2);
background: linear-gradient(
135deg,
#e3aa77 0%,
#f5cda9 38%,
#f9ecd3 58%,
#fcdbb1 79%,
#edb07a 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
} }
} }
...@@ -409,6 +372,7 @@ export default { ...@@ -409,6 +372,7 @@ export default {
.select { .select {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px;
.iconfont { .iconfont {
color: #fff; color: #fff;
...@@ -472,7 +436,6 @@ export default { ...@@ -472,7 +436,6 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
height: 100%; height: 100%;
} }
.boxst { .boxst {
width: 100%; width: 100%;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/controlPanel/components/controlRight/index.vue
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
:class="showHealth ? 'active' : ''" :class="showHealth ? 'active' : ''"
@click="onSwitchShow('showHealth')" @click="onSwitchShow('showHealth')"
> >
<img src="../../assets/images/hea.png" /> <img src="./assets/images/health.svg" />
<span class="dib f8">健康管理</span> <span class="">健康管理</span>
</div> </div>
<!-- 机库信息 --> <!-- 机库信息 -->
<slot name="hangar"></slot> <slot name="hangar"></slot>
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
:class="showMount ? 'active' : ''" :class="showMount ? 'active' : ''"
@click="onSwitchShow('showMount')" @click="onSwitchShow('showMount')"
> >
<SymbolIcon icon="guazai1" /> <img src="./assets/images/mount.svg" />
<span class="dib f8">挂载</span> <span class="">挂载</span>
</div> </div>
<div <div
class="control-item" class="control-item"
:class="showControlList ? 'active' : ''" :class="showControlList ? 'active' : ''"
@click="onSwitchShow('showControlList')" @click="onSwitchShow('showControlList')"
> >
<SymbolIcon icon="wurenji2" /> <img src="./assets/images/uav.svg" />
<span class="dib f8">无人机</span> <span class="">无人机</span>
</div> </div>
<div <div
v-if="!isHangar && uav.network === 1" v-if="!isHangar && uav.network === 1"
...@@ -34,55 +34,16 @@ ...@@ -34,55 +34,16 @@
:class="showAlarmLamp ? 'active' : ''" :class="showAlarmLamp ? 'active' : ''"
@click="onSwitchShow('showAlarmLamp')" @click="onSwitchShow('showAlarmLamp')"
> >
<div> <img src="./assets/images/lamp.svg" />
<svg <span class="">警灯</span>
width="22px"
height="23px"
viewBox="0 0 22 23"
version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
>
<title>警示灯</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1-视频1" transform="translate(-1875.000000, -375.000000)" fill-rule="nonzero">
<g id="警示灯" transform="translate(1875.000000, 375.500000)">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="22" height="22" />
<path
d="M5,12.5 C5,9.18650001 7.6865,6.50000001 11,6.50000001 C14.3135,6.50000001 17,9.18650001 17,12.5 L17,20 L5,20 L5,12.5 Z"
id="路径"
fill="#FFFFFF"
/>
<polygon
id="路径"
fill="#FFD500"
transform="translate(11.000000, 14.000000) rotate(-345.000000) translate(-11.000000, -14.000000) "
points="11 9 8 14.0049142 10.9820496 15.2536857 9.50006698 19 14 14.0049142 10.9820496 12.7561428"
/>
<path
d="M3.99999999,12.5 C3.99999999,8.63400002 7.13399998,5.5 11,5.5 C14.866,5.5 18,8.63399999 18,12.5 L18,20 C18,20.5522848 17.5522847,21 17,21 L4.99999999,21 C4.44771526,21 3.99999999,20.5522848 3.99999999,20 L3.99999999,12.5 Z M11,7.49999999 C8.2385,7.49999999 6.00000001,9.73849998 6.00000001,12.5 L6.00000001,19 L16,19 L16,12.5 C16,9.73850001 13.7615,7.49999999 11,7.49999999 Z"
id="形状"
fill="#FFFFFF"
/>
<path
d="M2.50000001,19 L19.5,19 C20.0522848,19 20.5,19.4477153 20.5,20 C20.5,20.5522847 20.0522848,21 19.5,21 L2.50000001,21 C1.94771526,21 1.50000001,20.5522847 1.50000001,20 C1.50000001,19.4477153 1.94771526,19 2.50000001,19 Z M12,2 L12,4 L12,4 L9.99999999,4 L9.99999999,2 C9.99999999,1.44771525 10.4477152,1 11,1 C11.5522847,1 12,1.44771525 12,2 Z M18.7070833,5.70708332 L17.293,7.1215 L17.293,7.1215 L15.8785,5.707 L17.2929167,4.29291667 C17.6834415,3.9024839 18.3165212,3.90252121 18.707,4.293 C19.0974788,4.6834788 19.0975161,5.31655851 18.7070833,5.70708332 Z M4.70708331,4.29291667 L6.12150001,5.707 L6.12150001,5.707 L4.70700001,7.1215 L3.29291668,5.70708332 C2.90248391,5.31655851 2.90252121,4.6834788 3.293,4.293 C3.68347879,3.90252121 4.3165585,3.9024839 4.70708331,4.29291667 Z"
id="形状"
fill="#FFFFFF"
/>
</g>
</g>
</g>
</svg>
</div>
<span class="dib f8">警灯</span>
</div> </div>
<div <div
class="control-item" class="control-item"
:class="showViewLib ? 'active' : ''" :class="showViewLib ? 'active' : ''"
@click="onSwitchShow('showViewLib')" @click="onSwitchShow('showViewLib')"
> >
<img src="../../assets/images/stk.png" alt /> <img src="./assets/images/files.svg" />
<span class="dib f8">视图库</span> <span class="">视图库</span>
</div> </div>
<ViewLib v-if="showViewLib"></ViewLib> <ViewLib v-if="showViewLib"></ViewLib>
</div> </div>
...@@ -138,8 +99,8 @@ export default { ...@@ -138,8 +99,8 @@ export default {
// 是否机库页面使用 // 是否机库页面使用
isHangar: { isHangar: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
data() { data() {
return { return {
...@@ -192,25 +153,25 @@ export default { ...@@ -192,25 +153,25 @@ export default {
.control-list::v-deep { .control-list::v-deep {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 3px; gap: 2px;
.control-item { .control-item {
box-sizing: border-box; width: 48px;
width: 60px; height: 48px;
height: 60px; background: #ffffff;
background: rgba(9, 32, 87, 0.7); border-radius: 2px;
border: 1px solid transparent; color: #000;
color: #fff; font-size: 10px;
font-size: 12px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
gap: 3px; gap: 3px;
cursor: pointer; cursor: pointer;
box-sizing: border-box;
> img { > img {
width: 28px; width: 24px;
} }
&:hover { &:hover {
...@@ -218,7 +179,7 @@ export default { ...@@ -218,7 +179,7 @@ export default {
} }
&.active { &.active {
border: 1px solid #70daf9; border: 1px solid #3C3C3C;
} }
} }
} }
......
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/assets/images/collapse.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="36px" height="104px" viewBox="0 0 36 104" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 16</title>
<defs>
<linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
<stop stop-color="#505050" offset="0%"></stop>
<stop stop-color="#707070" offset="100%"></stop>
</linearGradient>
<path d="M0,0 L29.1799936,18.237496 C30.9342818,19.3339261 32,21.2567457 32,23.3254858 L32,76.6745142 C32,78.7432543 30.9342818,80.6660739 29.1799936,81.762504 L0,100 L0,100 L0,0 Z" id="path-2"></path>
<filter x="-7.8%" y="-3.5%" width="121.9%" height="107.0%" filterUnits="objectBoundingBox" id="filter-3">
<feOffset dx="1" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.324191434 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="套用鹰视改" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="驾驶中心-无人机应用" transform="translate(-594.000000, -425.000000)">
<g id="编组-16" transform="translate(595.000000, 427.000000)">
<g id="矩形">
<use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
<use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"></use>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/components/list/components/item/index.vue
...@@ -82,16 +82,19 @@ ...@@ -82,16 +82,19 @@
:class="{ active: uav && device.deviceId === uav.deviceId && uav.showPlayer }" :class="{ active: uav && device.deviceId === uav.deviceId && uav.showPlayer }"
title="视频" title="视频"
@click="onShowPlayer(device)" @click="onShowPlayer(device)"
v-hover
></div> ></div>
<div <div
class="iconfont icon-kongzhi_xianxing" class="iconfont icon-kongzhi_xianxing"
:class="{ active: uav && device.deviceId === uav.deviceId && uav.showPanel }" :class="{ active: uav && device.deviceId === uav.deviceId && uav.showPanel }"
title="控制面板" title="控制面板"
@click="onShowPanel(device)" @click="onShowPanel(device)"
v-hover
></div> ></div>
<div <div
class="jieg" title="接管无人机" class="jieg" title="接管无人机"
@click="onTakeOver(device)" @click="onTakeOver(device)"
v-hover
> >
<img src="./assets/images/jieguan_active.svg" v-if="device.currentOperator" /> <img src="./assets/images/jieguan_active.svg" v-if="device.currentOperator" />
<img src="./assets/images/jieguan.svg" v-else /> <img src="./assets/images/jieguan.svg" v-else />
...@@ -413,7 +416,7 @@ export default { ...@@ -413,7 +416,7 @@ export default {
display: block; display: block;
height: 100%; height: 100%;
width: 1px; width: 1px;
background-color: #129c9c; background-color: rgba(255, 255, 255, 0.2);
position: absolute; position: absolute;
left: 7px; left: 7px;
top: 0; top: 0;
......
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/components/list/index.vue
...@@ -60,9 +60,6 @@ export default { ...@@ -60,9 +60,6 @@ export default {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
.nestlist {
background: rgba(4, 18, 50, 0.5);
}
.mountItem { .mountItem {
background: rgba(25, 42, 61, 0.5); background: rgba(25, 42, 61, 0.5);
box-shadow: inset 0 0 38px 0 rgba(0, 219, 255, 0.71); box-shadow: inset 0 0 38px 0 rgba(0, 219, 255, 0.71);
......
src/components/MMCFlightControlCenter/components/uavApplications/components/uavList/index.vue
<template> <template>
<div class="uav-list" :class="{ collapse: listCollapse }"> <div class="uav-list" :class="{ collapse: listCollapse }">
<img <div class="uav-list_btn" @click="collapseFlagfn">
@click="collapseFlagfn" <img style src="./assets/images/collapse.svg" />
v-if="listCollapse" </div>
style="transform: rotate(180deg)"
src="./assets/images/hs.png"
class="uav-list_btn"
/>
<img
@click="collapseFlagfn"
v-else
src="./assets/images/collapse.png"
class="uav-list_btn"
/>
<div class="uav-list-header"> <div class="uav-list-header">
<img class="uav-list-header__icon" src="./assets/images/uav_list_header.png" /> <img class="uav-list-header__icon" src="./assets/images/uav_list_header.png" />
<span class="uav-list-header__text">无人机列表</span> <span class="uav-list-header__text">无人机列表</span>
...@@ -31,7 +21,7 @@ ...@@ -31,7 +21,7 @@
style="color: rgba(123, 181, 213, 1)" style="color: rgba(123, 181, 213, 1)"
></i> ></i>
</el-input> </el-input>
<el-button class="uav-search__btn" @click="onUavSearch">搜索</el-button> <el-button class="uav-search__btn" @click="onUavSearch" v-hover>搜索</el-button>
</div> </div>
<List <List
class="uav-list-main" class="uav-list-main"
...@@ -67,16 +57,16 @@ export default { ...@@ -67,16 +57,16 @@ export default {
computed: { computed: {
// 收起列表按钮 // 收起列表按钮
listCollapse: { listCollapse: {
get(){ get() {
return this.$store.state.MMCFlightControlCenter.listCollapse; return this.$store.state.MMCFlightControlCenter.listCollapse;
}, },
set(val){ set(val) {
this.$store.commit('MMCFlightControlCenter/setState', { this.$store.commit("MMCFlightControlCenter/setState", {
key: 'listCollapse', key: "listCollapse",
value: val value: val,
}) });
} },
} },
}, },
mounted() { mounted() {
this.initList(); this.initList();
...@@ -84,12 +74,15 @@ export default { ...@@ -84,12 +74,15 @@ export default {
this.initList(); this.initList();
}, 10000); }, 10000);
}, },
beforeDestroy(){ beforeDestroy() {
clearInterval(this.timeHandle); clearInterval(this.timeHandle);
}, },
methods: { methods: {
async initList() { async initList() {
let res = await Control_API.getUavTree({ serchKey: this.uavSearchContent, deviceType: this.deviceType }); let res = await Control_API.getUavTree({
serchKey: this.uavSearchContent,
deviceType: this.deviceType,
});
this.uavList = res.data; this.uavList = res.data;
}, },
collapseFlagfn() { collapseFlagfn() {
...@@ -109,30 +102,48 @@ export default { ...@@ -109,30 +102,48 @@ export default {
.collapse { .collapse {
transform: translateX(-100%); transform: translateX(-100%);
transition: 0.3s; transition: 0.3s;
.uav-list_btn {
&::before {
transform: translate(-63%, -50%) rotate(90deg) !important;
}
}
} }
.uav-list { .uav-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-bottom: 10px;
position: absolute; position: absolute;
width: 460px; width: 420px;
height: 85%; height: 85%;
left: 0; left: 0;
top: 60px; top: 60px;
// height: 86vh; // height: 86vh;
z-index: 99; z-index: 99;
transition: 0.3s; transition: 0.3s;
background: rgba(9, 32, 87, 0.7); background: #222222;
border-radius: 10px 10px 0px 0px; border-radius: 5px 5px 0px 0px;
// border: 1px solid #70daf9; // border: 1px solid #70daf9;
.uav-list_btn { .uav-list_btn {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
right: -22px; right: -35px;
top: 50%; top: 50%;
transform: translate(0, -50%); transform: translate(0, -50%);
z-index: 99; z-index: 99;
&::before {
content: "";
position: absolute;
top: 50%;
left: 50%;
transform: translate(-63%, -50%) rotate(-90deg);
width: 0px;
height: 0px;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 9px solid #fff;
}
} }
} }
...@@ -141,17 +152,10 @@ export default { ...@@ -141,17 +152,10 @@ export default {
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
width: 460px; width: 100%;
height: 33px; height: 33px;
background: linear-gradient( background: #3c3c3c;
180deg, border-radius: 5px 5px 0px 0px;
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px;
border: 1px solid #427dff;
.uav-list-header__text { .uav-list-header__text {
font-size: 20px; font-size: 20px;
...@@ -188,35 +192,40 @@ export default { ...@@ -188,35 +192,40 @@ export default {
.uav-search__input { .uav-search__input {
width: 317px; width: 317px;
height: 32px; height: 32px;
box-shadow: 0px 2px 4px 0px rgba(28, 94, 124, 0.5),
inset 0px 0px 3px 0px #00b6ff;
border-radius: 4px; border-radius: 4px;
.el-input__icon { .el-input__icon {
line-height: 32px; line-height: 32px;
color: #a8abb2 !important;
} }
input { input {
height: 32px; height: 32px;
background: #02173d; background: #191919;
color: #43deff; font-family: PingFangSC, PingFang SC;
border: 1px solid #315ec7; font-weight: 400;
font-size: 12px;
color: #fff;
border: 1px solid #4b4b4b;
&::placeholder { &::placeholder {
font-size: 12px; font-size: 12px;
color: #7bb5d5; color: #a8abb2;
} }
} }
} }
.uav-search__btn { .uav-search__btn {
padding: 7px 25px 6px 26px; display: flex;
// background: rgba(38, 71, 238, 0.71); justify-content: center;
background: url("./assets/images/twobg.png"); align-items: center;
border-radius: 4px; width: 79px;
border: 1px solid; height: 32px;
font-size: 14px; font-size: 14px;
color: #fff; color: #fff;
border-radius: 4px;
border: 0;
background: #3388ff;
} }
} }
......
src/components/MMCFlightControlCenter/index.vue
...@@ -235,9 +235,9 @@ export default { ...@@ -235,9 +235,9 @@ export default {
width: 100%; width: 100%;
.el-input__inner { .el-input__inner {
background-color: #02173d; background-color: #191919;
color: #00aacb; color: #fff;
border: 1px solid #2b56b7; border: 1px solid #4b4b4b !important;
} }
.el-range-input { .el-range-input {
...@@ -260,44 +260,31 @@ export default { ...@@ -260,44 +260,31 @@ export default {
* { * {
/* 滚动条整体样式 */ /* 滚动条整体样式 */
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 10px; /* 滚动条宽度 */ width: 4px; /* 滚动条宽度 */
}
/* 滚动条滑块样式 */
&::-webkit-scrollbar-thumb {
background-color: #02173d; /* 滑块颜色 */
}
/* 滚动条滑块悬停样式 */
&::-webkit-scrollbar-thumb:hover {
background-color: #112d5b; /* 悬停时滑块颜色 */
} }
&::-webkit-scrollbar-track-piece { //滚动条轨道
/* background-color: #182F5C; */ &::-webkit-scrollbar-track {
background: none;
} }
&::-webkit-scrollbar-track { //滚动条滑块
background-color: #182f5c; &::-webkit-scrollbar-thumb {
background: #fff;
} }
} }
.dialog1027 { .dialog1027 {
z-index: 1; z-index: 1;
background: #222222;
.dialog-header { .dialog-header {
box-sizing: border-box; box-sizing: border-box;
padding-left: 35px; padding-left: 8px;
padding-right: 16px; padding-right: 16px;
background-position: 12px 4px; background-position: 12px 4px;
height: 32px; height: 32px;
width: 100%; width: 100%;
background: linear-gradient( background: #3c3c3c;
180deg,
#9198ff 0%,
rgba(45, 81, 153, 0.45) 40%,
#05091a 100%
);
box-shadow: inset 0px 0px 10px 2px #3f9dff;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -337,18 +324,17 @@ export default { ...@@ -337,18 +324,17 @@ export default {
.dialog-header__close { .dialog-header__close {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #d2dfff; color: #ACACAC;
line-height: 19px; line-height: 19px;
cursor: pointer; cursor: pointer;
} }
} }
.dialog-content { .dialog-content {
background: rgba(12, 34, 73, 0.7); background: #222222;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
border-bottom-left-radius: 10px; border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px; border-bottom-right-radius: 10px;
border: 1px solid rgba(26, 92, 246, 0.5);
backdrop-filter: blur(1px);
padding: 12px 12px 16px; padding: 12px 12px 16px;
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
...@@ -457,7 +443,7 @@ export default { ...@@ -457,7 +443,7 @@ export default {
//item选项的hover样式 //item选项的hover样式
.el-select-dropdown__item.hover, .el-select-dropdown__item.hover,
.el-select-dropdown__item:hover { .el-select-dropdown__item:hover {
background: #34466e; background: #4b4b4b;
} }
.option.hover, .option.hover,
...@@ -475,7 +461,7 @@ export default { ...@@ -475,7 +461,7 @@ export default {
font-weight: 400; font-weight: 400;
} }
.el-select-dropdown__item { .el-select-dropdown__item {
color: #00aeff; color: #fff;
.selected { .selected {
background-color: #606266; background-color: #606266;
...@@ -493,9 +479,9 @@ export default { ...@@ -493,9 +479,9 @@ export default {
.el-scrollbar { .el-scrollbar {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #0d224f; background: #191919;
border: 1px solid #178890; border: 1px solid #4B4B4B;
} }
&.is-multiple { &.is-multiple {
...@@ -511,17 +497,25 @@ export default { ...@@ -511,17 +497,25 @@ export default {
} }
&.el-cascader__dropdown { &.el-cascader__dropdown {
border: 1px solid #315ec7; border: 1px solid #4b4b4b;
.el-cascader-menu__list { .el-cascader-menu__list {
background: rgba(9, 32, 87, 1); background-color: #191919;
max-height: 300px; max-height: 300px;
max-width: 327px; max-width: 327px;
} }
.el-cascader-node { .el-cascader-node {
background: rgba(9, 32, 87, 1); background-color: #191919;
color: #00aeff; color: #fff;
&:not(.is-disabled):hover {
background: #4b4b4b;
}
&:not(.is-disabled):focus {
background: #4b4b4b;
}
} }
} }
...@@ -538,8 +532,7 @@ export default { ...@@ -538,8 +532,7 @@ export default {
} }
.el-popper { .el-popper {
background: rgba(9, 32, 87, 1); background: #222222;
border: 1px solid #315ec7;
} }
// 日期选择器组件 // 日期选择器组件
&.el-time-range-picker, &.el-time-range-picker,
......
src/directives/hover.js 0 → 100644
export default {
name: "hover",
directive: {
inserted(el) {
el.style.cursor = "pointer";
el.onmouseover = function () {
el.style.opacity = 0.7;
};
el.onmouseout = function () {
el.style.opacity = 1;
};
},
},
};
src/style/fonts/iconfont.css
...@@ -5,6 +5,16 @@ ...@@ -5,6 +5,16 @@
url('iconfont.ttf?t=1669384033626') format('truetype'); url('iconfont.ttf?t=1669384033626') format('truetype');
} }
@font-face {
font-family: "YouSheBiaoTiHei";
src: url('./YouSheBiaoTiHei.ttf') format('truetype');
}
@font-face {
font-family: "UnidreamLED";
src: url('./UnidreamLED.woff') format('woff');
}
.mmc .iconfont { .mmc .iconfont {
font-family: "mmc-iconfont" !important; font-family: "mmc-iconfont" !important;
font-size: 16px; font-size: 16px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论