12-12

src/renderer/src/main.ts

@@ -102,6 +102,7 @@ setupStore(setApp)
 setupSvgIcon(setApp)
 setApp.use(EventBusPlugin)
 setApp.use(router)
+// @ts-ignore
 setApp.use(elTableInfiniteScroll)
 setApp.use(ElementPlus, {
   locale: zhCn

src/renderer/src/views/TS/edit/polygonObjectTs.vue

@@ -310,7 +310,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/TS/edit/polylineObjectTs.vue

@@ -472,7 +472,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/headers/components/setPup/components/setting.vue

@@ -654,10 +654,10 @@ const toggleGroup = (type: string) => {
 
 var backButShow: any = ref(false)
 //根据角色权限控制后台管理按钮显隐
-let option = JSON.parse(localStorage.getItem('frontFunctionArr'))
+let option = JSON.parse(localStorage.getItem('frontFunctionArr') || '{}')
 option = Object.keys(option)
 //数据权限
-let data = JSON.parse(localStorage.getItem('frontDataArr'))
+let data = JSON.parse(localStorage.getItem('frontDataArr') || '[]')
 if (option.length == 0 && data.length == 0) {
   //管理员
   backButShow.value = true

src/renderer/src/views/components/propertyBox/CircleObject.vue

@@ -311,7 +311,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/attackArrow.vue

@@ -327,7 +327,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/curvelineObject.vue

@@ -461,7 +461,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/propertyBox/explosion.vue

@@ -81,7 +81,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/flyLine.vue

@@ -102,7 +102,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/graphObject.vue

@@ -345,7 +345,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   // entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 

src/renderer/src/views/components/propertyBox/modelObject.vue

@@ -722,7 +722,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   // entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 

src/renderer/src/views/components/propertyBox/polygonObject.vue

@@ -308,7 +308,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/polyhedronObject.vue

@@ -160,7 +160,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/polylineObject.vue

@@ -469,7 +469,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/propertyBox/tileset.vue

@@ -78,7 +78,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.oldData = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/trajectoryMotion.vue

@@ -266,7 +266,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/login/index.vue

@@ -818,8 +818,13 @@ const validatePortRange = (rule, value, callback) => {
     .settings:hover svg g {
       filter: url(#filter_2442_1327);
     }
-    .exit:hover svg g {
-      filter: url(#filter_2442_480);
+    .exit:hover svg {
+      g {
+        filter: url(#filter_2442_480);
+        path {
+          fill: rgba(241, 108, 85, 1) !important;
+        }
+      }
     }
 
     .el-button {

src/renderer/src/views/login/useLogin.ts

@@ -81,7 +81,7 @@ export const useLogin = () => {
       })
       localStorage.setItem('frontFunctionArr', JSON.stringify(obj))
       //数据权限
-      let dataArr = []
+      let dataArr:any = []
       res.data.roleOperates.forEach(item => {
         dataArr.push(item.operate)
       })