diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts
index 0c43d34..37cb211 100644
--- a/src/renderer/components.d.ts
+++ b/src/renderer/components.d.ts
@@ -20,10 +20,12 @@ declare module 'vue' {
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
+ ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
+ ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSlider: typeof import('element-plus/es')['ElSlider']
diff --git a/src/renderer/public/sdk/custom/css/index.css b/src/renderer/public/sdk/custom/css/index.css
index 8acb829..03f5091 100644
--- a/src/renderer/public/sdk/custom/css/index.css
+++ b/src/renderer/public/sdk/custom/css/index.css
@@ -513,6 +513,7 @@
overflow-y: auto;
scrollbar-gutter: stable;
width: calc(100% + 1px);
+ height: 194px;
}
.YJ-custom-base-dialog>.content .table .align-center,
diff --git a/src/renderer/public/tree/jquery.ztree.core.js b/src/renderer/public/tree/jquery.ztree.core.js
index 2937bdc..de322c6 100644
--- a/src/renderer/public/tree/jquery.ztree.core.js
+++ b/src/renderer/public/tree/jquery.ztree.core.js
@@ -688,6 +688,9 @@
},
nodeTitle: function (setting, node) {
var t = setting.data.key.title === '' ? setting.data.key.name : setting.data.key.title
+ if(!node[t]) {
+ t = setting.data.key.name
+ }
var rawTitle = '' + node[t]
if (typeof setting.data.render.title === 'function') {
return setting.data.render.title.call(this, rawTitle, node)
@@ -1489,6 +1492,7 @@
html.push('')
},
makeDOMNodeNameBefore: function (html, setting, node) {
+ console.log('=================', setting, node)
var title = data.nodeTitle(setting, node),
url = view.makeNodeUrl(setting, node),
fontcss = view.makeNodeFontCss(setting, node),
diff --git a/src/renderer/public/tree/newFuzzySearch.js b/src/renderer/public/tree/newFuzzySearch.js
index 24ae383..1b4a813 100644
--- a/src/renderer/public/tree/newFuzzySearch.js
+++ b/src/renderer/public/tree/newFuzzySearch.js
@@ -96,6 +96,10 @@ window.newFuzzySearch = function (
let str = '' + h + ''
return str
})
+ item.title = item.oldname.replace(F, function (h) {
+ let str = h
+ return str
+ })
// let a = item.name
// a = '' + a + ""
diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts
index 2d3650d..8eb1166 100644
--- a/src/renderer/src/axios/index.ts
+++ b/src/renderer/src/axios/index.ts
@@ -85,8 +85,12 @@ service.interceptors.response.use(
if (response.data.code == 401) {
router.push('/')
localStorage.removeItem('Authorization')
+ ElMessage({
+ message: "登录过期,请重新登录",
+ type: 'error'
+ })
}
- if (![0, 200].includes(response.data.code)) {
+ else if (![0, 200].includes(response.data.code)) {
ElMessage({
message: response.data.msg || response.data.message,
type: 'error'
diff --git a/src/renderer/src/common/addMapSource.ts b/src/renderer/src/common/addMapSource.ts
index a940fd9..d225190 100644
--- a/src/renderer/src/common/addMapSource.ts
+++ b/src/renderer/src/common/addMapSource.ts
@@ -10,13 +10,22 @@ export const addMapSource = async ({type, id, sourceName = '未命名对象', op
let options: any = await initMapData(type, opt, null)
let selectedNodes = window.treeObj.getSelectedNodes()
let node = selectedNodes && selectedNodes[selectedNodes.length - 1]
+ function getParentId(nd: any) {
+ if (nd.sourceType === 'directory') {
+ return nd.id
+ } else {
+ let parentNode = window.treeObj.getNodeByParam("id", nd.parentId, null);
+ if(parentNode) {
+ return getParentId(parentNode)
+ }
+ else {
+ return
+ }
+ }
+ }
let parentId
if (node) {
- if (node.sourceType === 'directory') {
- parentId = node.id
- } else {
- parentId = node.parentId
- }
+ parentId = getParentId(node)
}
delete options.host
if(options.attribute && options.attribute.rtmp) {
diff --git a/src/renderer/src/icons/svg/addEventTs.svg b/src/renderer/src/icons/svg/addEventTs.svg
new file mode 100644
index 0000000..5b8bcb0
--- /dev/null
+++ b/src/renderer/src/icons/svg/addEventTs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/renderer/src/views/TS/cabin.vue b/src/renderer/src/views/TS/cabin.vue
index 412d0ba..e4511a8 100644
--- a/src/renderer/src/views/TS/cabin.vue
+++ b/src/renderer/src/views/TS/cabin.vue
@@ -186,7 +186,7 @@ const initTreeCallBack = () => {
});
if ((window as any).earth_ts) {
for (let i = 0; i < layers.length; i++) {
- // initMapData(layers[i].sourceType, layers[i].detail, null)
+ initMapData(layers[i].sourceType, layers[i].detail, null)
}
}
})
diff --git a/src/renderer/src/views/TS/components/MouseRight.vue b/src/renderer/src/views/TS/components/MouseRight.vue
new file mode 100644
index 0000000..7e9b7b3
--- /dev/null
+++ b/src/renderer/src/views/TS/components/MouseRight.vue
@@ -0,0 +1,112 @@
+
+