vue2-client 1.22.37 → 1.22.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.idea/MarsCodeWorkspaceAppSettings.xml +7 -0
- package/.idea/af-vue2-client.iml +4 -7
- package/.idea/deployment.xml +14 -0
- package/.idea/encodings.xml +6 -0
- package/.idea/gradle.xml +7 -0
- package/.idea/inspectionProfiles/Project_Default.xml +6 -0
- package/.idea/misc.xml +6 -0
- package/.idea/vcs.xml +5 -5
- package/package.json +1 -1
- package/src/assets/svg/unknown-icon.svg +3 -3
- package/src/base-client/components/common/AfMap/InfoWindowComponent.vue +141 -141
- package/src/base-client/components/common/AfMap/demo.vue +492 -492
- package/src/base-client/components/common/XInspectionDetailDrawer/components/DeviceStatus.vue +1 -1
- package/src/base-client/components/common/XInspectionDetailDrawer/demo.vue +6 -1
- package/src/base-client/components/common/XInspectionDetailDrawer/index.vue +7 -3
- package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionDetailApi.js +2 -2
- package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionService.js +2 -2
- package/src/components/ImagePreview/ImagePreview.vue +323 -323
- package/src/pages/login/Login.vue +1 -1
- package/src/utils/login.js +3 -1
- package/.idea/codeStyles/Project.xml +0 -62
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
package/src/utils/login.js
CHANGED
|
@@ -97,7 +97,6 @@ function afterLogin(res, options) {
|
|
|
97
97
|
JSON.stringify({ username: name, password: password })
|
|
98
98
|
)
|
|
99
99
|
const jwt = res.jwtNew
|
|
100
|
-
setAccessToken(data, jwt)
|
|
101
100
|
// 如果返回字段有s说明是走的V3XuanJian网关
|
|
102
101
|
if(res.s || res.session) {
|
|
103
102
|
setV4SessionKey({session: res.s || res.session})
|
|
@@ -117,6 +116,7 @@ function afterLogin(res, options) {
|
|
|
117
116
|
}
|
|
118
117
|
result.functions.unshift(resourceManageMain)
|
|
119
118
|
afterGeneral(result, options)
|
|
119
|
+
setAccessToken(data, jwt)
|
|
120
120
|
if (result.deps === '用户工单登记') {
|
|
121
121
|
router.push(setting.ticketPage).catch(() => {
|
|
122
122
|
})
|
|
@@ -175,6 +175,8 @@ function getWebConfigFromStorage() {
|
|
|
175
175
|
|
|
176
176
|
/** 解析登录接口返回的 session 并写入 v4-session-key(受 webConfig.requestEncrypt 控制) */
|
|
177
177
|
export function setV4SessionKey(res) {
|
|
178
|
+
const webConfig = getWebConfigFromStorage()
|
|
179
|
+
if (!res?.session || !webConfig?.setting?.requestEncrypt) return
|
|
178
180
|
const sessionKey = EncryptUtil.RSADecryptRaw(res.session, RSA_PRIVATE_KEY)
|
|
179
181
|
if (sessionKey) localStorage.setItem(V4_SESSION_KEY, sessionKey)
|
|
180
182
|
}
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
-
<code_scheme name="Project" version="173">
|
|
3
|
-
<option name="LINE_SEPARATOR" value=" " />
|
|
4
|
-
<HTMLCodeStyleSettings>
|
|
5
|
-
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
6
|
-
</HTMLCodeStyleSettings>
|
|
7
|
-
<JSCodeStyleSettings version="0">
|
|
8
|
-
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
|
|
9
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
10
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
11
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
12
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
13
|
-
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
14
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
15
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
16
|
-
</JSCodeStyleSettings>
|
|
17
|
-
<TypeScriptCodeStyleSettings version="0">
|
|
18
|
-
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
|
|
19
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
20
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
21
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
22
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
23
|
-
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
24
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
25
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
26
|
-
</TypeScriptCodeStyleSettings>
|
|
27
|
-
<VueCodeStyleSettings>
|
|
28
|
-
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
29
|
-
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
30
|
-
</VueCodeStyleSettings>
|
|
31
|
-
<codeStyleSettings language="HTML">
|
|
32
|
-
<option name="SOFT_MARGINS" value="120" />
|
|
33
|
-
<indentOptions>
|
|
34
|
-
<option name="INDENT_SIZE" value="2" />
|
|
35
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
36
|
-
<option name="TAB_SIZE" value="2" />
|
|
37
|
-
</indentOptions>
|
|
38
|
-
</codeStyleSettings>
|
|
39
|
-
<codeStyleSettings language="JavaScript">
|
|
40
|
-
<option name="SOFT_MARGINS" value="120" />
|
|
41
|
-
<indentOptions>
|
|
42
|
-
<option name="INDENT_SIZE" value="2" />
|
|
43
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
44
|
-
<option name="TAB_SIZE" value="2" />
|
|
45
|
-
</indentOptions>
|
|
46
|
-
</codeStyleSettings>
|
|
47
|
-
<codeStyleSettings language="TypeScript">
|
|
48
|
-
<option name="SOFT_MARGINS" value="120" />
|
|
49
|
-
<indentOptions>
|
|
50
|
-
<option name="INDENT_SIZE" value="2" />
|
|
51
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
52
|
-
<option name="TAB_SIZE" value="2" />
|
|
53
|
-
</indentOptions>
|
|
54
|
-
</codeStyleSettings>
|
|
55
|
-
<codeStyleSettings language="Vue">
|
|
56
|
-
<option name="SOFT_MARGINS" value="120" />
|
|
57
|
-
<indentOptions>
|
|
58
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
59
|
-
</indentOptions>
|
|
60
|
-
</codeStyleSettings>
|
|
61
|
-
</code_scheme>
|
|
62
|
-
</component>
|