From 6069325e1a37cf0462afda1627d4c660735dc57e Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期二, 16 七月 2024 09:51:56 +0800
Subject: [PATCH] 版本更新
---
src/components/Chat/chatList.vue | 123 +++++++++++++-
src/assets/js/map/mapView.js | 5
src/assets/js/msg/msgData.js | 37 +++-
public/config/config.js | 4
src/views/chartView/index.vue | 149 +++++++++++-------
public/Data/Report.md | 71 ++++----
src/views/mapView/mapView.vue | 41 ++--
public/Data/Report.docx | 0
src/assets/js/map/mapJsonLayer.js | 10 +
9 files changed, 307 insertions(+), 133 deletions(-)
diff --git a/public/Data/Report.docx b/public/Data/Report.docx
index 781cbd2..02ecd44 100644
--- a/public/Data/Report.docx
+++ b/public/Data/Report.docx
Binary files differ
diff --git a/public/Data/Report.md b/public/Data/Report.md
index f8a71e4..dddf3e7 100644
--- a/public/Data/Report.md
+++ b/public/Data/Report.md
@@ -1,43 +1,50 @@
-## 鎴樺満鎶ュ憡
+# 鎴樺満鎶ュ憡
-**鎶ュ憡鏃堕棿锛�** 2024骞�7鏈�3鏃�
+## 鎶ュ憡鏃堕棿
+2024骞�7鏈�3鏃�
-### 涓�銆佺洰鏍囧彂鐜�
+## 鏁版嵁鏉ユ簮
+XXX鍙峰崼鏄�
-1. **瀵煎脊闃插尽绯荤粺锛�**
- - 2024骞�7鏈�3鏃�1:30AM锛孹XX鍗槦鍦ㄨ彶寰嬪鑻忔瘮鍏嬫咕鍖哄彂鐜扮枒浼煎牑涓板寮归槻寰＄郴缁熴��
+## 鐩爣鍙戠幇
-2. **娴蜂笂鑸拌墖锛�**
- - 鑻忔瘮鍏嬫咕鍖哄彂鐜颁互涓嬪寮规姢鍗埌锛�
- - 鍦ｅ畨涓滃凹濂ョ骇瀵煎脊鎶ゅ崼鑸�1鑹�
- - 浣曞璋溌烽粠鍒圭骇瀵煎脊鎶ゅ崼鑸�1鑹�
- - 鍏堥攱绾у寮规姢鍗埌1鑹�
+### 瀵煎脊闃插尽绯荤粺
+- 鏃堕棿锛�2024骞�7鏈�2鍙� 3:00AM
+- 鍦扮偣锛氳彶寰嬪鑻忔瘮鍏嬫咕鍖�
+- 鍙戠幇锛氱枒浼煎牑涓板寮归槻寰＄郴缁�
-3. **鑸┖鍣細**
- - C130杩愯緭鏈�2鏋�
- - 楸奸拱鐩村崌鏈�8鏋�
- - 鏀ゴ骞茬洿鍗囨満4鏋�
- - 榛戦拱鐩村崌鏈�14鏋�
+### 娴蜂笂鑸拌墖
+- 鏃堕棿锛�2024骞�7鏈�2鍙� 11:04AM
+- 鍦扮偣锛氳彶寰嬪鑻忔瘮鍏嬫咕鍖�
+- 鍙戠幇锛氱枒浼间腹楣跨骇瀵煎脊椹遍�愯埌 2鑹�
-4. **缇庣┖鍐涙寚鎸ヤ腑蹇冿細**
- - 鍙戠幇缇庣┖鍐涙寚鎸ヤ腑蹇冿紝鍖呭惈浠ヤ笅璁炬柦锛�
- - 4搴у脊鑽簱
- - 11搴ф补搴�
- - 1搴ф満搴�
- - 鎵�鏈夎鏂藉潎宸插湪鍦板浘涓婃爣鏄庝綅缃��
+### 鑸┖鍣�
+- 鏃堕棿锛�2024骞�7鏈�2鍙� 3:00AM
+- 鍦扮偣锛氳彶寰嬪鑻忔瘮鍏嬫咕鍖�
+- 鍙戠幇锛氱枒浼奸粦楣扮洿鍗囨満 14鏋�
-### 浜屻�佺洰鏍囩粺璁�
+### 缇庡浗绌哄啗鎸囨尌涓績璁炬柦
+- 璁炬柦鍖呮嫭锛�
+ - 4搴у脊鑽簱
+ - 11搴ф补搴�
+ - 1搴ф満搴�
+- 浣嶇疆锛氬凡鏍囨槑鍦ㄥ湴鍥句笂
-- **鍐涗簨鐩爣锛�** 187涓�
-- **绀句細鐩爣锛�** 88涓�
-- **鏀挎不鐩爣锛�** 4涓�
-- **缁忔祹鐩爣锛�** 179涓�
-- **姘戝畢锛�** 5961搴�
+## 鐩爣缁熻
+- 鍐涗簨鐩爣锛�187涓�
+- 姘戝畢锛�209搴�
+- 鏀挎不鐩爣锛�4涓�
+- 绀句細鐩爣锛�86涓�
+- 缁忔祹鐩爣锛�179涓�
-### 涓夈�佹敾鍑婚闄╄瘎浼�
+## 鏀诲嚮椋庨櫓璇勪及
+濡傛灉浣跨敤娲查檯寮归亾瀵煎脊鏀诲嚮缇庣┖鍐涙寚鎸ヤ腑蹇冿紝鍦ㄥ懆杈逛竴鍏噷鍗婂緞鍐呮湁澶氬骇姘戠敤璁炬柦锛屽瓨鍦ㄨ浼ゅ钩姘戠殑椋庨櫓銆�
-濡傛灉浣跨敤娲查檯寮归亾瀵煎脊鏀诲嚮缇庣┖鍐涙寚鎸ヤ腑蹇冿紝鍦ㄥ懆杈逛竴鍏噷鍗婂緞鍐呮湁澶氬骇姘戠敤璁炬柦锛屽洜姝ゅ瓨鍦ㄨ浼ゅ钩姘戠殑椋庨櫓銆�
+## 鎬荤粨
+鏍规嵁XXX鍙峰崼鏄熺殑渚﹀療锛岃彶寰嬪鑻忔瘮鍏嬫咕鍖哄唴鍙戠幇浜嗗涓噸瑕佺洰鏍囷紝鍖呮嫭瀵煎脊闃插尽绯荤粺銆佸寮规姢鍗埌銆佸啗鐢ㄩ鏈哄拰缇庣┖鍐涙寚鎸ヤ腑蹇冦�傝鍖哄煙鐨勭洰鏍囩绫荤箒澶氾紝闇�娉ㄦ剰鏀诲嚮缇庣┖鍐涙寚鎸ヤ腑蹇冩椂鍙兘瀵艰嚧鍛ㄨ竟姘戠敤璁炬柦鐨勮浼ら闄┿��
-### 鎬荤粨
-
-鏍规嵁XXX鍗槦鐨勪睛瀵燂紝鑿插緥瀹捐嫃姣斿厠婀惧尯鍐呭彂鐜颁簡鐤戜技鍫や赴瀵煎脊闃插尽绯荤粺鍜屽涓噸瑕佸啗浜嬬洰鏍囷紝鍖呮嫭瀵煎脊鎶ゅ崼鑸般�佸悇绉嶅啗鐢ㄩ鏈哄拰缇庣┖鍐涙寚鎸ヤ腑蹇冦�傝鍖哄煙鍏辨湁187涓啗浜嬬洰鏍囥��88涓ぞ浼氱洰鏍囥��4涓斂娌荤洰鏍囥��179涓粡娴庣洰鏍囦互鍙�5961搴ф皯瀹呫�傞渶瑕佺壒鍒敞鎰忕殑鏄紝鏀诲嚮缇庣┖鍐涙寚鎸ヤ腑蹇冨瓨鍦ㄨ浼ゅ懆杈规皯鐢ㄨ鏂界殑椋庨櫓銆�
+## 闄勫姞淇℃伅
+XXX鍙峰崼鏄熷叿浣撳彂鐜颁俊鎭涓嬶細
+- 2024骞�7鏈�2鍙� 3:00AM锛氱枒浼煎牑涓扮郴缁燂紝鏁伴噺1
+- 2024骞�7鏈�2鍙� 3:00AM锛氱枒浼奸粦楣扮洿鍗囨満锛屾暟閲�14
+- 2024骞�7鏈�2鍙� 11:04AM锛氱枒浼间腹楣跨骇瀵煎脊椹遍�愯埌锛屾暟閲�2
diff --git a/public/config/config.js b/public/config/config.js
index 505169f..f0e2edf 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -7,8 +7,8 @@
//闂撮殧澶氫箙鍥炴秷鎭�
retTime: 2000,
// apiUrl: "/api/",
- apiUrl: "http://192.168.11.95:7777/api/",
- // apiUrl: "http://106.120.22.26:5367/",
+ // apiUrl: "http://192.168.11.95:7777/api/",
+ apiUrl: "http://103.135.160.14:7800/api/",
imgUrl: webHost + "/image/",
reportMd: "/Data/Report.md",
reportDocx: "/Data/Report.docx",
diff --git a/src/assets/js/map/mapJsonLayer.js b/src/assets/js/map/mapJsonLayer.js
index 0d46b9f..e5d3022 100644
--- a/src/assets/js/map/mapJsonLayer.js
+++ b/src/assets/js/map/mapJsonLayer.js
@@ -151,7 +151,15 @@
position,
cylinder
);
- Viewer.zoomTo(this.rectangularSensor.item);
+
+
+ earthCtrl.camera.flyTo(
+ 113.00849464328284,
+ 10.437567580726105,
+ 1101300.7027243855,
+ 57, -45, 0, 2
+ );
+
});
},
setQueryByFiled(name, color) {
diff --git a/src/assets/js/map/mapView.js b/src/assets/js/map/mapView.js
index b2365fb..e162149 100644
--- a/src/assets/js/map/mapView.js
+++ b/src/assets/js/map/mapView.js
@@ -34,7 +34,10 @@
sourceType: "tms",
url: "http://103.135.160.14:9038/gisserver/tmsserver/SubicBayArea"
});
-
+ const a = Viewer.clock.currentTime
+ let now2 = new Date();
+ let todayNoon = new Date(now2.getFullYear(), now2.getMonth(), now2.getDate(), 12, 0, 0);
+ Viewer.clock.currentTime = Cesium.JulianDate.fromDate(todayNoon);
modelLayer.init();
// const url = layerJson.getQueryUrl("SubicBayAreaVector_wfs", "GeoEntity");
diff --git a/src/assets/js/msg/msgData.js b/src/assets/js/msg/msgData.js
index d7a79d5..e20e5a9 100644
--- a/src/assets/js/msg/msgData.js
+++ b/src/assets/js/msg/msgData.js
@@ -6,11 +6,11 @@
this.imgurl = this.getImgUrl(type);
this.mine = this.getMine(type);
var roleMsg = this.getTest(msg);
-
+
const obj = {
- msg: this.getMsg(this.imgurl,roleMsg)
- }
- return obj ;
+ msg: this.getMsg(this.imgurl, roleMsg)
+ };
+ return obj;
},
getLoader() {
this.mine = true;
@@ -24,19 +24,38 @@
}
]);
},
- getJsonToMdData(res,link){
+ getJsonToMdData(res, link) {
this.mine = true;
var url = config.imgUrl + aiData.aiRole_img;
- return this.getMsg(url, [
+ return this.getMsg(url, [
{
type: "markdown",
- link:link,
+ link: link,
val: res
}
- ])
+ ]);
+ },
+ getJsonToHtml(res) {
+ this.mine = true;
+ var url = config.imgUrl + aiData.aiRole_img;
+ return this.getMsg(url, [
+ {
+ type: "JsonHtml",
+ val: res
+ }
+ ]);
+ },
+ getHTMLData(res) {
+ this.mine = true;
+ var url = config.imgUrl + aiData.aiRole_img;
+ return this.getMsg(url, [
+ {
+ type: "html",
+ val: res
+ }
+ ]);
},
getRagData(res, more, msg) {
-
return [
{
type: "rag",
diff --git a/src/components/Chat/chatList.vue b/src/components/Chat/chatList.vue
index 844194e..6286115 100644
--- a/src/components/Chat/chatList.vue
+++ b/src/components/Chat/chatList.vue
@@ -16,7 +16,7 @@
{{ item.name }}
</div>
<div v-show="item.sourceValue" class="sourcefrom" style="float: left;margin-left:20px">
- <el-select size="small" v-model="item.sourceValue" placeholder="璧勬枡鏉ユ簮">
+ <el-select size="small" v-model="item.sourceValue" placeholder="璧勬枡鏉ユ簮">
<el-option value="1" label="GEDB"></el-option>
<el-option value="2" label="GeoAgent"></el-option>
</el-select>
@@ -28,6 +28,34 @@
</div>
<div class="web__main-text">
<div v-for="(res, key) in item.list" :key="key">
+ <div v-if="res.type === 'html'">
+ <div v-html="res.val"></div>
+ </div>
+ <div v-if="res.type === 'JsonHtml'">
+ <div class="JsonHtml">
+ <table>
+ <tr>
+ <th v-show="index != 'rowspan'" v-for="(item, index) in res.val[0]" :key=index>
+ {{ index }}
+ </th>
+ </tr>
+ <tr v-if="!item.break" v-for="(item, index) in res.val" :key=index>
+ <td v-if="item.rowspan != ''" :rowspan="item.rowspan">
+ {{ item[Object.keys(item)[0]] }}
+ </td>
+ <td v-if="Object.keys(item)[0] != n && n != 'rowspan'" v-for="(rs, n ) in item " :key="n"> {{
+ item[n] }}</td>
+ <!-- -->
+ </tr>
+
+ </table>
+ <div>
+ <p v-for="(item, index) in res.val[res.val.length - 1].break" :key=index>
+ {{ item.bak }}
+ </p>
+ </div>
+ </div>
+ </div>
<div v-if="res.type === 'text'">
{{ res.val }}
</div>
@@ -141,6 +169,13 @@
}
},
methods: {
+ setrowSpan(res, name) {
+ if (Object.keys(res)[0] == name) {
+ return res['rowspan']
+ } else {
+ return 1
+ }
+ },
setDownLoadFile(res) {
const downloadLink = document.createElement('a');
downloadLink.href = res
@@ -323,7 +358,7 @@
}
-/deep/.el-input--small .el-input__inner{
+/deep/.el-input--small .el-input__inner {
height: 30px;
font-size: 12px;
}
@@ -540,29 +575,33 @@
}
</style>
<style>
-
.el-select-dropdown {
background-color: #555555 !important;
color: #409eff !important;
-
+
}
-.el-select-dropdown__item{
+
+.el-select-dropdown__item {
color: #ffffff !important;
background: transparent !important;
}
-.el-select-dropdown__item.selected{
+
+.el-select-dropdown__item.selected {
color: #409eff !important;
background: transparent !important;
}
-.el-select-dropdown__item.selected span{
+
+.el-select-dropdown__item.selected span {
color: #409eff !important;
background: transparent !important;
}
-.el-select-dropdown__item:hover{
+
+.el-select-dropdown__item:hover {
/* background-color: #555555 !important; */
- color: #409eff!important;
+ color: #409eff !important;
}
+
.parentBox {
height: 100%;
/* background: rgb(31, 31, 31); */
@@ -642,6 +681,55 @@
word-wrap: break-word;
}
+.JsonHtml table {
+ border: 1px solid white;
+ text-align: center;
+ line-height: 30px;
+ font-family: "Arial", sans-serif;
+ font-size: 16px;
+}
+
+.JsonHtml tr {
+ border: 1px solid white;
+
+}
+
+.JsonHtml th {
+ border: 1px solid white;
+ padding: 10px 10px;
+}
+
+.JsonHtml td {
+ border: 1px solid white;
+ padding: 10px 10px;
+
+}
+
+
+
+.newConcentLeft table {
+ border: 1px solid white;
+ text-align: center;
+ line-height: 30px;
+ font-family: "Arial", sans-serif;
+ font-size: 16px;
+}
+
+.newConcentLeft tr {
+ border: 1px solid white;
+
+}
+
+.newConcentLeft th {
+ border: 1px solid white;
+
+}
+
+.newConcentLeft td {
+ border: 1px solid white;
+
+}
+
.newConcentLeft img {
width: 75%;
}
@@ -658,17 +746,28 @@
font-size: 15px !important;
line-height: 15px !important;
+ list-style: disc;
}
.newConcentLeft p {
-
font-size: 15px !important;
+ /* */
+}
+.newConcentLeft h1 {
+ font-size: 2rem !important;
+ padding: 20px 0px;
+ border-bottom: 1px solid rgba(209, 209, 209, 0.0);
+}
+.newConcentLeft h2 {
+ padding:30px 0px;
+ line-height: 0px;
+ border-bottom: 1px solid rgba(209, 209, 209, 0.0);
/* */
}
</style>
<style>
-.web_Main_markDown h1 {
+/* .web_Main_markDown h1 {
line-height: 20px !important;
font-size: 20px !important;
}
@@ -701,5 +800,5 @@
background: #555555;
padding: 10px;
border-radius: 10px;
-}
+} */
</style>
diff --git a/src/views/chartView/index.vue b/src/views/chartView/index.vue
index 8567b56..3098418 100644
--- a/src/views/chartView/index.vue
+++ b/src/views/chartView/index.vue
@@ -219,57 +219,30 @@
},
async setMsgStart(res) {
- // if (res.indexOf("鍐涗簨鐩爣") > -1 || res.indexOf("姘戝畢") > -1 || res.indexOf("缁忔祹鐩爣") > -1 || res.indexOf("娴峰啗闄嗘垬闃�") > -1 || res.indexOf("鍫や赴") > -1) {
- // this.$store.state.setScreenFlag = true;
- // this.list.splice(-1, 1);
- // this.loading = false;
- // layerJson.setQyeryData(res);
- // } else
- // if (res.indexOf("markDown") > -1) {
- // setTimeout(() => {
- // this.getMd();
- // }, 2000);
-
- // }else
- if (res.indexOf("scanWeapon") > -1) {
- this.setQueryMapPlan("scanWeapon");
- } else if (res.indexOf("weaponParameters") > -1) {
- this.setQueryMapPlan("weaponParameters");
- } else if (res.indexOf("searchTarget") > -1) {
- this.setQueryMapPlan("searchTarget");
- } else if (res.indexOf("attackUSAFCommandCenter") > -1) {
- this.setQueryMapPlan("attackUSAFCommandCenter");
- } else if (res.indexOf("USAFCommandCenterQuery") > -1) {
- this.setQueryMapPlan("USAFCommandCenterQuery");
- } else if (res.indexOf("simulationAttack") > -1) {
- this.setQueryMapPlan("simulationAttack");
- } else if (res.indexOf("defenceRangeTyphoonSystem") > -1) {
- this.setQueryMapPlan("defenceRangeTyphoonSystem");
- } else if (res.indexOf("flyToSubicBayArea") > -1) {
- this.setQueryMapPlan("flyToSubicBayArea");
- } else if (res.indexOf("displayWeaponSystem") > -1) {
- this.setQueryMapPlan("displayWeaponSystem");
- } else if (res.indexOf("weaponSystemParameters") > -1) {
- this.setQueryMapPlan("weaponSystemParameters");
- }
- // else if(res.indexOf("鑻忔瘮鍏嬫咕") > -1){
- // this.$store.state.setScreenFlag = true;
- // this.list.splice(-1, 1);
- // this.loading = false;
- // this.$nextTick(() => {
- // setTimeout(() => {
- // mapInfo.setEntityQueryInput();
- // }, 1000);
- // });
- // }
- else if (res == "鐢熸垚鎴樺満鐜鎶ュ憡") {
+ if (res == "瀹氫綅鍒拌嫃姣斿厠婀�") {
+ this.setQueryMapPlan('flyToSubicBayArea', null)
+ } else if (res == "姝ゅ尯鍩熸湁鍝簺姝﹀櫒绯荤粺") {
+ this.setQueryMapPlan('displayWeaponSystem', null)
+ } else if (res == "鏌ヨ璇ュ尯鍩熷唴鐩爣鍙婂垎甯�") {
+ this.setQueryMapPlan('searchTarget', null)
+ }else if (res == "鍒嗘瀽鍫や赴绯荤粺鐨勬�ц兘鍜岄槻寰¤寖鍥�") {
+ this.setQueryMapPlan('defenceRangeTyphoonSystem', null)
+ } else if (res == "瀹氫綅鍒扮編鍥界┖鍐涙寚鎸ヤ腑蹇�") {
+ this.setQueryMapPlan('USAFCommandCenterQuery', null)
+ } else if (res == "鐢熸垚鎴樺満鐜鎶ュ憡") {
this.getUrlMd(config.reportMd, config.reportDocx)
+ // axios.get("/Data/Report.html").then(response=>{
+ // var roleMsg = msgData.getHTMLData(response.data);
+ // this.list[this.list.length - 1].list = roleMsg.list;
+ // this.loading = false;
+ // })
}
- else if (res == "涓夌淮瀹炴櫙") {
+ else if (res.indexOf("055") > -1) {
layerJson.setTitleSetRest();
this.setV1Fastgpt(res);
} else {
const data = await getAIMessage(res);
+
if (data.status == 200) {
if (data.name) {
this.$store.state.setScreenFlag = true;
@@ -292,10 +265,40 @@
this.getMsg("ai", data.content);
this.list[this.list.length - 1].sourceValue = "2";
} else {
- this.getMsg("ai", "绋嶅悗鏈嶅姟銆傘�傘��");
+ if (data.length > 0) {
+ this.setSourceList(data)
+ } else {
+ this.getMsg("ai", "绋嶅悗鏈嶅姟銆傘�傘��");
+ }
+ //
}
}
}
+
+
+ },
+ setSourceList(res) {
+ const obj = res[0].quoteList
+ var roleMsg = [
+ {
+ type: "text",
+ val: "鏈煡璇㈠埌鐩稿叧淇℃伅"
+ }
+ ];
+
+ const length = this.list.length - 1;
+
+ if (obj.length > 0) {
+ this.$store.state.ragList.push({
+ quest: res,
+ index: length,
+ val: obj
+ });
+ roleMsg = msgData.getRagData(obj[0], true, res);
+ }
+
+ this.list[length].list = roleMsg;
+ this.loading = false;
},
getUrlMd(res, link) {
axios.get(res).then(response => {
@@ -336,8 +339,15 @@
height: 1371.1909347746105
});
var obj = this.getQueryGroupBy("姝﹀櫒", "weaponname");
- var table_head = ["姝﹀櫒鍚嶇О", "鏁伴噺", "鍑虹幇鏃堕棿"]
- this.getQueryEentityGroupBy(obj, "weaponname", response, table_head);
+ // var table_head = ["姝﹀櫒鍚嶇О", "鏁伴噺", "鍑虹幇鏃堕棿"]
+ // this.getQueryEentityGroupBy(obj, "weaponname", response, table_head);
+
+ // this.getUrlMd("/Data/姝﹀櫒绯荤粺缁嗗寲.md", null)
+ axios.get("/Data/姝﹀櫒绯荤粺.html").then(response => {
+ var roleMsg = msgData.getHTMLData(response.data);
+ this.list[this.list.length - 1].list = roleMsg.list;
+ this.loading = false;
+ })
layerJson.setAddWfsJson();
break;
case "weaponSystemParameters":
@@ -373,7 +383,7 @@
this.getUrlMd(url, null)
} else {
this.getMsg("ai", response.content);
-
+
}
} else {
this.getMsg("ai", response.content);
@@ -386,28 +396,40 @@
case "searchTarget":
var obj = this.getQueryGroupBy("寤虹瓚", "targettype");
- var table_head = ["鐩爣绫诲瀷", "鏁伴噺"]
- this.getQueryEentityGroupBy(obj, "targettype", response, table_head);
+
+ // 瀹炰綋鐩爣鍒楄〃_1.html
+ axios.get("/Data/瀹炰綋鐩爣鍒楄〃_1.html").then(response => {
+ var roleMsg = msgData.getHTMLData(response.data);
+ this.list[this.list.length - 1].list = roleMsg.list;
+ this.loading = false;
+ })
+ // axios.get("/Data/鎴樺満鐜.json").then(response=>{
+ // var roleMsg =msgData.getJsonToHtml(response.data);
+ // this.list[this.list.length - 1].list = roleMsg.list;
+ // this.loading = false;
+ // })
+ // var table_head = ["鐩爣绫诲瀷", "鏁伴噺"]
+ // this.getQueryEentityGroupBy(obj, "targettype", response, table_head);
var list = [
{
name: "鍐涗簨鐩爣",
- color: "#409EFF"
+ color: "#73afff"
},
{
name: "鏀挎不鐩爣",
- color: "#FFFF00"
+ color: "#fffd72"
},
{
name: "缁忔祹鐩爣",
- color: "#FFA500"
+ color: "#fabc56"
},
{
name: "绀句細鐩爣",
- color: "#000000"
+ color: "#272424"
},
{
name: "姘戝畢",
- color: "#808080"
+ color: "#979696"
}
];
layerJson.setQueryByFiledList(list, 0);
@@ -422,8 +444,18 @@
case "USAFCommandCenterQuery":
var obj = "ejfl like '%绌哄啗鍩哄湴%'";
layerJson.setQueryExtent2(obj, false);
- this.getMsg("ai", "缇庡浗绌哄啗鎸囨尌涓績锛屽寘鍚�4搴у脊鑽簱锛�11搴ф补搴擄紝1搴ф満搴撱��");
- this.list[this.list.length - 1].sourceValue = "1";
+ // this.getMsg("ai", "缇庡浗绌哄啗鎸囨尌涓績锛屽寘鍚�4搴у脊鑽簱锛�11搴ф补搴擄紝1搴ф満搴撱��");
+ // this.getUrlMd("/Data/缇庡浗绌哄啗鎸囨尌涓績.md", null)
+ // this.list[this.list.length - 1].sourceValue = "1";
+ //
+
+ axios.get("/Data/缇庡浗绌哄啗鎸囨尌涓績.html").then(response => {
+ var roleMsg = msgData.getHTMLData(response.data);
+ this.list[this.list.length - 1].list = roleMsg.list;
+ this.loading = false;
+ })
+ //
+ //
break;
case "simulationAttack":
var obj = "ejfl like '%绌哄啗鍩哄湴%'";
@@ -437,6 +469,7 @@
layerJson.setQueryTF2(obj);
this.getMsg("ai", "鐩稿叧淇℃伅宸插湪鍦板浘妯″潡灞曠ず");
this.list[this.list.length - 1].sourceValue = "1";
+ this.getUrlMd("/Data/鍫や赴绯荤粺.md", null)
break;
default:
diff --git a/src/views/mapView/mapView.vue b/src/views/mapView/mapView.vue
index 3c3cf81..d5bc224 100644
--- a/src/views/mapView/mapView.vue
+++ b/src/views/mapView/mapView.vue
@@ -28,23 +28,28 @@
return {
errInfoMessage: null,
errInfoFlag: false,
- lengedList: [{
- name: "鍐涗簨鐩爣",
- color: "#409EFF"
- }, {
- name: "鏀挎不鐩爣",
- color: "#FFFF00"
- }, {
- name: "缁忔祹鐩爣",
- color: "#FFA500"
- }, {
- name: "绀句細鐩爣",
- color: "#000000"
- }, {
- name: "姘戝畢",
- color: "#808080"
- }
- ]
+ lengedList:[
+ {
+ name: "鍐涗簨鐩爣",
+ color: "#73afff"
+ },
+ {
+ name: "鏀挎不鐩爣",
+ color: "#fffd72"
+ },
+ {
+ name: "缁忔祹鐩爣",
+ color: "#fabc56"
+ },
+ {
+ name: "绀句細鐩爣",
+ color: "#272424"
+ },
+ {
+ name: "姘戝畢",
+ color: "#979696"
+ }
+ ]
};
},
computed: {
@@ -132,7 +137,7 @@
}
.mapLenged .mapcolor {
- width: 100px;
+ width: 60px;
height: 30px;
}
--
Gitblit v1.9.3