Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
eefecb81
Commit
eefecb81
authored
May 31, 2024
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 优化上传和图片展示
parent
94242dc6
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
306 additions
and
148 deletions
+306
-148
base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue
...admin/src/pages/basicset/addmatter/group/addmaterials.vue
+3
-2
base-manager-ui/admin/src/pages/basicset/addmatter/group/downloadTable.vue
...dmin/src/pages/basicset/addmatter/group/downloadTable.vue
+56
-59
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue
...rc/pages/basicset/appmarket/components/AppDetailsPage.vue
+1
-1
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppSelect.vue
...min/src/pages/basicset/appmarket/components/AppSelect.vue
+87
-0
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue
...dmin/src/pages/basicset/appmarket/components/AppTheme.vue
+2
-4
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
...in/src/pages/basicset/appmarket/components/DataUpdate.vue
+3
-3
base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue
...admin/src/pages/basicset/appmarket/components/MoveApp.vue
+2
-3
base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
...n/src/pages/basicset/appmarket/components/TerminalApp.vue
+2
-3
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
...er-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
+24
-7
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
...r-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
+72
-26
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
...-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
+13
-7
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
+5
-11
base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
...r-ui/admin/src/pages/basicset/site/components/addsite.vue
+13
-7
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
...in/src/pages/basicset/workman/components/EditPersonel.vue
+13
-6
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
...in/src/pages/basicset/workman/components/addpersonnel.vue
+3
-6
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
...manager-ui/admin/src/pages/basicset/workman/personnel.vue
+2
-3
base-manager-ui/admin/vue.config.js
base-manager-ui/admin/vue.config.js
+5
-0
No files found.
base-manager-ui/admin/src/pages/basicset/addmatter/group/addmaterials.vue
View file @
eefecb81
...
@@ -395,12 +395,13 @@ export default {
...
@@ -395,12 +395,13 @@ export default {
let
{
uid
}
=
info
.
file
;
let
{
uid
}
=
info
.
file
;
if
(
code
===
1
)
{
if
(
code
===
1
)
{
let
obj
=
{
let
obj
=
{
uid
:
uid
,
uid
,
name
:
fileName
,
name
:
fileName
,
status
:
"
done
"
,
status
:
"
done
"
,
materialName
:
this
.
form
.
materialName
,
materialName
:
this
.
form
.
materialName
,
fileName
:
fileName
,
fileName
:
fileName
,
fileUrl
:
this
.
apiUrl
+
url
,
url
,
fileUrl
:
url
,
filetype
:
num
,
filetype
:
num
,
source
:
1
,
source
:
1
,
};
};
...
...
base-manager-ui/admin/src/pages/basicset/addmatter/group/downloadTable.vue
View file @
eefecb81
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
:columns=
"columns"
:columns=
"columns"
:data-source=
"tableData"
:data-source=
"tableData"
>
>
<template
slot=
"action"
slot-scope=
"text"
>
<template
slot=
"action"
slot-scope=
"text
, record
"
>
<a
@
click=
"handleClick(text)
"
>
下载
</a>
<a
:href=
"record.fileUrl"
:download=
"record.fileName
"
>
下载
</a>
</
template
>
</
template
>
</a-table>
</a-table>
</a-modal>
</a-modal>
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
</template>
</template>
<
script
>
<
script
>
import
{
download
}
from
"
@/services/matter
"
;
//
import { download } from "@/services/matter";
// import axios from "axios";
// import axios from "axios";
const
columns
=
[
const
columns
=
[
{
{
...
@@ -70,63 +70,60 @@ export default {
...
@@ -70,63 +70,60 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
downloadByBlob
(
url
,
name
)
{
// downloadByBlob(url, name) {
let
image
=
new
Image
();
// let image = new Image();
image
.
setAttribute
(
"
crossOrigin
"
,
"
anonymous
"
);
// image.setAttribute("crossOrigin", "anonymous");
image
.
src
=
url
;
// image.src = url;
image
.
onload
=
()
=>
{
// image.onload = () => {
let
canvas
=
document
.
createElement
(
"
canvas
"
);
// let canvas = document.createElement("canvas");
canvas
.
width
=
image
.
width
;
// canvas.width = image.width;
canvas
.
height
=
image
.
height
;
// canvas.height = image.height;
let
ctx
=
canvas
.
getContext
(
"
2d
"
);
// let ctx = canvas.getContext("2d");
ctx
.
drawImage
(
image
,
0
,
0
,
image
.
width
,
image
.
height
);
// ctx.drawImage(image, 0, 0, image.width, image.height);
canvas
.
toBlob
((
blob
)
=>
{
// canvas.toBlob((blob) => {
let
url
=
URL
.
createObjectURL
(
blob
);
// let url = URL.createObjectURL(blob);
this
.
download
(
url
,
name
);
// this.download(url, name);
// 用完释放URL对象
// // 用完释放URL对象
URL
.
revokeObjectURL
(
url
);
// URL.revokeObjectURL(url);
});
// });
};
// };
},
// },
download
(
href
,
name
)
{
// download(href, name) {
let
eleLink
=
document
.
createElement
(
"
a
"
);
// let eleLink = document.createElement("a");
eleLink
.
style
=
"
display: none
"
;
// eleLink.style = "display: none";
eleLink
.
download
=
name
;
// eleLink.download = name;
eleLink
.
href
=
href
;
// eleLink.href = href;
document
.
body
.
appendChild
(
eleLink
);
// document.body.appendChild(eleLink);
eleLink
.
click
();
// eleLink.click();
eleLink
.
remove
();
// eleLink.remove();
},
// },
// async downloadFile(row, type) {
async
downloadFile
(
row
,
type
)
{
// let res = await download(
let
res
=
await
download
(
// { datumId: row.datumId },
{
datumId
:
row
.
datumId
},
// { responseType: "blob" }
{
responseType
:
"
blob
"
}
// );
);
// let data = res.data;
let
data
=
res
.
data
;
// const blob = new Blob([data], {
const
blob
=
new
Blob
([
data
],
{
// type: type,
type
:
type
,
// });
});
// const link = document.createElement("a");
const
link
=
document
.
createElement
(
"
a
"
);
// link.href = URL.createObjectURL(blob);
link
.
href
=
URL
.
createObjectURL
(
blob
);
// link.setAttribute("download", row.fileName); // 设置下载文件名称
link
.
setAttribute
(
"
download
"
,
row
.
fileName
);
// 设置下载文件名称
// document.body.appendChild(link);
document
.
body
.
appendChild
(
link
);
// link.click();
link
.
click
();
// link.remove();
link
.
remove
();
// },
},
// handleClick(row) {
// let index = row.fileUrl.lastIndexOf(".");
handleClick
(
row
)
{
// let str = row.fileUrl.slice(index + 1);
let
index
=
row
.
fileUrl
.
lastIndexOf
(
"
.
"
);
// if (str === "png" || str === "jpg" || str === "jpeg") {
let
str
=
row
.
fileUrl
.
slice
(
index
+
1
);
// this.downloadByBlob(row.fileUrl, row.fileName);
if
(
str
===
"
png
"
||
str
===
"
jpg
"
||
str
===
"
jpeg
"
)
{
// } else {
this
.
downloadByBlob
(
row
.
fileUrl
,
row
.
fileName
);
// this.download(row.fileUrl, row.fileName);
}
else
{
// }
this
.
download
(
row
.
fileUrl
,
row
.
fileName
);
// },
}
},
},
},
};
};
</
script
>
</
script
>
<
style
lang=
"less"
scoped
>
<
style
lang=
"less"
scoped
></
style
>
</
style
>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue
View file @
eefecb81
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
width=
"50"
width=
"50"
height=
"50"
height=
"50"
v-if=
"appInfo.appIconPath"
v-if=
"appInfo.appIconPath"
:src=
"ap
i + ap
pInfo.appIconPath"
:src=
"appInfo.appIconPath"
/>
/>
<div
class=
"name"
>
{{
appInfo
.
appName
}}
</div>
<div
class=
"name"
>
{{
appInfo
.
appName
}}
</div>
<div
class=
"version"
>
当前版本:v
{{
appInfo
.
version
}}
</div>
<div
class=
"version"
>
当前版本:v
{{
appInfo
.
version
}}
</div>
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppSelect.vue
0 → 100644
View file @
eefecb81
<
template
>
<div
class=
"select-box"
>
<a-select
:value=
"value"
placeholder=
"请选择"
@
change=
"changeVal"
>
<a-select-option
v-for=
"(v, key) in options"
:key=
"key"
:value=
"key"
>
{{
v
}}
</a-select-option>
</a-select>
</div>
</
template
>
<
script
>
import
local
from
"
@/utils/local
"
;
import
{
request
}
from
"
@/utils/request
"
;
export
default
{
model
:
{
prop
:
"
value
"
,
event
:
"
change
"
,
},
props
:
{
value
:
{
required
:
true
,
default
:
""
,
},
info
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
{},
},
},
data
()
{
return
{
siteId
:
local
.
getLocal
(
"
siteId
"
),
api
:
process
.
env
.
VUE_APP_API_BASE_URL
,
options
:
{},
};
},
watch
:
{
info
:
{
handler
()
{
this
.
getOptions
();
},
deep
:
true
,
immediate
:
true
,
},
},
methods
:
{
// 获取数据
async
getOptions
()
{
if
(
this
.
$_
.
isEmpty
(
this
.
info
))
return
this
.
options
;
let
{
serviceApi
,
fieldTypeValue
}
=
this
.
info
;
let
fieldType
=
JSON
.
parse
(
fieldTypeValue
);
if
(
!
serviceApi
&&
fieldTypeValue
)
{
this
.
options
=
fieldType
;
}
else
if
(
serviceApi
)
{
let
res
=
await
request
(
this
.
api
+
serviceApi
,
"
post
"
,
{
size
:
-
1
,
page
:
1
,
siteId
:
this
.
siteId
,
});
if
(
res
.
data
.
code
==
1
)
{
let
{
data
}
=
res
.
data
.
data
;
const
firstKey
=
Object
.
keys
(
fieldType
)[
0
];
const
firstValue
=
fieldType
[
firstKey
];
data
.
forEach
((
v
)
=>
{
this
.
options
[
v
[
firstValue
]]
=
v
[
firstKey
];
});
this
.
$forceUpdate
();
}
}
},
changeVal
(
val
)
{
this
.
$emit
(
"
change
"
,
val
);
},
},
beforeDestroy
()
{
this
.
options
=
{};
},
};
</
script
>
<
style
lang=
"less"
scoped
>
.select-box {
width: 100%;
}
</
style
>
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue
View file @
eefecb81
...
@@ -49,8 +49,8 @@
...
@@ -49,8 +49,8 @@
<img
<img
class=
"cover"
class=
"cover"
v-if=
"text.cover"
v-if=
"text.cover"
:src=
"
api2 +
text.cover"
:src=
"text.cover"
@
click=
"handlePreview(
api2 +
text.cover)"
@
click=
"handlePreview(text.cover)"
/>
/>
<span
v-else
>
--
</span>
<span
v-else
>
--
</span>
</
template
>
</
template
>
...
@@ -132,8 +132,6 @@ export default {
...
@@ -132,8 +132,6 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
columns
,
columns
,
siteId
:
local
.
getLocal
(
"
siteId
"
),
siteId
:
local
.
getLocal
(
"
siteId
"
),
tableData
:
[],
// 表格数据
tableData
:
[],
// 表格数据
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
View file @
eefecb81
...
@@ -83,7 +83,7 @@
...
@@ -83,7 +83,7 @@
v-if=
"text.video"
v-if=
"text.video"
width=
"50"
width=
"50"
:src=
"filterRes(text.video)"
:src=
"filterRes(text.video)"
@
click=
"handlePreview('video',
api2 +
text.video)"
@
click=
"handlePreview('video', text.video)"
/>
/>
<span
v-else
>
--
</span>
<span
v-else
>
--
</span>
</
template
>
</
template
>
...
@@ -320,7 +320,7 @@ export default {
...
@@ -320,7 +320,7 @@ export default {
// 过滤影音
// 过滤影音
filterRes
(
data
)
{
filterRes
(
data
)
{
let
resource
=
data
.
split
(
"
,
"
).
map
((
v
)
=>
{
let
resource
=
data
.
split
(
"
,
"
).
map
((
v
)
=>
{
return
this
.
api2
+
v
;
return
v
;
});
});
return
resource
[
0
];
return
resource
[
0
];
...
@@ -328,7 +328,7 @@ export default {
...
@@ -328,7 +328,7 @@ export default {
// 预览
// 预览
handlePreview
(
type
,
data
)
{
handlePreview
(
type
,
data
)
{
let
resource
=
data
.
split
(
"
,
"
).
map
((
v
)
=>
{
let
resource
=
data
.
split
(
"
,
"
).
map
((
v
)
=>
{
return
this
.
api2
+
v
;
return
v
;
});
});
if
(
type
==
"
img
"
)
{
if
(
type
==
"
img
"
)
{
this
.
$viewerApi
({
this
.
$viewerApi
({
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue
View file @
eefecb81
...
@@ -56,8 +56,8 @@
...
@@ -56,8 +56,8 @@
class=
"pointer"
class=
"pointer"
height=
"20"
height=
"20"
width=
"20"
width=
"20"
:src=
"
api2 +
text.appIconPath"
:src=
"text.appIconPath"
@
click=
"handlePreview(
api2 +
text.appIconPath)"
@
click=
"handlePreview(text.appIconPath)"
/>
/>
<span
v-else
>
--
</span>
<span
v-else
>
--
</span>
</
template
>
</
template
>
...
@@ -203,7 +203,6 @@ export default {
...
@@ -203,7 +203,6 @@ export default {
data
()
{
data
()
{
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
columns
,
columns
,
siteId
:
local
.
getLocal
(
"
siteId
"
),
siteId
:
local
.
getLocal
(
"
siteId
"
),
tableData
:
[],
// 表格数据
tableData
:
[],
// 表格数据
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
View file @
eefecb81
...
@@ -56,8 +56,8 @@
...
@@ -56,8 +56,8 @@
class=
"pointer"
class=
"pointer"
height=
"20"
height=
"20"
width=
"20"
width=
"20"
:src=
"
api2 +
text.appIconPath"
:src=
"text.appIconPath"
@
click=
"handlePreview(
api2 +
text.appIconPath)"
@
click=
"handlePreview(text.appIconPath)"
/>
/>
<span
v-else
>
--
</span>
<span
v-else
>
--
</span>
</
template
>
</
template
>
...
@@ -203,7 +203,6 @@ export default {
...
@@ -203,7 +203,6 @@ export default {
data
()
{
data
()
{
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
columns
,
columns
,
siteId
:
local
.
getLocal
(
"
siteId
"
),
siteId
:
local
.
getLocal
(
"
siteId
"
),
tableData
:
[],
// 表格数据
tableData
:
[],
// 表格数据
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue
View file @
eefecb81
...
@@ -182,7 +182,6 @@ export default {
...
@@ -182,7 +182,6 @@ export default {
return
{
return
{
accept
:
"
image/jpeg,image/png,image/svg+xml
"
,
accept
:
"
image/jpeg,image/png,image/svg+xml
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
iconFileList
:
[],
iconFileList
:
[],
labelCol
:
{
labelCol
:
{
span
:
3
,
span
:
3
,
...
@@ -307,17 +306,25 @@ export default {
...
@@ -307,17 +306,25 @@ export default {
return
isJpgOrPng
&&
isLt5M
;
return
isJpgOrPng
&&
isLt5M
;
},
},
// 上传图标
// 上传图标
handleChangeIcon
({
fileList
})
{
handleChangeIcon
({
file
,
fileList
})
{
if
(
file
.
status
&&
file
.
status
!=
"
removed
"
&&
file
.
response
&&
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
file
.
response
.
msg
);
fileList
=
fileList
.
filter
((
file
)
=>
file
.
response
.
code
!=
-
1
);
}
this
.
iconFileList
=
[...
fileList
].
slice
(
-
1
);
this
.
iconFileList
=
[...
fileList
].
slice
(
-
1
);
this
.
iconFileList
=
this
.
iconFileList
.
map
((
v
)
=>
{
this
.
iconFileList
=
this
.
iconFileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
iconFileList
[
0
])
{
if
(
this
.
iconFileList
[
0
])
{
this
.
form
.
appIconPath
=
this
.
iconFileList
[
0
].
url
2
;
this
.
form
.
appIconPath
=
this
.
iconFileList
[
0
].
url
;
}
else
{
}
else
{
this
.
form
.
appIconPath
=
""
;
this
.
form
.
appIconPath
=
""
;
}
}
...
@@ -330,6 +337,17 @@ export default {
...
@@ -330,6 +337,17 @@ export default {
},
},
// 上传应用
// 上传应用
handleChangeFile
(
info
)
{
handleChangeFile
(
info
)
{
if
(
info
.
file
.
status
&&
info
.
file
.
status
!=
"
removed
"
&&
info
.
file
.
response
&&
info
.
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
info
.
file
.
response
.
msg
);
info
.
fileList
=
info
.
fileList
.
filter
(
(
file
)
=>
file
.
response
.
code
!=
-
1
);
}
let
fileList
=
[...
info
.
fileList
];
let
fileList
=
[...
info
.
fileList
];
fileList
=
fileList
.
slice
(
-
1
);
fileList
=
fileList
.
slice
(
-
1
);
fileList
=
fileList
.
map
((
file
)
=>
{
fileList
=
fileList
.
map
((
file
)
=>
{
...
@@ -370,8 +388,7 @@ export default {
...
@@ -370,8 +388,7 @@ export default {
uid
:
"
-2
"
,
uid
:
"
-2
"
,
name
:
this
.
form
.
appIconPath
,
name
:
this
.
form
.
appIconPath
,
status
:
"
done
"
,
status
:
"
done
"
,
url
:
this
.
api2
+
this
.
form
.
appIconPath
,
url
:
this
.
form
.
appIconPath
,
url2
:
this
.
form
.
appIconPath
,
},
},
];
];
});
});
...
...
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
View file @
eefecb81
...
@@ -65,7 +65,13 @@
...
@@ -65,7 +65,13 @@
</a-radio>
</a-radio>
</a-radio-group>
</a-radio-group>
<!-- 下拉选择框 -->
<!-- 下拉选择框 -->
<a-select
<AppSelect
v-else-if=
"v.fieldType == 'select'"
:info=
"v"
v-model=
"v.fieldValue"
>
</AppSelect>
<!--
<a-select
v-else-if=
"v.fieldType == 'select'"
v-else-if=
"v.fieldType == 'select'"
v-model=
"v.fieldValue"
v-model=
"v.fieldValue"
placeholder=
"请选择"
placeholder=
"请选择"
...
@@ -77,7 +83,7 @@
...
@@ -77,7 +83,7 @@
>
>
{{
item
}}
{{
item
}}
</a-select-option>
</a-select-option>
</a-select>
</a-select>
-->
<!-- 日期选择器 -->
<!-- 日期选择器 -->
<a-date-picker
<a-date-picker
v-else-if=
"v.fieldType == 'date'"
v-else-if=
"v.fieldType == 'date'"
...
@@ -135,6 +141,7 @@
...
@@ -135,6 +141,7 @@
:action=
"api + '/base/file/commonupload'"
:action=
"api + '/base/file/commonupload'"
:multiple=
"true"
:multiple=
"true"
:file-list=
"v.fileList"
:file-list=
"v.fileList"
:beforeUpload=
"handleBeforeUpload"
@
change=
"
@
change=
"
(info) =>
{
(info) =>
{
handleChange(info, v);
handleChange(info, v);
...
@@ -235,12 +242,14 @@
...
@@ -235,12 +242,14 @@
<
script
>
<
script
>
import
YQuillEditor
from
"
@/components/YQuillEditor.vue
"
;
import
YQuillEditor
from
"
@/components/YQuillEditor.vue
"
;
import
AppSelect
from
"
../components/AppSelect.vue
"
;
import
{
batchSaveDataset
}
from
"
@/services/market
"
;
import
{
batchSaveDataset
}
from
"
@/services/market
"
;
import
{
request
}
from
"
@/utils/request
"
;
import
{
request
}
from
"
@/utils/request
"
;
import
local
from
"
@/utils/local
"
;
import
local
from
"
@/utils/local
"
;
export
default
{
export
default
{
components
:
{
components
:
{
YQuillEditor
,
YQuillEditor
,
AppSelect
,
},
},
props
:
{
props
:
{
title
:
{
title
:
{
...
@@ -387,33 +396,70 @@ export default {
...
@@ -387,33 +396,70 @@ export default {
},
},
// 编辑
// 编辑
onEdit
(
data
)
{
onEdit
(
data
)
{
data
.
appInfoFieldList
.
forEach
((
v
)
=>
{
setTimeout
(()
=>
{
if
(
v
.
fieldType
==
"
upload
"
)
{
data
.
appInfoFieldList
.
forEach
((
v
)
=>
{
if
(
v
.
fieldValue
)
{
if
(
v
.
fieldType
==
"
upload
"
)
{
let
arr
=
v
.
fieldValue
.
split
(
"
,
"
);
if
(
v
.
fieldValue
)
{
v
.
fileList
=
arr
.
map
((
v
,
i
)
=>
{
let
arr
=
v
.
fieldValue
.
split
(
"
,
"
);
return
{
v
.
fileList
=
arr
.
map
((
v
,
i
)
=>
{
uid
:
i
,
return
{
name
:
v
,
uid
:
i
,
status
:
"
done
"
,
name
:
v
,
url
:
v
,
status
:
"
done
"
,
};
url
:
v
,
});
};
}
else
{
});
v
.
fileList
=
[];
}
else
{
}
v
.
fileList
=
[];
}
else
if
(
v
.
fieldType
==
"
checkbox
"
)
{
}
if
(
v
.
fieldValue
)
{
}
else
if
(
v
.
fieldType
==
"
checkbox
"
)
{
v
.
checkbox
=
v
.
fieldValue
.
split
(
"
,
"
);
if
(
v
.
fieldValue
)
{
}
else
{
v
.
checkbox
=
v
.
fieldValue
.
split
(
"
,
"
);
v
.
checkbox
=
[];
}
else
{
v
.
checkbox
=
[];
}
}
}
}
});
this
.
form
=
{
...
data
};
},
10
);
},
// 更改文件名称
renameFile
(
originalFile
,
newName
)
{
return
new
File
([
originalFile
],
newName
,
{
type
:
originalFile
.
type
,
lastModified
:
originalFile
.
lastModified
,
});
});
this
.
form
=
{
...
data
};
},
},
// 文件上传
handleBeforeUpload
(
file
)
{
let
index
=
file
.
name
.
lastIndexOf
(
"
.
"
);
let
fileName
=
file
.
name
.
slice
(
0
,
index
);
let
suffix
=
file
.
name
.
slice
(
index
);
let
uid
=
file
.
uid
;
if
(
fileName
.
length
>=
40
)
{
let
newName
=
fileName
.
slice
(
0
,
40
)
+
"
...
"
+
suffix
;
let
newFile
=
this
.
renameFile
(
file
,
newName
);
newFile
.
uid
=
uid
;
return
new
Promise
((
resolve
)
=>
{
resolve
(
newFile
);
});
}
},
// 文件上传状态变化
handleChange
(
info
,
row
)
{
handleChange
(
info
,
row
)
{
if
(
info
.
file
.
status
&&
info
.
file
.
status
!=
"
removed
"
&&
info
.
file
.
response
&&
info
.
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
info
.
file
.
response
.
msg
);
info
.
fileList
=
info
.
fileList
.
filter
(
(
file
)
=>
file
.
response
.
code
!=
-
1
);
}
let
fileList
=
[...
info
.
fileList
];
let
fileList
=
[...
info
.
fileList
];
// fileList = fileList.slice(-1);
// fileList = fileList.slice(-1);
fileList
=
fileList
.
map
((
file
)
=>
{
fileList
=
fileList
.
map
((
file
)
=>
{
...
@@ -570,4 +616,4 @@ export default {
...
@@ -570,4 +616,4 @@ export default {
// .ant-calendar-picker {
// .ant-calendar-picker {
// width: 40%;
// width: 40%;
// }
// }
</
style
>
</
style
>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue
View file @
eefecb81
...
@@ -69,7 +69,6 @@ export default {
...
@@ -69,7 +69,6 @@ export default {
return
{
return
{
accept
:
"
image/jpeg,image/png
"
,
accept
:
"
image/jpeg,image/png
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
fileList
:
[],
fileList
:
[],
form
:
{
form
:
{
siteId
:
local
.
getLocal
(
"
siteId
"
),
// 站点id
siteId
:
local
.
getLocal
(
"
siteId
"
),
// 站点id
...
@@ -117,8 +116,7 @@ export default {
...
@@ -117,8 +116,7 @@ export default {
uid
:
"
-2
"
,
uid
:
"
-2
"
,
name
:
this
.
form
.
cover
,
name
:
this
.
form
.
cover
,
status
:
"
done
"
,
status
:
"
done
"
,
url
:
this
.
api2
+
this
.
form
.
cover
,
url
:
this
.
form
.
cover
,
url2
:
this
.
form
.
cover
,
},
},
];
];
}
}
...
@@ -158,17 +156,25 @@ export default {
...
@@ -158,17 +156,25 @@ export default {
return
isJpgOrPng
&&
isLt10M
;
return
isJpgOrPng
&&
isLt10M
;
},
},
// 上传封面
// 上传封面
handleChangeCover
({
fileList
})
{
handleChangeCover
({
file
,
fileList
})
{
if
(
file
.
status
&&
file
.
status
!=
"
removed
"
&&
file
.
response
&&
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
file
.
response
.
msg
);
fileList
=
fileList
.
filter
((
file
)
=>
file
.
response
.
code
!=
-
1
);
}
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
fileList
[
0
])
{
if
(
this
.
fileList
[
0
])
{
this
.
form
.
cover
=
this
.
fileList
[
0
].
url
2
;
this
.
form
.
cover
=
this
.
fileList
[
0
].
url
;
}
else
{
}
else
{
this
.
form
.
cover
=
""
;
this
.
form
.
cover
=
""
;
}
}
...
...
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
View file @
eefecb81
...
@@ -56,16 +56,13 @@
...
@@ -56,16 +56,13 @@
<!-- 模块图标 -->
<!-- 模块图标 -->
<
template
slot=
"modelIcon"
slot-scope=
"text"
>
<
template
slot=
"modelIcon"
slot-scope=
"text"
>
<div
v-if=
"text.modelIcon"
>
<div
v-if=
"text.modelIcon"
>
<!--
<div
class=
"svg-box"
v-if=
"isSvg(text.modelIcon)"
>
<img
width=
"30"
height=
"30"
:src=
"api2 + text.modelIcon"
/>
</div>
-->
<div
class=
"svg-box"
>
<div
class=
"svg-box"
>
<img
<img
class=
"pointer"
class=
"pointer"
width=
"30"
width=
"30"
height=
"30"
height=
"30"
:src=
"
api2 +
text.modelIcon"
:src=
"text.modelIcon"
@
click=
"handlePreview(
{ url:
api2 +
text.modelIcon })"
@
click=
"handlePreview(
{ url: text.modelIcon })"
/>
/>
</div>
</div>
</div>
</div>
...
@@ -301,7 +298,6 @@ export default {
...
@@ -301,7 +298,6 @@ export default {
return
{
return
{
pageSizeOptions
,
pageSizeOptions
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
accept
:
"
image/jpeg,image/png,image/svg+xml
"
,
// 上传类型
accept
:
"
image/jpeg,image/png,image/svg+xml
"
,
// 上传类型
columns
,
columns
,
loading
:
true
,
loading
:
true
,
...
@@ -404,8 +400,7 @@ export default {
...
@@ -404,8 +400,7 @@ export default {
uid
:
-
1
,
uid
:
-
1
,
status
:
"
done
"
,
status
:
"
done
"
,
name
:
this
.
formData
.
modelIcon
,
name
:
this
.
formData
.
modelIcon
,
url
:
this
.
api2
+
this
.
formData
.
modelIcon
,
url
:
this
.
formData
.
modelIcon
,
url2
:
this
.
formData
.
modelIcon
,
},
},
];
];
}
}
...
@@ -471,13 +466,12 @@ export default {
...
@@ -471,13 +466,12 @@ export default {
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
fileList
[
0
])
{
if
(
this
.
fileList
[
0
])
{
this
.
formData
.
modelIcon
=
this
.
fileList
[
0
].
url
2
;
this
.
formData
.
modelIcon
=
this
.
fileList
[
0
].
url
;
}
else
{
}
else
{
this
.
formData
.
modelIcon
=
""
;
this
.
formData
.
modelIcon
=
""
;
}
}
...
...
base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
View file @
eefecb81
...
@@ -347,7 +347,6 @@ export default {
...
@@ -347,7 +347,6 @@ export default {
// };
// };
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
accept
:
"
image/jpeg,image/png
"
,
// 上传类型
accept
:
"
image/jpeg,image/png
"
,
// 上传类型
loading
:
false
,
loading
:
false
,
options
:
regionData
,
// 地区级联数据
options
:
regionData
,
// 地区级联数据
...
@@ -634,8 +633,7 @@ export default {
...
@@ -634,8 +633,7 @@ export default {
uid
:
-
1
,
uid
:
-
1
,
status
:
"
done
"
,
status
:
"
done
"
,
name
:
this
.
formInfo
.
logoPath
,
name
:
this
.
formInfo
.
logoPath
,
url
:
this
.
api2
+
this
.
formInfo
.
logoPath
,
url
:
this
.
formInfo
.
logoPath
,
url2
:
this
.
formInfo
.
logoPath
,
},
},
];
];
}
}
...
@@ -680,17 +678,25 @@ export default {
...
@@ -680,17 +678,25 @@ export default {
return
isJpgOrPng
&&
isLt10M
;
return
isJpgOrPng
&&
isLt10M
;
},
},
// 上传图片
// 上传图片
handleChange
({
fileList
})
{
handleChange
({
file
,
fileList
})
{
if
(
file
.
status
&&
file
.
status
!=
"
removed
"
&&
file
.
response
&&
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
file
.
response
.
msg
);
fileList
=
fileList
.
filter
((
file
)
=>
file
.
response
.
code
!=
-
1
);
}
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
fileList
[
0
])
{
if
(
this
.
fileList
[
0
])
{
this
.
formInfo
.
logoPath
=
this
.
fileList
[
0
].
url
2
;
this
.
formInfo
.
logoPath
=
this
.
fileList
[
0
].
url
;
}
else
{
}
else
{
this
.
formInfo
.
logoPath
=
""
;
this
.
formInfo
.
logoPath
=
""
;
}
}
...
...
base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue
View file @
eefecb81
...
@@ -536,8 +536,7 @@ export default {
...
@@ -536,8 +536,7 @@ export default {
uid
:
-
1
,
uid
:
-
1
,
status
:
"
done
"
,
status
:
"
done
"
,
name
:
this
.
form
.
photoPath
,
name
:
this
.
form
.
photoPath
,
url
:
this
.
api2
+
this
.
form
.
photoPath
,
url
:
this
.
form
.
photoPath
,
url2
:
this
.
form
.
photoPath
,
},
},
];
];
}
}
...
@@ -559,17 +558,25 @@ export default {
...
@@ -559,17 +558,25 @@ export default {
this
.
$refs
.
formData
.
resetFields
();
this
.
$refs
.
formData
.
resetFields
();
},
},
// 照片上传
// 照片上传
handleChange
({
fileList
})
{
handleChange
({
file
,
fileList
})
{
if
(
file
.
status
&&
file
.
status
!=
"
removed
"
&&
file
.
response
&&
file
.
response
.
code
==
-
1
)
{
this
.
$message
.
error
(
file
.
response
.
msg
);
fileList
=
fileList
.
filter
((
file
)
=>
file
.
response
.
code
!=
-
1
);
}
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
fileList
[
0
])
{
if
(
this
.
fileList
[
0
])
{
this
.
form
.
photoPath
=
this
.
fileList
[
0
].
url
2
;
this
.
form
.
photoPath
=
this
.
fileList
[
0
].
url
;
}
else
{
}
else
{
this
.
form
.
photoPath
=
""
;
this
.
form
.
photoPath
=
""
;
}
}
...
...
base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue
View file @
eefecb81
...
@@ -414,7 +414,6 @@ export default {
...
@@ -414,7 +414,6 @@ export default {
};
};
return
{
return
{
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
accept
:
"
image/jpeg,image/png
"
,
// 上传类型
accept
:
"
image/jpeg,image/png
"
,
// 上传类型
fileList
:
[],
fileList
:
[],
loading
:
false
,
loading
:
false
,
...
@@ -577,8 +576,7 @@ export default {
...
@@ -577,8 +576,7 @@ export default {
uid
:
-
1
,
uid
:
-
1
,
status
:
"
done
"
,
status
:
"
done
"
,
name
:
this
.
form
.
photoPath
,
name
:
this
.
form
.
photoPath
,
url
:
this
.
api2
+
this
.
form
.
photoPath
,
url
:
this
.
form
.
photoPath
,
url2
:
this
.
form
.
photoPath
,
},
},
];
];
}
}
...
@@ -598,13 +596,12 @@ export default {
...
@@ -598,13 +596,12 @@ export default {
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
[...
fileList
].
slice
(
-
1
);
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
this
.
fileList
=
this
.
fileList
.
map
((
v
)
=>
{
if
(
v
.
response
)
{
if
(
v
.
response
)
{
v
.
url2
=
v
.
response
.
url
;
v
.
url
=
v
.
response
.
url
;
v
.
url
=
this
.
api2
+
v
.
response
.
url
;
}
}
return
v
;
return
v
;
});
});
if
(
this
.
fileList
[
0
])
{
if
(
this
.
fileList
[
0
])
{
this
.
form
.
photoPath
=
this
.
fileList
[
0
].
url
2
;
this
.
form
.
photoPath
=
this
.
fileList
[
0
].
url
;
}
else
{
}
else
{
this
.
form
.
photoPath
=
""
;
this
.
form
.
photoPath
=
""
;
}
}
...
...
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @
eefecb81
...
@@ -228,8 +228,8 @@
...
@@ -228,8 +228,8 @@
<
template
slot=
"pic"
slot-scope=
"text"
>
<
template
slot=
"pic"
slot-scope=
"text"
>
<img
<img
v-if=
"text.photoPath"
v-if=
"text.photoPath"
:src=
"
api2 +
text.photoPath"
:src=
"text.photoPath"
@
click=
"handlePreview(
api2 +
text.photoPath)"
@
click=
"handlePreview(text.photoPath)"
class=
"pht"
class=
"pht"
/>
/>
...
@@ -408,7 +408,6 @@ export default {
...
@@ -408,7 +408,6 @@ export default {
visibleEditPwd
:
false
,
visibleEditPwd
:
false
,
editVisible
:
false
,
editVisible
:
false
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api
:
process
.
env
.
VUE_APP_API_BASE_URL
+
"
/
"
,
api2
:
process
.
env
.
VUE_APP_API_IMG_URL
,
siteId
:
local
.
getLocal
(
"
siteId
"
),
siteId
:
local
.
getLocal
(
"
siteId
"
),
deptData
:
[],
// 部门数据
deptData
:
[],
// 部门数据
windowData
:
[],
// 窗口数据
windowData
:
[],
// 窗口数据
...
...
base-manager-ui/admin/vue.config.js
View file @
eefecb81
...
@@ -49,6 +49,11 @@ module.exports = {
...
@@ -49,6 +49,11 @@ module.exports = {
},
},
// cookieDomainRewrite: 'localhost',
// cookieDomainRewrite: 'localhost',
},
},
"
/file
"
:
{
//此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致
target
:
process
.
env
.
VUE_APP_API_BASE_URL
,
changeOrigin
:
true
,
},
},
},
},
},
pluginOptions
:
{
pluginOptions
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment