From b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:51 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index b81e0c5..5f771fc 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -114,7 +114,8 @@
</div>
</template>
<script>
-import MyMap from '@/components/map'
+// import MyMap from "@/components/map";
+import MyMap from "@/components/map/leafletMap.vue";
export default {
components: {
MyMap
@@ -390,13 +391,21 @@
// 鑾峰彇琛屾斂鍖哄煙
// 鑾峰彇token
getToken() {
+ console.log('666666666666')
const token = sessionStorage.getItem('token');
const tokenHead = sessionStorage.getItem('tokenHead');
+ this.handleSuccess()
if (token && tokenHead) {
return { Authorization: tokenHead + token };
}
+
},
handleSuccess(res, file, filelist) {
+<<<<<<< HEAD
+ console.log(res);
+=======
+ console.log(res)
+>>>>>>> 948cca39e334dde8a3ef04c030f8d691edf30bf8
const baseUrl = 'http://140.143.152.226:8410/';
this.ill.positive = baseUrl + res.data.url1;
@@ -434,15 +443,15 @@
.input-form {
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-input__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ // &::v-deep .el-textarea__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ // }
.upload-demo {
position: relative;
@@ -483,4 +492,4 @@
flex: 1;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0