Skip to content

A
apaas-ui
"src/page/main/system/organization/system-user/index.vue" did not exist on "7c0deb5f802e2786c6ff82d639eb1e254d09be2e"
Commit 0986b54d authored by gaoshiyao's avatar gaoshiyao
Browse files
Options

Merge branch 'dev'

parents 8c069f23 47be4751
Hide whitespace changes
Inline Side-by-side
Showing with 1112 additions and 614 deletions
.beagle.yml
View file @ 0986b54d
......@@ -50,7 +50,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
version: v3.0.3
channel: alpha
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com
......@@ -69,8 +69,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -87,7 +87,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -107,7 +107,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
version: v3.0.3
channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -126,8 +126,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -136,7 +136,7 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- master
- [master,dev]
# 生成最终arm版本
latest-arm64:
......@@ -144,7 +144,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -154,7 +154,7 @@ pipeline:
target: REGISTRY_PASSWORD
when:
branch:
- master
- [master,dev]
docker-ppc64le:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
......@@ -163,7 +163,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
version: v3.0.3
channel: alpha-ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -181,8 +181,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -198,7 +198,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -217,7 +217,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.2
version: v3.0.3
channel: alpha-mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -235,8 +235,8 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
......@@ -252,7 +252,7 @@ pipeline:
dns: 223.5.5.5
volumes:
- /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
registry: registry.cn-qingdao.aliyuncs.com
secrets:
......@@ -269,9 +269,7 @@ pipeline:
namespace: apaas-v3
deployment: apaas-ui
container: apaas-ui
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha
registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha
when:
branch:
- dev
config/index.js
View file @ 0986b54d
......@@ -11,8 +11,10 @@ module.exports = {
assetsPublicPath: "/apaas/ui/",
proxyTable: {
"/apaas": {
//target: "https://apaas.cztest.local/apaas/",
target: "https://apaas3.wodcloud.com/apaas/",
changeOrigin: true,
secure: false,//https证书安全设置为false
pathRewrite: {
"^/apaas": ""
}
......
src/components/infoList.vue
View file @ 0986b54d
......@@ -6,19 +6,25 @@
{{ item.title }}
</p>
<p v-if="!(item.prop && item.prop == 'title')">
<span v-if="item.type == 'url'" style="white-space:pre-wrap;">
<span v-if="item.type == 'url'" style="white-space: pre-wrap">
访问地址:
<a :href="item.info" target="_blank">{{ item.info }}</a>
</span>
<span v-else-if="item.type == 'time'">{{ helper.dateStringTransform(item.info) }}</span>
<span v-else v-html="item.info" style="white-space:pre-wrap;"></span>
<span v-else-if="item.type == 'time'">{{
helper.dateStringTransform(item.info)
}}</span>
<span v-else v-html="item.info" style="white-space: pre-wrap"></span>
<span
v-if="item.type && item.type == 'down' && item.url != ''"
class="filebtn"
@click="download(item.url)"
>下载文件</span>
>下载文件</span
>
</p>
<slot v-if="item.type && item.type == 'solt'" :name="item.solt_name"></slot>
<slot
v-if="item.type && item.type == 'solt'"
:name="item.solt_name"
></slot>
</div>
</div>
</template>
......@@ -27,7 +33,7 @@ import helper from "@/services/helper";
export default {
data() {
return {
helper: helper
helper: helper,
};
},
props: ["list_arr"],
......@@ -42,8 +48,8 @@ export default {
a.setAttribute("download", ""); // download属性
a.setAttribute("href", val); // href链接
a.click(); // 自执行点击事件
}
}
},
},
};
</script>
......@@ -54,7 +60,7 @@ a {
.list p {
line-height: 32px;
color: #8890a7;
word-wrap:break-word;
word-wrap: break-word;
}
.list {
margin-bottom: 20px;
......
src/components/menu.vue
View file @ 0986b54d
<template>
<div class="menu">
<img src="../assets/imgs/nav-logo.png" alt class="logo" />
<img
src="../assets/imgs/nav-logo.png"
alt
class="logo"
/>
<div
style="float: right; cursor: pointer; position: relative"
class="user_hover"
......@@ -8,14 +12,20 @@
<span
v-if="userInfo.user_name && userInfo.user_name != ''"
class="user"
>{{ userInfo.user_name }}</span
>
<span v-else @click="gotopage('login')" class="user">请登录</span>
>{{ userInfo.user_name }}</span>
<span
v-else
@click="gotopage('login')"
class="user"
>请登录</span>
<img
:class="userInfo.picture_path && false ? 'user_pic' : 'user_default'"
src="../assets/imgs/home_ic_user.png"
/>
<span class="has_msg" v-if="unreadMessageCount > 0"></span>
<span
class="has_msg"
v-if="unreadMessageCount > 0"
></span>
<!-- 菜单图片不需要动态渲染，只用ui给的图标 -->
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
......@@ -56,7 +66,11 @@
:max="99"
class="number"
></el-badge>
<img src="../assets/imgs/home_ic_shop.png" alt class="car_img" />
<img
src="../assets/imgs/home_ic_shop.png"
alt
class="car_img"
/>
</div>
<div
v-if="userInfo.user_name && userInfo.user_name != ''"
......@@ -75,7 +89,10 @@
class="shop_img"
/>
<div class="shop_cell_msgs">
<p @click="getDetail(item.id)" class="shop_cell_name over_one">
<p
@click="getDetail(item.id)"
class="shop_cell_name over_one"
>
{{
item.service_id == 0
? item.application.app_name
......@@ -106,9 +123,11 @@
</div>
</div>
<div class="shop_footer">
<el-button @click="settlement" size="small" class="shop_settlement"
>去购物车申请结算</el-button
>
<el-button
@click="settlement"
size="small"
class="shop_settlement"
>去购物车申请结算</el-button>
</div>
</div>
<div
......@@ -150,7 +169,10 @@
: { left: '60px' }
"
></div>
<div class="bottom_show" v-if="now_menu == item.visit_url"></div>
<div
class="bottom_show"
v-if="now_menu == item.visit_url"
></div>
</div>
</div>
</div>
......@@ -158,6 +180,9 @@
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
const state = window.serviceConfig.state;
export default {
data() {
......@@ -174,7 +199,7 @@ export default {
shopping_list: [],
menuCartNum: 0,
now_hover: -1,
show_shop_menu: false,
show_shop_menu: false
};
},
mounted() {
......@@ -193,7 +218,7 @@ export default {
},
getRouter() {
return this.$route.path;
},
}
},
watch: {
getMenuCartState(newVal) {
......@@ -207,7 +232,7 @@ export default {
) {
this.now_menu = val;
}
},
}
},
methods: {
change_now_hover(n) {
......@@ -218,7 +243,9 @@ export default {
if (state == "needLogin") {
window.location.href =
gisServiceUrl +
`/portal/sharing/rest/oauth2/signout?client_id=arcgisonline&redirect_uri=${window.location.protocol}//${window.location.host}/iam/api/logout`;
"/" +
gisPortalSiteName +
`/sharing/rest/oauth2/signout?client_id=arcgisonline&redirect_uri=${window.location.protocol}//${window.location.host}/iam/api/logout`;
} else {
window.location.href = "/iam/api/logout";
}
......@@ -234,7 +261,7 @@ export default {
},
deleteItem(id) {
let query = [id];
this.$api.serviceShop.delShoppingCart(query).then((response) => {
this.$api.serviceShop.delShoppingCart(query).then(response => {
if (response.data.success == 1) {
this.$store.commit("setCartState");
this.getList();
......@@ -257,6 +284,8 @@ export default {
} else if (parent == "/services_shop") {
this.$store.commit("serviceShopMenuAct", v.visit_url);
this.$router.push(v.visit_url);
} else if (v.visit_url.indexOf("#") > 0) {
window.open(v.visit_url);
} else {
this.$router.push(v.visit_url);
}
......@@ -264,7 +293,7 @@ export default {
}
},
getList() {
this.$api.serviceShop.getShoppingCart().then((response) => {
this.$api.serviceShop.getShoppingCart().then(response => {
if (response.data.success == "1") {
this.menuCartNum = response.data.data.valid
? response.data.data.valid.length
......@@ -282,12 +311,12 @@ export default {
console.log(this.now_menu);
},
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then((response) => {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
if (response.data.success == 1) {
let arr =
(response.data.data[0] && response.data.data[0].Child) || [];
let shop_index = arr.findIndex(
(item) => item.visit_url == "/shop/shopping_cart"
item => item.visit_url == "/shop/shopping_cart"
);
if (shop_index != -1) {
arr.splice(shop_index, 1);
......@@ -295,7 +324,7 @@ export default {
} else {
this.show_shop_menu = false;
}
let user_index = arr.findIndex((item) => item.visit_url == "/user");
let user_index = arr.findIndex(item => item.visit_url == "/user");
if (user_index != -1) {
this.user_arr = arr[user_index].Child;
arr.splice(user_index, 1);
......@@ -305,8 +334,8 @@ export default {
this.getMenuIndex();
}
});
},
},
}
}
};
</script>
......
src/components/service-info/map-view.vue
View file @ 0986b54d
<template>
<div class="map_view">
<a class="map_view_action" href="#" @click.prevent.stop="viewAction">
<a
v-if="showView"
class="map_view_action"
href="#"
@click.prevent.stop="viewAction"
>
<img :src="require('../../assets/imgs/ic_yulan.png')" />
</a>
......@@ -13,7 +18,11 @@
:before-close="beforeClose"
>
<div class="map_view_container">
<iframe v-if="src" :src="src" frameborder="0"></iframe>
<iframe
v-if="src"
:src="src"
frameborder="0"
></iframe>
</div>
</el-dialog>
</transition>
......@@ -22,29 +31,41 @@
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
export default {
name: "map-view",
data: () => ({
showDialog: false,
src: "",
showView: false,
src: ""
}),
props: {
id: {
type: [String, Number],
required: true,
},
required: true
}
},
methods: {
viewAction() {
this.src = gisServiceUrl + `/portal/apaasplat/viewer/previewMap.html?id=${this.id}`;
this.src =
gisServiceUrl +
"/" +
gisPortalSiteName +
`/apaasplat/viewer/previewMap.html?id=${this.id}`;
this.showDialog = true;
},
beforeClose(done) {
this.src = "";
done();
},
}
},
mounted() {
this.showView =
window.serviceConfig && window.serviceConfig.state == "needLogin";
}
};
</script>
......
src/components/service-info/process-view.vue
View file @ 0986b54d
<template>
<div class="map_view">
<a class="map_view_action" href="#" @click.prevent.stop="viewAction">
<a
v-if="showView"
class="map_view_action"
href="#"
@click.prevent.stop="viewAction"
>
<img :src="require('../../assets/imgs/ic_yulan.png')" />
</a>
......@@ -13,7 +18,11 @@
:before-close="beforeClose"
>
<div class="map_view_container">
<workflows-view :zoom="0.8" :id="id" :hideDetail="true"></workflows-view>
<workflows-view
:zoom="0.8"
:id="id"
:hideDetail="true"
></workflows-view>
</div>
</el-dialog>
</transition>
......@@ -21,19 +30,20 @@
</template>
<script>
import workflowsView from '@/components/work-flow/workflows-view'
import workflowsView from "@/components/work-flow/workflows-view";
export default {
name: "map-view",
components:{
workflowsView
components: {
workflowsView
},
data: () => ({
showDialog: false,
showView: false
}),
props: {
id: {
type: Number,
required: true,
required: true
}
},
methods: {
......@@ -42,8 +52,12 @@ export default {
},
beforeClose(done) {
done();
},
}
},
mounted() {
this.showView =
window.serviceConfig && window.serviceConfig.state == "needLogin";
}
};
</script>
......
src/components/service-list/service_shop_menu-new.vue
View file @ 0986b54d
......@@ -97,8 +97,8 @@ export default {
item.default = "shop_nav_iv_chanpinzy";
break;
default:
item.active = "1";
item.default = "1";
item.active = "shop_tool_ic_sjfw_sel";
item.default = "shop_tool_ic_sjfw";
break;
}
});
......
src/pages/data-analysis/my-service.vue
View file @ 0986b54d
......@@ -478,31 +478,11 @@ export default {
},
], // 服务状态统计
starlistData: [
{
star: 5,
count: 0,
unit: "个",
},
{
star: 4,
count: 0,
unit: "个",
},
{
star: 3,
count: 0,
unit: "个",
},
{
star: 2,
count: 0,
unit: "个",
},
{
star: 1,
count: 0,
unit: "个",
},
{ star: 5, count: 0, unit: "个" },
{ star: 4, count: 0, unit: "个" },
{ star: 3, count: 0, unit: "个" },
{ star: 2, count: 0, unit: "个" },
{ star: 1, count: 0, unit: "个" },
], // 服务评分
starlistTotal: 0,
hotSearchHeader: [], // 热门搜索 表头
......
src/pages/data-analysis/org-service.vue
View file @ 0986b54d
......@@ -497,8 +497,14 @@ export default {
toplistTargetValue: 40, // 服务调用排名分析 目标值
commentlistData: [], // 服务评价
linelistData: [], // 服务状态统计
starlistData: [], // 服务评分
starlistTotal: 15,
starlistData: [
{ star: 5, count: 0, unit: "个" },
{ star: 4, count: 0, unit: "个" },
{ star: 3, count: 0, unit: "个" },
{ star: 2, count: 0, unit: "个" },
{ star: 1, count: 0, unit: "个" },
], // 服务评分
starlistTotal: 0,
hotSearchHeader: [], // 热门搜索 表头
hotSearchData: [], // 热门搜索 数据
graph_arr: {
......@@ -951,4 +957,4 @@ export default {
word-break: break-all;
white-space: nowrap;
}
</style>
\ No newline at end of file
</style>
src/pages/data-analysis/super-service.vue
View file @ 0986b54d
......@@ -495,8 +495,14 @@ export default {
toplistTargetValue: 40, // 服务调用排名分析 目标值
commentlistData: [], // 服务评价
linelistData: [], // 服务状态统计
starlistData: [], // 服务评分
starlistTotal: 15,
starlistData: [
{ star: 5, count: 0, unit: "个" },
{ star: 4, count: 0, unit: "个" },
{ star: 3, count: 0, unit: "个" },
{ star: 2, count: 0, unit: "个" },
{ star: 1, count: 0, unit: "个" },
], // 评分
starlistTotal: 10,
hotSearchHeader: [], // 热门搜索 表头
hotSearchData: [], // 热门搜索 数据
graph_arr: {
......@@ -715,26 +721,30 @@ export default {
})
.then((response) => {
if (response.data.success == 1) {
let _data = response.data.data;
if (this.right_3_state == 0) {
let data = response.data.data || [];
this.commentlistData = data.concat(this.commentlistData);
_data = _data || [];
this.commentlistData = _data.concat(this.commentlistData);
if (this.commentlistData && this.commentlistData.length != 0) {
this.last_id = this.commentlistData[0].last_id;
}
} else {
let data = response.data.data;
this.starlistData[0].count = data.score5;
this.starlistData[1].count = data.score4;
this.starlistData[2].count = data.score3;
this.starlistData[3].count = data.score2;
this.starlistData[4].count = data.score1;
this.starlistTotal =
data.score5 +
data.score4 +
data.score3 +
data.score2 +
data.score1;
console.log(this.starlistData, this.starlistTotal);
if (_data) {
this.starlistData[0].count = _data.score5;
this.starlistData[1].count = _data.score4;
this.starlistData[2].count = _data.score3;
this.starlistData[3].count = _data.score2;
this.starlistData[4].count = _data.score1;
this.starlistTotal =
_data.score5 +
_data.score4 +
_data.score3 +
_data.score2 +
_data.score1;
}
}
}
});
......@@ -957,4 +967,4 @@ export default {
word-break: break-all;
white-space: nowrap;
}
</style>
\ No newline at end of file
</style>
src/pages/service_shop/shop_car_apply.vue
View file @ 0986b54d
......@@ -14,17 +14,16 @@
</info-list>
<div class="footout">
<span class="applybtn" @click="sub_service()">提交申请</span>
<span
class="applybtn"
@click="sub_service()"
>提交申请</span>
<div class="count_money">
<p>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span
><span>金币</span>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span><span>金币</span>
</p>
<p>
<span>共{{ service_arr.length }}项服务</span
><span
>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;账户余额: {{ now_money }}金币</span
>
<span>共{{ service_arr.length }}项服务</span><span>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;账户余额: {{ now_money }}金币</span>
</p>
</div>
</div>
......@@ -40,14 +39,14 @@ export default {
components: {
infoList,
applyForm,
serviceList,
serviceList
},
data() {
return {
formInline: {
depart: "",
preson: "",
phone: "",
phone: ""
},
all_cost: 0,
now_money: 0,
......@@ -55,13 +54,13 @@ export default {
{
title: "服务申请",
type: "solt",
solt_name: "apply_info",
solt_name: "apply_info"
},
{
title: "申请的服务",
type: "solt",
solt_name: "apply_service",
},
solt_name: "apply_service"
}
],
post_arr: [],
service_arr: [
......@@ -112,18 +111,18 @@ export default {
"",
{
name: "共享",
val: "share",
val: "share"
},
{
name: "受限",
val: "limit",
val: "limit"
},
{
name: "敏感",
val: "mg",
},
val: "mg"
}
],
temp_sub_arr: [],
temp_sub_arr: []
};
},
watch: {},
......@@ -136,7 +135,7 @@ export default {
} else {
// console.log(JSON.parse(window.sessionStorage.getItem("shoppingCart")));
var temp_arr = [];
JSON.parse(window.sessionStorage.getItem("shoppingCart")).forEach((e) => {
JSON.parse(window.sessionStorage.getItem("shoppingCart")).forEach(e => {
temp_arr.push(e.id);
});
this.get_car_list(temp_arr);
......@@ -146,7 +145,7 @@ export default {
mounted() {},
methods: {
get_account_money() {
this.$http.get(`/apaas/backmgt/user/myAccount`).then((res) => {
this.$http.get(`/apaas/backmgt/user/myAccount`).then(res => {
if (res.data.success) {
this.now_money = res.data.data.account_balance || 0;
}
......@@ -155,7 +154,7 @@ export default {
get_one_app(app_data) {
this.$http
.get(`/apaas/serviceapp/v3/shopcart/appinfo?app_id=${app_data.app_id}`)
.then((response) => {
.then(response => {
console.log(response);
let data = response.data.data;
if (response.data.success && data) {
......@@ -189,7 +188,7 @@ export default {
.get(
`/apaas/serviceapp/v3/shopcart/serviceinfo?service_id=${service_data.service_id}`
)
.then((response) => {
.then(response => {
console.log(response);
let data = response.data.data;
if (response.data.success && data) {
......@@ -209,14 +208,14 @@ export default {
objs.tips = [
{
tip: this.share_arr[data.openness].name,
type: this.share_arr[data.openness].val,
},
type: this.share_arr[data.openness].val
}
];
objs.auth = data.organization_name;
objs.size = "";
objs.count = "";
let request_spcs_info = data.request_spcs_info || [];
request_spcs_info.forEach((el) => {
request_spcs_info.forEach(el => {
if (service_data.spec_id == el.id) {
let size = "";
let count = "";
......@@ -249,7 +248,7 @@ export default {
.catch(() => {});
},
deal_data(data) {
data.forEach((e) => {
data.forEach(e => {
if (e.selected) {
e.selected = 1;
} else {
......@@ -262,7 +261,7 @@ export default {
},
abc() {
return new Promise((resolve, reject) => {
this.$refs.apply_info.$refs.ruleForm.validate((valid) => {
this.$refs.apply_info.$refs.ruleForm.validate(valid => {
console.log(valid);
if (valid) {
flag = true;
......@@ -279,13 +278,13 @@ export default {
});
},
sub_service() {
if (this.all_cost > this.now_money) {
if (parseFloat(this.all_cost) > parseFloat(this.now_money)) {
this.$message.error("余额不足，请进行充值");
return;
}
let formInline = this.$refs.apply_info.formInline;
let flag = null;
this.$refs.apply_info.$refs.ruleForm.validate((valid) => {
this.$refs.apply_info.$refs.ruleForm.validate(valid => {
console.log(valid);
if (valid) {
var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
......@@ -296,9 +295,9 @@ export default {
var temp = {
apply_part: {
o_name: formInline.preson,
o_mobile: formInline.phone,
o_mobile: formInline.phone
},
carts: [],
carts: []
};
var temp1 = this.$refs.apply_service.$refs.apply_service_state;
this.post_arr.forEach((e, idx) => {
......@@ -313,7 +312,7 @@ export default {
app_id: 0,
scene: temp1[idx].sceneinput,
apply_file: temp1[idx].fileList,
apply_fields: [],
apply_fields: []
});
// 判断表格ref是否存在
this.temp_sub_arr = temp1[idx].$refs.apply_service_state_table
......@@ -334,7 +333,7 @@ export default {
app_id: e.app_id,
scene: this.$refs.apply_service.$refs.apply_service_state[idx]
.sceneinput,
apply_file: "",
apply_file: ""
});
}
});
......@@ -351,7 +350,7 @@ export default {
this.$http
.post(`/apaas/serviceapp/v3/shopcart/apply`, temp)
.then((response) => {
.then(response => {
console.log(response);
if (response.data.success) {
this.$store.commit("setMenuCartState");
......@@ -376,10 +375,10 @@ export default {
var temp_cost = 0;
this.$http
.get(`/apaas/serviceapp/v3/shopcart/list`)
.then((response) => {
.then(response => {
console.log(response);
let data = response.data.data.valid;
data.forEach((e) => {
data.forEach(e => {
if (car_arr.indexOf(e.id) == -1) {
return;
}
......@@ -412,8 +411,8 @@ export default {
this.service_arr[l]["tips"] = [
{
tip: this.share_arr[e.service.openness].name,
type: this.share_arr[e.service.openness].val,
},
type: this.share_arr[e.service.openness].val
}
];
this.service_arr[l]["auth"] = e.service.organization_name;
this.service_arr[l]["size"] = "";
......@@ -452,7 +451,7 @@ export default {
this.all_cost = temp_cost;
// this.service_arr =
})
.catch((response) => {});
.catch(response => {});
},
floatAdd(arg1, arg2) {
let r1, r2, m, c;
......@@ -485,8 +484,8 @@ export default {
arg2 = Number(arg2.toString().replace(".", ""));
}
return (arg1 + arg2) / m;
},
},
}
}
};
</script>
......
src/pages/user/user_info.vue
View file @ 0986b54d
<template>
<div>
<el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item :to="{ path: '/user' }">{{ $t("lang.personal_center") }}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/user' }">{{
$t("lang.personal_center")
}}</el-breadcrumb-item>
<el-breadcrumb-item>{{ $t("lang.profile") }}</el-breadcrumb-item>
</el-breadcrumb>
<block-radius class="info_block">
<el-tabs v-if="is_admin == 3 || is_admin == 4" v-model="activeName" @tab-click="changeTab">
<el-tabs
v-if="is_admin == 3 || is_admin == 4"
v-model="activeName"
@tab-click="changeTab"
>
<el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
<el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
</el-tabs>
......@@ -17,8 +23,14 @@
</el-form-item>
<el-form-item class="info_item info_item_right_btn">
<p>密码：</p>
<el-input type="password" v-model="user_data.password" :disabled="true"></el-input>
<el-button class="option_btn" @click="changePassword">修改密码</el-button>
<el-input
type="password"
v-model="user_data.password"
:disabled="true"
></el-input>
<el-button class="option_btn" @click="changePassword"
>修改密码</el-button
>
</el-form-item>
<el-form-item class="info_item" prop="nickname">
<p>昵称：</p>
......@@ -49,29 +61,45 @@
</el-form-item>
<el-form-item class="info_item">
<p>组织机构：</p>
<el-input v-model="user_data.organization" :disabled="true"></el-input>
<el-input
v-model="user_data.organization"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item
:class="user_data.userType == 3 ? 'info_item info_item_right_btn' : 'info_item'"
:class="
user_data.userType == 3
? 'info_item info_item_right_btn'
: 'info_item'
"
>
<p>当前用户类型：</p>
<el-input v-model="user_data.userTypeName" :disabled="true"></el-input>
<el-input
v-model="user_data.userTypeName"
:disabled="true"
></el-input>
<el-button
v-if="user_data.userType == 3 && user_data.is_apply == 0"
class="option_btn"
@click="showUpLevel"
>升级为开发者</el-button>
>升级为开发者</el-button
>
<el-button
v-else-if="user_data.userType == 3 && user_data.is_apply == 1"
type="info"
class="option_btn_gray_dis"
disabled
>升级为开发者</el-button>
>升级为开发者</el-button
>
</el-form-item>
</el-form>
</div>
<div v-show="activeName == '1'">
<el-form ref="formBusiness" :model="formBusiness" :rules="rules_bussiness">
<el-form
ref="formBusiness"
:model="formBusiness"
:rules="rules_bussiness"
>
<el-form-item class="info_item" prop="businessSystemName">
<p>业务系统名：</p>
<el-input v-model="formBusiness.businessSystemName"></el-input>
......@@ -83,9 +111,16 @@
<el-form-item class="info_item">
<p>IP（白名单）：</p>
<div class="ip_block">
<div v-for="(item, index) in formBusiness.ip_white" :key="item" class="ip_item">
<div
v-for="(item, index) in formBusiness.ip_white"
:key="item"
class="ip_item"
>
{{ item }}
<i class="el-icon-close ip_del" @click="delIp(index, 'white')"></i>
<i
class="el-icon-close ip_del"
@click="delIp(index, 'white')"
></i>
</div>
<el-input
v-if="whiteAddShow"
......@@ -93,15 +128,27 @@
v-model="newIpWhite"
@keyup.enter.native="watchKeyboardWhite"
></el-input>
<el-button class="add_ip" @click="addIp('white')" icon="el-icon-plus">增加</el-button>
<el-button
class="add_ip"
@click="addIp('white')"
icon="el-icon-plus"
>增加</el-button
>
</div>
</el-form-item>
<el-form-item class="info_item">
<p>IP（黑名单）：</p>
<div class="ip_block">
<div v-for="(item, index) in formBusiness.ip_black" :key="item" class="ip_item">
<div
v-for="(item, index) in formBusiness.ip_black"
:key="item"
class="ip_item"
>
{{ item }}
<i class="el-icon-close ip_del" @click="delIp(index, 'black')"></i>
<i
class="el-icon-close ip_del"
@click="delIp(index, 'black')"
></i>
</div>
<el-input
v-if="blackAddShow"
......@@ -109,18 +156,33 @@
v-model="newIpBlack"
@keyup.enter.native="watchKeyboardBlack"
></el-input>
<el-button class="add_ip" @click="addIp('black')" icon="el-icon-plus">增加</el-button>
<el-button
class="add_ip"
@click="addIp('black')"
icon="el-icon-plus"
>增加</el-button
>
</div>
</el-form-item>
<el-form-item class="info_item info_item_right_btn_2">
<p>密钥：</p>
<el-input id="keys" v-model="formBusiness.private_token" :disabled="true"></el-input>
<el-input
id="keys"
v-model="formBusiness.private_token"
:disabled="true"
></el-input>
<el-button class="option_btn" @click="copyKey">复制</el-button>
<el-button class="option_btn_gray" @click="resetKey">重置</el-button>
<el-button class="option_btn_gray" @click="resetKey"
>重置</el-button
>
</el-form-item>
<el-form-item class="info_item" prop="description">
<p>描述：</p>
<el-input type="textarea" :rows="2" v-model="formBusiness.description"></el-input>
<el-input
type="textarea"
:rows="2"
v-model="formBusiness.description"
></el-input>
</el-form-item>
</el-form>
</div>
......@@ -137,22 +199,26 @@
<el-form ref="form1" :model="form" :rules="passRules">
<el-form-item class="dia_item">
<p>旧密码：</p>
<el-input v-model="form.passwordOld" autocomplete="new-password"></el-input>
<el-input
v-model="form.passwordOld"
autocomplete="new-password"
type="password"
></el-input>
</el-form-item>
<el-form-item prop="passwordNew" class="dia_item">
<p>新密码：</p>
<el-input
v-model="form.passwordNew"
autocomplete="new-password"
:type="visible1 ? 'password':'text'"
type="password"
>
<span
<!-- <span
slot="suffix"
:title="visible1 ? '显示密码':'隐藏密码'"
:title="visible1 ? '显示密码' : '隐藏密码'"
@click="changePass1()"
style="cursor:pointer;"
:class="visible1 ? 'eye_dis':'eye'"
></span>
style="cursor: pointer"
:class="visible1 ? 'eye_dis' : 'eye'"
></span> -->
</el-input>
</el-form-item>
<el-form-item prop="nextname" class="dia_item">
......@@ -160,15 +226,15 @@
<el-input
v-model="form.nextname"
autocomplete="new-password"
:type="visible2 ? 'password':'text'"
type="password"
>
<span
<!-- <span
slot="suffix"
:title="visible2 ? '显示密码':'隐藏密码'"
:title="visible2 ? '显示密码' : '隐藏密码'"
@click="changePass2()"
style="cursor:pointer;"
:class="visible2 ? 'eye_dis':'eye'"
></span>
style="cursor: pointer"
:class="visible2 ? 'eye_dis' : 'eye'"
></span> -->
</el-input>
</el-form-item>
</el-form>
......@@ -197,6 +263,7 @@
<script>
import BlockRadius from "@/components/general/block-radius";
import UploadFile from "@/components/general/upload_file";
import CryptoJS from "crypto-js"; //加密js
export default {
components: {
BlockRadius,
......@@ -473,8 +540,14 @@ export default {
let query = {
id: this.user_data.accountNo,
form: {
origin_password: this.form.passwordOld,
new_password: this.form.passwordNew,
origin_password: CryptoJS.AES.encrypt(
this.form.passwordOld,
"swuE9cmCZQwrkYRV"
).toString(),
new_password: CryptoJS.AES.encrypt(
this.form.passwordNew,
"swuE9cmCZQwrkYRV"
).toString(),
},
};
this.$api.user.editUserPassword(query).then((response) => {
......@@ -791,4 +864,4 @@ export default {
width: 20px;
right: 10px;
}
</style>
\ No newline at end of file
</style>
src/pages/workbench/component-center/intelligent-drawing/intelligent_appbuilder.vue
View file @ 0986b54d
......@@ -9,56 +9,69 @@
</div>
<div class="main-container">
<iframe ref="intelligent_appbuilder_iframe" width="100%" height="100%" scrolling="no" :src='appbuilderUrl' frameborder="0"></iframe>
<iframe
ref="intelligent_appbuilder_iframe"
width="100%"
height="100%"
scrolling="no"
:src='appbuilderUrl'
frameborder="0"
></iframe>
</div>
</div>
</template>
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
export default {
data() {
return {
originUrl: gisServiceUrl + '/portal/apps/webappbuilder/index.html'
originUrl:
gisServiceUrl +
"/" +
gisPortalSiteName +
"/apps/webappbuilder/index.html"
};
},
computed:{
appbuilderUrl(){
computed: {
appbuilderUrl() {
let _self = this;
if(_self.$route.name == 'intelligent_appbuilder'){
return `${_self.originUrl}?title=${_self.$route.query.title}&tags=${_self.$route.query.tags}&summary=${_self.$route.query.summary}&sharewithwebmap=${_self.$route.query.sharewithwebmap}&webmap=${_self.$route.query.webmap}`
if (_self.$route.name == "intelligent_appbuilder") {
return `${_self.originUrl}?title=${_self.$route.query.title}&tags=${_self.$route.query.tags}&summary=${_self.$route.query.summary}&sharewithwebmap=${_self.$route.query.sharewithwebmap}&webmap=${_self.$route.query.webmap}`;
}
},
getAppBuilderParams() {
return this.$store.state.appBuilderParams;
},
}
},
watch: {
getAppBuilderParams(newVal) {
console.log('智能制图应用程序参数'+newVal)
},
console.log("智能制图应用程序参数" + newVal);
}
},
mounted() {
this.$nextTick(() => {
window.addEventListener('message',this.postmassageevt);
})
window.addEventListener("message", this.postmassageevt);
});
},
methods: {
postmassageevt(event){
postmassageevt(event) {
let data = event.data;
// App Builder发布服务
if (data.cmd == 'appbuildermsg'){
if (data.cmd == "appbuildermsg") {
console.log(data);
this.$store.commit("setAppBuilderParams", data.params);
this.$router.push(`/fwzc/fwcs?map=4`);
}
}
},
destroyed () {
window.removeEventListener('message',this.postmassageevt);
}
destroyed() {
window.removeEventListener("message", this.postmassageevt);
}
};
</script>
<style scoped>
......@@ -80,7 +93,10 @@ export default {
.intelligent_appbuilder-container .apass_breadcrumb {
padding: 0 20px;
}
.intelligent_appbuilder-container .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
.intelligent_appbuilder-container
.apass_breadcrumb
> .el-breadcrumb
.el-breadcrumb__inner {
color: #626de9;
}
.intelligent_appbuilder-container
......
src/pages/workbench/component-center/intelligent-drawing/intelligent_details.vue
View file @ 0986b54d
......@@ -9,63 +9,73 @@
</div>
<div class="main-container">
<iframe ref="intelligent_details_iframe" width="100%" height="100%" scrolling="no" :src='itemUrl' frameborder="0"></iframe>
<iframe
ref="intelligent_details_iframe"
width="100%"
height="100%"
scrolling="no"
:src='itemUrl'
frameborder="0"
></iframe>
</div>
</div>
</template>
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
export default {
data() {
return {
originUrl: gisServiceUrl + '/portal/apaasplat/viewer/item.html',
originUrl:
gisServiceUrl + "/" + gisPortalSiteName + "/apaasplat/viewer/item.html"
};
},
computed:{
itemUrl(){
computed: {
itemUrl() {
let _self = this;
if(_self.$route.name == 'intelligent_details'){
return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=${_self.$route.query.activeMenu}`
if (_self.$route.name == "intelligent_details") {
return `${_self.originUrl}?id=${_self.$route.query.id}&activeMenu=${_self.$route.query.activeMenu}`;
}
}
},
mounted() {
this.$nextTick(() => {
window.addEventListener('message',this.postmassageevt)
})
window.addEventListener("message", this.postmassageevt);
});
},
methods: {
postmassageevt(event){
postmassageevt(event) {
let data = event.data;
// App Builder页面 -- 新窗口打开
if (data.cmd == 'mapviewtoapp'){
if (data.cmd == "mapviewtoapp") {
let params = {
title: data.params.title,
tags: data.params.tags,
sharewithwebmap:data.params.shareWithWebMap,
webmap:data.params.id,
summary: data.params.summary,
sharewithwebmap: data.params.shareWithWebMap,
webmap: data.params.id,
summary: data.params.summary
};
let routeData = this.$router.resolve({
name: "intelligent_appbuilder",
query: params,
query: params
});
window.open(routeData.href, '_blank');
window.open(routeData.href, "_blank");
// this.$store.commit("setAppBuilderParams", data.params);
};
if (data.cmd == 'mapdetailtoview'){
}
if (data.cmd == "mapdetailtoview") {
console.log(data);
this.$store.commit("setZnztDetailsParams", data.params);
this.$router.push('/intelligent_drawing')
this.$router.push("/intelligent_drawing");
}
}
},
destroyed () {
window.removeEventListener('message',this.postmassageevt)
destroyed() {
window.removeEventListener("message", this.postmassageevt);
}
};
</script>
<style scoped>
......@@ -87,7 +97,10 @@ export default {
.intelligent_details-container .apass_breadcrumb {
padding: 0 20px;
}
.intelligent_details-container .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
.intelligent_details-container
.apass_breadcrumb
> .el-breadcrumb
.el-breadcrumb__inner {
color: #626de9;
}
.intelligent_details-container
......
src/pages/workbench/component-center/intelligent-drawing/intelligent_drawing.vue
View file @ 0986b54d
......@@ -8,7 +8,14 @@
</div>
<div class="main-container">
<iframe ref="intelligent_drawing_iframe" width="100%" height="100%" scrolling="no" :src="znztUrl" frameborder="0"></iframe>
<iframe
ref="intelligent_drawing_iframe"
width="100%"
height="100%"
scrolling="no"
:src="znztUrl"
frameborder="0"
></iframe>
</div>
</div>
</template>
......@@ -16,102 +23,109 @@
<script>
import { mapState } from "vuex";
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
export default {
data() {
return {
url: gisServiceUrl + '/portal/apaasplat/viewer/mapViewer.html',
queryType: '',
id: '',
url:
gisServiceUrl +
"/" +
gisPortalSiteName +
"/apaasplat/viewer/mapViewer.html",
queryType: "",
id: ""
};
},
computed:{
...mapState(['znztDetailsParams']),
computed: {
...mapState(["znztDetailsParams"]),
getZnztParams() {
return this.$store.state.znztParams;
},
znztUrl(){
if(this.queryType == 'webmap'){
znztUrl() {
if (this.queryType == "webmap") {
return this.url + `?webmap=${this.id}`;
}else if (this.queryType == 'layers'){
} else if (this.queryType == "layers") {
return this.url + `?layers=${this.id}`;
}else {
return this.url
} else {
return this.url;
}
},
}
},
watch: {
getZnztParams(newVal) {
console.log('智能制图参数'+newVal)
},
console.log("智能制图参数" + newVal);
}
},
mounted() {
this.id = this.znztDetailsParams.id;
this.queryType = this.znztDetailsParams.queryType;
this.$nextTick(() => {
window.addEventListener('message',this.postmassageevt);
})
window.addEventListener("message", this.postmassageevt);
});
},
methods: {
postmassageevt(event){
postmassageevt(event) {
let data = event.data;
// 智能制图发布服务
if (data.cmd == 'mapviewmsg'){
if (data.cmd == "mapviewmsg") {
console.log(data);
this.$store.commit("setZnztParams", data.params);
this.$router.push(`/fwzc/fwcs?map=1`);
}
// App Builder页面 -- 新窗口打开
if (data.cmd == 'mapviewtoapp'){
if (data.cmd == "mapviewtoapp") {
console.log(data);
let params = {
title: data.params.title,
tags: data.params.tags,
sharewithwebmap:data.params.shareWithWebMap,
webmap:data.params.id,
summary: data.params.summary,
sharewithwebmap: data.params.shareWithWebMap,
webmap: data.params.id,
summary: data.params.summary
};
let routeData = this.$router.resolve({
name: "intelligent_appbuilder",
query: params,
query: params
});
window.open(routeData.href, '_blank');
window.open(routeData.href, "_blank");
// this.$store.commit("setAppBuilderParams", data.params);
}
// 智能制图服务详情--新窗口打开
if (data.cmd == 'mapdetailmsg'){
if (data.cmd == "mapdetailmsg") {
console.log(data);
let routeData = this.$router.resolve({
name: "intelligent_details",
query: data.params,
query: data.params
});
window.open(routeData.href, '_blank');
window.open(routeData.href, "_blank");
}
// 智能制图页面跳转
if (data.cmd == 'mapviewurl'){
if (data.cmd == "mapviewurl") {
console.log(data);
switch (data.params.queryType) {
case 'webmap':
this.queryType = 'webmap';
case "webmap":
this.queryType = "webmap";
this.$store.commit("setZnztIdParams", data.params.id);
this.id = data.params.id;
break;
case 'layers':
this.queryType = 'layers';
case "layers":
this.queryType = "layers";
this.$store.commit("setZnztIdParams", data.params.id);
this.id = data.params.id;
break;
default:
this.queryType = '';
this.$store.commit("setZnztIdParams", '');
this.id = '';
this.queryType = "";
this.$store.commit("setZnztIdParams", "");
this.id = "";
break;
}
}
}
},
destroyed () {
window.removeEventListener('message',this.postmassageevt);
}
destroyed() {
window.removeEventListener("message", this.postmassageevt);
}
};
</script>
......@@ -134,7 +148,10 @@ export default {
.intelligent_drawing-container .apass_breadcrumb {
padding: 0 20px;
}
.intelligent_drawing-container .apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
.intelligent_drawing-container
.apass_breadcrumb
> .el-breadcrumb
.el-breadcrumb__inner {
color: #626de9;
}
.intelligent_drawing-container
......
src/pages/workbench/component-center/intelligent-drawing/intelligent_fwzc.vue
View file @ 0986b54d
<template>
<div class="fwcs">
<el-breadcrumb v-if="is_map != 0" separator="/" class="bread_crumb">
<el-breadcrumb
v-if="is_map != 0"
separator="/"
class="bread_crumb"
>
<el-breadcrumb-item :to="{ path: '/workplace' }">在线组件工具</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">智能制图</el-breadcrumb-item>
<el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
</el-breadcrumb>
<el-breadcrumb v-else-if="process_id != ''" separator="/" class="bread_crumb">
<el-breadcrumb
v-else-if="process_id != ''"
separator="/"
class="bread_crumb"
>
<el-breadcrumb-item :to="{ path: '/workplace' }">在线组件工具</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/progress/designer' }">流程设计</el-breadcrumb-item>
<el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
</el-breadcrumb>
<el-breadcrumb v-else separator="/" class="bread_crumb">
<el-breadcrumb
v-else
separator="/"
class="bread_crumb"
>
<el-breadcrumb-item :to="{ path: '/fwzc' }">服务注册</el-breadcrumb-item>
<el-breadcrumb-item v-if="!jcxxtx">服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-else :to="{ path: '/fwzc' }">服务测试</el-breadcrumb-item>
<el-breadcrumb-item
v-else
:to="{ path: '/fwzc' }"
>服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-if="jcxxtx">基础信息填写</el-breadcrumb-item>
</el-breadcrumb>
<div>
<block-radius>
<div class="fwcs_add">
<el-form ref="form" :model="form" :rules="process_id == '' ? rules : rules_process">
<el-form
ref="form"
:model="form"
:rules="process_id == '' ? rules : rules_process"
>
<el-form-item prop="name">
<p class="formname">服务名称：</p>
<el-input v-model="form.name" placeholder="请输入服务名称" class="form_in"></el-input>
<el-input
v-model="form.name"
placeholder="请输入服务名称"
class="form_in"
></el-input>
</el-form-item>
<el-form-item prop="desc">
<p class="formname">服务描述：</p>
<el-input type="textarea" v-model="form.desc" placeholder="请输入服务描述" class="form_in"></el-input>
<el-input
type="textarea"
v-model="form.desc"
placeholder="请输入服务描述"
class="form_in"
></el-input>
</el-form-item>
<el-form-item prop="area">
<p class="formname">服务领域：</p>
<el-select v-model="form.area" placeholder="请选择" class="form_in">
<el-select
v-model="form.area"
placeholder="请选择"
class="form_in"
>
<el-option
v-for="item in optionsArea"
:key="item.id"
......@@ -41,7 +73,11 @@
</el-form-item>
<el-form-item prop="origin">
<p class="formname">所属组织：</p>
<el-input v-model="form.origin" class="form_in" :disabled="true"></el-input>
<el-input
v-model="form.origin"
class="form_in"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item>
<p class="formname">服务封面：</p>
......@@ -56,7 +92,11 @@
</el-form-item>
<el-form-item>
<p class="formname">接口编码：</p>
<el-input v-model="form.code" class="form_in" :disabled="true"></el-input>
<el-input
v-model="form.code"
class="form_in"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item prop="resource">
<p class="formname">开放程度：</p>
......@@ -66,12 +106,18 @@
<el-radio :label="3">敏感</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="is_map != 0" class="btn_footer">
<el-form-item
v-if="is_map != 0"
class="btn_footer"
>
<el-button
class="previous"
@click="goBack('map')"
>{{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}</el-button>
<el-button class="registe" @click="registeMap">服务发布</el-button>
<el-button
class="registe"
@click="registeMap"
>服务发布</el-button>
</el-form-item>
</el-form>
</div>
......@@ -89,6 +135,9 @@
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
import BlockRadius from "@/components/general/block-radius";
import CesTable from "@/components/table/table-um";
import Codes from "@/components/general/codes";
......@@ -101,12 +150,15 @@ export default {
CesTable,
apassDialog,
"v-apaas-code": Codes,
uploadFile,
uploadFile
},
data() {
return {
addPortalItemUrl:
gisServiceUrl + "/portal/apaasplat/viewer/addPortalItem.html",
gisServiceUrl +
"/" +
gisPortalSiteName +
"/apaasplat/viewer/addPortalItem.html",
btnList: [],
activeBtn: null,
serviceUrl: "",
......@@ -115,7 +167,7 @@ export default {
{ label: "GET", value: "GET" },
{ label: "POST", value: "POST" },
{ label: "PUT", value: "PUT" },
{ label: "DELETE", value: "DELETE" },
{ label: "DELETE", value: "DELETE" }
],
optionType1: [{ label: "GET", value: "GET" }],
activeName: 0,
......@@ -125,9 +177,9 @@ export default {
label: "请求字段编码",
prop: "requestEncoding",
type: "input",
align: "left",
align: "left"
},
{ label: "请求值", prop: "requestValue", type: "input", align: "left" },
{ label: "请求值", prop: "requestValue", type: "input", align: "left" }
],
sjfwQqcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
......@@ -137,13 +189,13 @@ export default {
prop: "show_type",
type: "",
align: "left",
width: "140",
width: "140"
},
{
label: "字段名称*",
prop: "label",
type: "input",
align: "left",
align: "left"
},
{
label: "是否必须*",
......@@ -153,11 +205,11 @@ export default {
width: 100,
selectArr: [
{ label: "是", value: 1 },
{ label: "否", value: 0 },
{ label: "否", value: 0 }
],
hasDefault: true,
hasDefault: true
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
sjfwFhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
......@@ -167,9 +219,9 @@ export default {
label: "字段名称*",
prop: "label",
type: "input",
align: "left",
align: "left"
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
zhfwQqcsForm: [
{ label: "请求字段编码", prop: "key", type: "input", align: "left" },
......@@ -181,15 +233,15 @@ export default {
width: 100,
selectArr: [
{ label: "text", value: "text" },
{ label: "file", value: "file" },
],
{ label: "file", value: "file" }
]
},
{
label: "请求值",
prop: "val",
type: "upload",
align: "center",
uploadKey: "field_type",
uploadKey: "field_type"
},
{
label: "操作",
......@@ -199,10 +251,10 @@ export default {
btnList: [
{
type: "primary-del",
label: "删除",
},
],
},
label: "删除"
}
]
}
],
datasZhForm: [],
datasZhwww: [],
......@@ -225,12 +277,12 @@ export default {
area: "",
origin: "",
code: "自动生成",
resource: 1,
resource: 1
},
rules: {
name: [
{ required: true, message: "请输入服务名称", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" }
],
desc: [
{ required: true, message: "请输入服务描述", trigger: "blur" },
......@@ -238,16 +290,18 @@ export default {
min: 0,
max: 200,
message: "服务描述不超过200个字",
trigger: "blur",
},
trigger: "blur"
}
],
area: [
{ required: true, message: "请选择服务领域", trigger: "change" }
],
area: [{ required: true, message: "请选择服务领域", trigger: "change" }],
origin: [
{ required: true, message: "请选择所属组织", trigger: "blur" },
{ required: true, message: "请选择所属组织", trigger: "blur" }
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" },
],
{ required: true, message: "请选择开放程度", trigger: "blur" }
]
},
rules_process: {
name: [
......@@ -256,8 +310,8 @@ export default {
min: 0,
max: 100,
message: "服务名称不超过100个字",
trigger: "blur",
},
trigger: "blur"
}
],
desc: [
{ required: true, message: "请输入服务描述", trigger: "blur" },
......@@ -265,16 +319,16 @@ export default {
min: 0,
max: 400,
message: "服务描述不超过400个字",
trigger: "blur",
},
trigger: "blur"
}
],
area: [{ required: true, message: "请选择服务领域", trigger: "blur" }],
origin: [
{ required: true, message: "请选择所属组织", trigger: "blur" },
{ required: true, message: "请选择所属组织", trigger: "blur" }
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" },
],
{ required: true, message: "请选择开放程度", trigger: "blur" }
]
},
cover: [],
optionsArea: [],
......@@ -294,11 +348,11 @@ export default {
dialogInfo: {
title: "时空服务参数已修改",
msg: "",
submit: null,
submit: null
},
is_portal: false,
portal_id: "",
dataType: "",
dataType: ""
};
},
computed: {},
......@@ -429,9 +483,9 @@ export default {
? this.skfwQqt
: this.activeBtn == 4
? this.zhyyVal
: 0,
: 0
};
this.$api.workbench.fwzcFwcs(query).then((response) => {
this.$api.workbench.fwzcFwcs(query).then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.body_fields = data.body_fields;
......@@ -529,9 +583,9 @@ export default {
},
getOrganization() {
let query = {
id: this.$store.state.userInfo.user_id,
id: this.$store.state.userInfo.user_id
};
this.$api.user.getUserDetail(query).then((request) => {
this.$api.user.getUserDetail(query).then(request => {
if (request.data.success == 1) {
this.form.origin = request.data.data.department;
this.oid = request.data.data.department_id;
......@@ -541,7 +595,7 @@ export default {
});
},
registeMap() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
let query = {};
......@@ -562,7 +616,7 @@ export default {
request_query_fields: [],
response_fields: [],
content_type: "json",
portal_id: this.portal_id,
portal_id: this.portal_id
};
} else if (this.is_map == 4) {
query = {
......@@ -581,10 +635,10 @@ export default {
request_query_fields: [],
response_fields: [],
content_type: "json",
portal_id: this.portal_id,
portal_id: this.portal_id
};
}
this.$api.workbench.serviceAdd(query).then((response) => {
this.$api.workbench.serviceAdd(query).then(response => {
if (response.data.success == 1) {
this.$message.success("服务发布成功");
this.$router.push("/fwgl/" + this.$store.getters.level);
......@@ -602,7 +656,7 @@ export default {
});
},
registeProcess() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
let query = {
......@@ -613,9 +667,9 @@ export default {
oid: this.oid, // 组织id
encode_method: this.form.code, // 接口编码
cover: this.cover[0], // 服务封面
openness: this.form.resource, // 开放程度，1共享/2受限/3敏感
openness: this.form.resource // 开放程度，1共享/2受限/3敏感
};
this.$api.workbench.releaseProcess(query).then((response) => {
this.$api.workbench.releaseProcess(query).then(response => {
if (response.data.success == 1) {
this.$message.success("服务发布成功");
this.$router.push("/fwgl/" + this.$store.getters.level);
......@@ -633,7 +687,7 @@ export default {
});
},
registe() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
let contentType = "";
......@@ -676,9 +730,9 @@ export default {
: this.param_fields,
response_fields: this.response_fields,
content_type: contentType,
portal_id: this.portal_id,
portal_id: this.portal_id
};
this.$api.workbench.serviceAdd(query).then((response) => {
this.$api.workbench.serviceAdd(query).then(response => {
if (response.data.success == 1) {
this.$message.success("服务注册成功");
this.$router.push("/fwgl/" + this.$store.getters.level);
......@@ -733,7 +787,7 @@ export default {
},
changeZhfwQqt() {},
getArea() {
this.$api.workbench.getServiceAreaList().then((response) => {
this.$api.workbench.getServiceAreaList().then(response => {
if (response.data.success == 1) {
this.optionsArea = response.data.data;
} else {
......@@ -742,10 +796,10 @@ export default {
});
},
getServiceType1() {
this.$api.workbench.getServiceTypeList().then((response) => {
this.$api.workbench.getServiceTypeList().then(response => {
if (response.data.success == 1) {
this.btnList = response.data.data;
this.btnList.forEach((item) => {
this.btnList.forEach(item => {
switch (item.id) {
case 5:
item.default = "nav_ic_shujufw";
......@@ -797,7 +851,7 @@ export default {
// url: "https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html?webmap=0303d7b773c5459f83abf95ef93ffb86"
// };
// sessionStorage.setItem('shareWebMapParam',JSON.stringify(msg));
let map_data = JSON.parse(sessionStorage.getItem('shareWebMapParam'));
let map_data = JSON.parse(sessionStorage.getItem("shareWebMapParam"));
if (map_data) {
let data = map_data;
self.form.name = data.name;
......@@ -849,8 +903,8 @@ export default {
url: self.serviceUrl,
sectors: self.form.area,
data_service_type2: self.skfwQqt,
descript: self.form.desc,
},
descript: self.form.desc
}
},
"*"
);
......@@ -860,7 +914,7 @@ export default {
document.getElementById("listener").contentWindow.postMessage(
{
cmd: "getPortalItemInfo",
params: itemid,
params: itemid
},
"*"
);
......@@ -885,7 +939,7 @@ export default {
self.dialogInfo.msg = `您的时空服务地址已更新为${
self.serviceUrl
}，服务类型更新为${
self.skfwRadios.find((item) => {
self.skfwRadios.find(item => {
return item.id == self.skfwQqt;
}).name
}。`;
......@@ -912,7 +966,7 @@ export default {
getProcessDetail() {
this.$api.workbench
.getProcessDetail({ id: this.process_id })
.then((response) => {
.then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.form.name = data.name;
......@@ -922,14 +976,14 @@ export default {
);
}
});
},
}
},
mounted() {
let self = this;
window.addEventListener("message", self.listeners, false);
self.judgeMap();
self.getArea();
},
}
};
</script>
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ 0986b54d
......@@ -53,7 +53,10 @@
>
<el-form-item prop="result">
<p class="formname">审批结果：</p>
<el-select v-model="form.result" placeholder="请选择">
<el-select
v-model="form.result"
placeholder="请选择"
>
<el-option
v-for="item in resultoptions"
:key="item.value"
......@@ -71,10 +74,14 @@
></el-input>
</el-form-item>
<el-form-item class="btnsty">
<el-button @click="onSubmit('form')" class="right"
>提交</el-button
>
<el-button class="right" @click="backpage">取消</el-button>
<el-button
@click="onSubmit('form')"
class="right"
>提交</el-button>
<el-button
class="right"
@click="backpage"
>取消</el-button>
</el-form-item>
</el-form>
</div>
......@@ -97,13 +104,13 @@ export default {
serviceHeader,
infoList,
tableUm,
processCard,
processCard
},
data() {
return {
form: {
result: "",
option: "",
option: ""
},
id: "",
zd_table_arr: [],
......@@ -116,20 +123,20 @@ export default {
min: 0,
max: 200,
message: "长度应小于200个字符",
trigger: "blur",
},
],
trigger: "blur"
}
]
},
resultvalue: "",
resultoptions: [
{
label: "通过",
value: 1,
value: 1
},
{
label: "不通过",
value: -1,
},
value: -1
}
],
approval_arr: [
[],
......@@ -157,39 +164,39 @@ export default {
// },
// ]
// },
],
]
],
header_arr: [
{
prop: "name",
label: "字段名称",
minWidth: "20%",
align: "left",
align: "left"
},
{
prop: "field_type",
label: "字段编码",
width: "100px",
align: "center",
align: "center"
},
{
prop: "show_type",
label: "字段类型",
width: "100px",
align: "center",
align: "center"
},
{
prop: "descript",
label: "字段说明",
minWidth: "30%",
align: "left",
align: "left"
},
{
prop: "example",
label: "字段示例数值",
width: "120px",
align: "left",
},
align: "left"
}
],
color_arr: ["#e15260", '"#ef9433', "#515fe7"],
service_header_arr: {
......@@ -200,25 +207,25 @@ export default {
first: [
{
name: "服务类型",
text: "",
text: ""
},
{
name: "服务领域",
text: "",
text: ""
},
{
name: "审批状态",
text: "",
color: "#ef9433",
},
color: "#ef9433"
}
],
second: [
{
name: "申请时间",
text: "",
},
text: ""
}
],
fixed: false,
fixed: false
},
service_arr: ["服务申请信息", "服务审批"],
now_service: 0,
......@@ -229,86 +236,86 @@ export default {
title: "审批信息：",
prop: "title",
type: "solt",
solt_name: "sp_card",
solt_name: "sp_card"
},
{
title: "一级审批：",
prop: "title",
type: "solt",
solt_name: "sp_result",
},
solt_name: "sp_result"
}
],
[
{
title: "审批信息：",
prop: "title",
type: "solt",
solt_name: "sp_card",
solt_name: "sp_card"
},
{
title: "二级审批：",
prop: "title",
type: "solt",
solt_name: "sp_result",
},
],
solt_name: "sp_result"
}
]
],
list_arr: [
{
title: "申请单位：",
info: "",
info: ""
},
{
title: "申请人：",
info: "",
info: ""
},
{
title: "申请人联系电话：",
info: "",
info: ""
},
{
title: "业务系统名称：",
info: "",
info: ""
},
{
title: "业务系统访问地址：",
info: "",
info: ""
},
{
title: "场景描述：",
info: "",
info: ""
},
{
title: "申请文件：",
info: "",
url: "",
type: "down",
type: "down"
},
{
title: "申请内容：",
info: "",
type: "solt",
solt_name: "zd_table",
solt_name: "zd_table"
},
{
title: "申请时长：",
info: "",
info: ""
},
{
title: "申请规格：",
info: "",
info: ""
},
{
title: "总价：",
info: "",
},
],
info: ""
}
]
};
},
watch: {},
computed: {
...mapGetters(["level"]),
...mapState(["userInfo"]),
...mapState(["userInfo"])
},
created() {
console.log(this.level);
......@@ -334,7 +341,7 @@ export default {
});
},
onSubmit(formName) {
this.$refs[formName].validate((valid) => {
this.$refs[formName].validate(valid => {
if (valid) {
this.set_approval();
} else {
......@@ -351,18 +358,18 @@ export default {
.post("/apaas/service/v3/service/approval/applied/approval", {
apply_id: this.id,
state: this.form.result,
message: this.form.option,
message: this.form.option
})
.then((res) => {
.then(res => {
console.log(res);
if (res.data.success) {
this.$message.success("审批成功");
this.$router.back(-1);
} else {
this.$message.error("审批失败");
this.$message.error("审批失败，" + res.data.errMsg);
}
})
.catch((res) => {
.catch(res => {
this.$message.error(res);
});
},
......@@ -374,7 +381,7 @@ export default {
.get(
`/apaas/service/v3/service/approval/applied?apply_id=${this.$route.params.id}`
)
.then((response) => {
.then(response => {
console.log(response.data.data);
if (!response.data.success) {
this.$message.error(response.data.errMsg);
......@@ -487,7 +494,7 @@ export default {
// console.log(data)
if (data.data_service_type1 == 36) {
this.list_arr.splice(6, 2);
this.service_arr = ["产品申请信息", "产品审批"]
this.service_arr = ["产品申请信息", "产品审批"];
}
this.id = data.service_apply_info.id;
if (data.service_apply_info.approval_status !== 0) {
......@@ -503,7 +510,7 @@ export default {
this.servicead_arr[this.now_user].splice(0, 1);
}
if (data.service_apply_info.approval_process) {
data.service_apply_info.approval_process.forEach((e) => {
data.service_apply_info.approval_process.forEach(e => {
this.approval_arr[this.now_user].push({
title: e.level == 1 ? "一级审批" : "二级审批",
result:
......@@ -511,7 +518,7 @@ export default {
? "审批未通过"
: e.status == 0
? "审批中"
: "审批通过",
: "审批通过"
});
if (e.status !== 0) {
this.approval_arr[this.now_user][
......@@ -519,22 +526,22 @@ export default {
]["arr"] = [
{
title: "审批时间：",
info: e.approval_time.split("+")[0].replace("T", " "),
info: e.approval_time.split("+")[0].replace("T", " ")
},
{
title: "审批单位：",
info: e.user_info.department_name
? e.user_info.department_name
: "无",
: "无"
},
{
title: "审批人：",
info: e.user_info.user_name,
info: e.user_info.user_name
},
{
title: "审批意见：",
info: e.comments,
},
info: e.comments
}
];
}
});
......@@ -544,14 +551,14 @@ export default {
? JSON.parse(data.service_apply_info.res_fields)
: [];
if (data.data_service_type1 != 5) {
this.list_arr.splice(7, 1)
this.list_arr.splice(7, 1);
}
})
.catch(function (response) {
.catch(function(response) {
this.$message.error("请求失败");
});
},
},
}
}
};
</script>
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 0986b54d
<template>
<div class="fwcs">
<el-breadcrumb v-if="is_map != 0" separator="/" class="bread_crumb">
<el-breadcrumb
v-if="is_map != 0"
separator="/"
class="bread_crumb"
>
<el-breadcrumb-item :to="{ path: '/workplace' }">
在线组件工具
</el-breadcrumb-item>
......@@ -22,12 +26,17 @@
</el-breadcrumb-item>
<el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
</el-breadcrumb>
<el-breadcrumb v-else separator="/" class="bread_crumb">
<el-breadcrumb
v-else
separator="/"
class="bread_crumb"
>
<el-breadcrumb-item :to="{ path: '/fwzc' }">服务注册</el-breadcrumb-item>
<el-breadcrumb-item v-if="!jcxxtx">服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-else :to="{ path: '/fwzc' }"
>服务测试</el-breadcrumb-item
>
<el-breadcrumb-item
v-else
:to="{ path: '/fwzc' }"
>服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-if="jcxxtx">基础信息填写</el-breadcrumb-item>
</el-breadcrumb>
<div v-if="!jcxxtx">
......@@ -69,7 +78,10 @@
></el-option>
</el-select>
</div>
<div v-if="activeBtn == 4 && zhyyVal == 24" class="lc_alert">
<div
v-if="activeBtn == 4 && zhyyVal == 24"
class="lc_alert"
>
<i class="el-icon-warning-outline"></i>
<p>
说明：支持多个流程服务接口的注册，若流程服务包含多个接口，每个接口需分别注册为独立的服务地址才可使用。<br />
......@@ -80,13 +92,11 @@
（用于查询流程状态）
</p>
</div>
<div
v-show="
<div v-show="
(activeBtn == 4 && zhyyVal == 24) ||
activeBtn == 3 ||
activeBtn == 2
"
>
">
<div class="fwcs_fwdz">
上传接口文档
<span class="title_bc">（请上传所有服务地址完整接口文档）</span>：
......@@ -107,7 +117,10 @@
</div>
<div v-if="activeBtn == 3">
<div class="fwcs_fwdz">返回数据格式</div>
<el-radio-group v-model="gz_fhsjgs" class="gz_fhsjgs_rad">
<el-radio-group
v-model="gz_fhsjgs"
class="gz_fhsjgs_rad"
>
<el-radio label="JSON">JSON</el-radio>
<el-radio label="xml">XML</el-radio>
</el-radio-group>
......@@ -168,13 +181,23 @@
></el-option>
</el-select>
</el-input>
<el-button @click="clickFwcs()" class="fwcs_btn_fwcs">
<el-button
@click="clickFwcs()"
class="fwcs_btn_fwcs"
>
服务测试
</el-button>
</div>
<div v-if="activeBtn == 0 || activeBtn == 2 || activeBtn == 3">
<el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
<el-tab-pane label="请求参数" name="0">
<el-tabs
v-model="activeName"
class="fwcs_tabs"
@tab-click="clickTab"
>
<el-tab-pane
label="请求参数"
name="0"
>
<ces-table
ref="fwcs_sjfw_qq"
size="mini"
......@@ -197,7 +220,10 @@
@changeTable="changeTable"
></ces-table>
</el-tab-pane>
<el-tab-pane label="请求体" name="1">
<el-tab-pane
label="请求体"
name="1"
>
<div class="sjfw_qqt">
<el-radio-group v-model="sjfwQqt">
<el-radio label="JSON">JSON</el-radio>
......@@ -208,7 +234,10 @@
ref="jsonCodes"
></v-apaas-code>
</el-tab-pane>
<el-tab-pane label="授权信息" name="2">
<el-tab-pane
label="授权信息"
name="2"
>
<el-row class="sqxx_row">
<el-col :span="6">
<div class="sqxx_title">授权方式：</div>
......@@ -225,7 +254,10 @@
></el-option>
</el-select>
</el-col>
<el-col :span="2" class="center_line_c">
<el-col
:span="2"
class="center_line_c"
>
<div class="center_line"></div>
</el-col>
<el-col :span="16">
......@@ -247,13 +279,19 @@
:key="item.name"
v-model="skfwQqt"
:label="item.id"
>{{ item.name }}</el-radio
>
>{{ item.name }}</el-radio>
</div>
</div>
<div v-if="activeBtn == 4 && zhyyVal != 34 && zhyyVal != 24">
<el-tabs v-model="activeZh" class="fwcs_tabs" @tab-click="clickTab">
<el-tab-pane label="请求参数" name="0">
<el-tabs
v-model="activeZh"
class="fwcs_tabs"
@tab-click="clickTab"
>
<el-tab-pane
label="请求参数"
name="0"
>
<ces-table
ref="fwcs_zhfw_qq"
size="mini"
......@@ -276,14 +314,18 @@
@changeTable="changeTable"
></ces-table>
</el-tab-pane>
<el-tab-pane label="请求体" name="1">
<el-tab-pane
label="请求体"
name="1"
>
<div class="sjfw_qqt">
<el-radio-group v-model="zhfwQqt" @change="changeZhfwQqt">
<el-radio-group
v-model="zhfwQqt"
@change="changeZhfwQqt"
>
<el-radio label="JSON">JSON</el-radio>
<el-radio label="form-data">form-data</el-radio>
<el-radio label="x-www-form-urlencoded"
>x-www-form-urlencoded</el-radio
>
<el-radio label="x-www-form-urlencoded">x-www-form-urlencoded</el-radio>
</el-radio-group>
</div>
<div v-show="zhfwQqt == 'JSON'">
......@@ -342,14 +384,12 @@
</div>
</block-radius>
<block-radius v-show="resultShow">
<div
v-show="
<div v-show="
(activeBtn == 0 ||
activeBtn == 3 ||
(activeBtn == 4 && (zhyyVal == 22 || zhyyVal == 23))) &&
resSuccess
"
>
">
<div class="sjfw_qqcstx">请求参数信息填写：</div>
<ces-table
ref="fwcs_sjfw_qqcs"
......@@ -393,14 +433,12 @@
headerCellClassName="th_pink"
></ces-table>
</div>
<div
v-show="
<div v-show="
(activeBtn == 1 ||
activeBtn == 2 ||
(activeBtn == 4 && zhyyVal == 34)) &&
resSuccess
"
>
">
<div class="skfw_csfwxx">测试服务信息：</div>
<div class="test_succ">
<div class="skcs_jg">
......@@ -411,16 +449,14 @@
</div>
</div>
</div>
<div
v-show="
<div v-show="
(activeBtn == 0 ||
activeBtn == 1 ||
activeBtn == 2 ||
activeBtn == 3 ||
activeBtn == 4) &&
!resSuccess
"
>
">
<div class="skfw_csfwxx">测试服务信息：</div>
<div class="test_succ">
<div class="skcs_jg">
......@@ -496,16 +532,20 @@
></el-option>
</el-select>
</el-input>
<el-button @click="clickFwcsOne(indexOne)" class="fwcs_btn_fwcs"
>服务测试</el-button
>
<el-button
@click="clickFwcsOne(indexOne)"
class="fwcs_btn_fwcs"
>服务测试</el-button>
</div>
<el-tabs
v-model="itemOne.activeName"
class="fwcs_tabs"
@tab-click="clickTabOne"
>
<el-tab-pane label="请求参数" name="0">
<el-tab-pane
label="请求参数"
name="0"
>
<ces-table
:ref="`one_qqcs_${indexOne}`"
size="mini"
......@@ -532,7 +572,10 @@
"
></ces-table>
</el-tab-pane>
<el-tab-pane label="请求体" name="1">
<el-tab-pane
label="请求体"
name="1"
>
<div class="sjfw_qqt">
<el-radio-group v-model="itemOne.sjfwQqt">
<el-radio label="JSON">JSON</el-radio>
......@@ -543,7 +586,10 @@
:ref="`one_json_${indexOne}`"
></v-apaas-code>
</el-tab-pane>
<el-tab-pane label="授权信息" name="2">
<el-tab-pane
label="授权信息"
name="2"
>
<el-row class="sqxx_row">
<el-col :span="6">
<div class="sqxx_title">授权方式：</div>
......@@ -560,7 +606,10 @@
></el-option>
</el-select>
</el-col>
<el-col :span="2" class="center_line_c">
<el-col
:span="2"
class="center_line_c"
>
<div class="center_line_one"></div>
</el-col>
<el-col :span="16">
......@@ -637,20 +686,17 @@
"
class="new_one"
@click="newOne(indexOne)"
>新增服务地址</el-button
>
>新增服务地址</el-button>
<el-button
v-if="!(indexOne == liucheng_list.length || liucheng_list.length == 1)"
class="del_one"
@click="delOne(indexOne)"
>移除</el-button
>
>移除</el-button>
<el-button
v-if="itemOne.resultShow"
class="reset_one"
@click="resetOne(indexOne)"
>重置</el-button
>
>重置</el-button>
<el-button
v-if="
indexOne + 1 == liucheng_list.length && itemOne.resSuccess
......@@ -740,16 +786,32 @@
<el-radio :label="3">敏感</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="is_map != 0" class="btn_footer">
<el-button class="previous" @click="goBack('map')">
{{ is_map == 1 ? "返回智能制图" : "返回Web应用程序" }}
<el-form-item
v-if="is_map != 0"
class="btn_footer"
>
<el-button
class="previous"
@click="goBack('map')"
>
{{ mapBackText }}
</el-button>
<el-button class="registe" :disabled="mapR" @click="registeMap">
<el-button
class="registe"
:disabled="mapR"
@click="registeMap"
>
服务发布
</el-button>
</el-form-item>
<el-form-item v-else-if="process_id != ''" class="btn_footer">
<el-button class="previous" @click="goBack('process')">
<el-form-item
v-else-if="process_id != ''"
class="btn_footer"
>
<el-button
class="previous"
@click="goBack('process')"
>
返回流程管理
</el-button>
<el-button
......@@ -760,18 +822,29 @@
服务发布
</el-button>
</el-form-item>
<el-form-item v-else class="btn_footer">
<el-button class="previous" @click="previous">上一步</el-button>
<el-button class="registe" :disabled="fwR" @click="registe"
>服务注册</el-button
>
<el-form-item
v-else
class="btn_footer"
>
<el-button
class="previous"
@click="previous"
>上一步</el-button>
<el-button
class="registe"
:disabled="fwR"
@click="registe"
>服务注册</el-button>
</el-form-item>
</el-form>
</div>
</block-radius>
</div>
<div style="display: none">
<iframe id="listener" :src="addPortalItemUrl"></iframe>
<iframe
id="listener"
:src="addPortalItemUrl"
></iframe>
</div>
<apass-dialog
ref="alertChange"
......@@ -785,6 +858,9 @@
<script>
const gisServiceUrl = window.serviceConfig.gisServiceRoot;
const gisPortalSiteName = window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal";
import BlockRadius from "@/components/general/block-radius";
import CesTable from "@/components/table/table-um";
import Codes from "@/components/general/codes";
......@@ -797,7 +873,7 @@ export default {
CesTable,
apassDialog,
"v-apaas-code": Codes,
uploadFile,
uploadFile
},
data() {
return {
......@@ -820,17 +896,20 @@ export default {
checkPass: false,
dataType: "",
body_fields: [],
param_fields: [],
},
param_fields: []
}
],
rulesOne: {
one_input: [
{ required: true, message: "请输入服务名称", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" },
],
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" }
]
},
addPortalItemUrl:
gisServiceUrl + "/portal/apaasplat/viewer/addPortalItem.html",
gisServiceUrl +
"/" +
gisPortalSiteName +
"/apaasplat/viewer/addPortalItem.html",
btnList: [],
activeBtn: null,
serviceUrl: "",
......@@ -839,12 +918,12 @@ export default {
{ label: "GET", value: "GET" },
{ label: "POST", value: "POST" },
{ label: "PUT", value: "PUT" },
{ label: "DELETE", value: "DELETE" },
{ label: "DELETE", value: "DELETE" }
],
optionType1: [{ label: "GET", value: "GET" }],
optionType2: [
{ label: "GET", value: "GET" },
{ label: "POST", value: "POST" },
{ label: "POST", value: "POST" }
],
activeName: "0",
activeZh: "0",
......@@ -853,9 +932,9 @@ export default {
label: "请求字段编码",
prop: "requestEncoding",
type: "input",
align: "left",
align: "left"
},
{ label: "请求值", prop: "requestValue", type: "input", align: "left" },
{ label: "请求值", prop: "requestValue", type: "input", align: "left" }
],
sjfwQqcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
......@@ -865,13 +944,13 @@ export default {
prop: "show_type",
type: "",
align: "left",
width: "140",
width: "140"
},
{
label: "字段名称*",
prop: "label",
type: "input",
align: "left",
align: "left"
},
{
label: "是否必须*",
......@@ -881,11 +960,11 @@ export default {
width: 100,
selectArr: [
{ label: "是", value: 1 },
{ label: "否", value: 0 },
{ label: "否", value: 0 }
],
hasDefault: true,
hasDefault: true
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
sjfwFhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" },
......@@ -895,9 +974,9 @@ export default {
label: "字段名称*",
prop: "label",
type: "input",
align: "left",
align: "left"
},
{ label: "字段说明", prop: "descript", type: "input", align: "left" },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }
],
zhfwQqcsForm: [
{ label: "请求字段编码", prop: "key", type: "input", align: "left" },
......@@ -909,15 +988,15 @@ export default {
width: 100,
selectArr: [
{ label: "text", value: "text" },
{ label: "file", value: "file" },
],
{ label: "file", value: "file" }
]
},
{
label: "请求值",
prop: "val",
type: "upload",
align: "center",
uploadKey: "field_type",
uploadKey: "field_type"
},
{
label: "操作",
......@@ -927,10 +1006,10 @@ export default {
btnList: [
{
type: "primary-del",
label: "删除",
},
],
},
label: "删除"
}
]
}
],
datasZhForm: [],
datasZhwww: [],
......@@ -953,12 +1032,12 @@ export default {
area: "",
origin: "",
code: "自动生成",
resource: 1,
resource: 1
},
rules: {
name: [
{ required: true, message: "请输入服务名称", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" }
],
desc: [
{ required: true, message: "请输入服务描述", trigger: "blur" },
......@@ -966,18 +1045,18 @@ export default {
min: 0,
max: 200,
message: "服务描述不超过200个字",
trigger: "blur",
},
trigger: "blur"
}
],
area: [
{ required: true, message: "请选择服务领域", trigger: "change" },
{ required: true, message: "请选择服务领域", trigger: "change" }
],
origin: [
{ required: true, message: "请选择所属组织", trigger: "blur" },
{ required: true, message: "请选择所属组织", trigger: "blur" }
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" },
],
{ required: true, message: "请选择开放程度", trigger: "blur" }
]
},
rules_process: {
name: [
......@@ -986,8 +1065,8 @@ export default {
min: 0,
max: 100,
message: "服务名称不超过100个字",
trigger: "blur",
},
trigger: "blur"
}
],
desc: [
{ required: true, message: "请输入服务描述", trigger: "blur" },
......@@ -995,16 +1074,16 @@ export default {
min: 0,
max: 400,
message: "服务描述不超过400个字",
trigger: "blur",
},
trigger: "blur"
}
],
area: [{ required: true, message: "请选择服务领域", trigger: "blur" }],
origin: [
{ required: true, message: "请选择所属组织", trigger: "blur" },
{ required: true, message: "请选择所属组织", trigger: "blur" }
],
resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" },
],
{ required: true, message: "请选择开放程度", trigger: "blur" }
]
},
cover: [],
optionsArea: [],
......@@ -1018,13 +1097,14 @@ export default {
requestRules: 0,
responseRules: 0,
is_map: 0,
mapBackText: "返回智能制图",
process_id: "",
param_fields: [],
body_fields: [],
dialogInfo: {
title: "时空服务参数已修改",
msg: "",
submit: null,
submit: null
},
is_portal: false,
portal_id: "",
......@@ -1036,7 +1116,7 @@ export default {
user_id: "",
fwR: false,
mapR: false,
proR: false,
proR: false
};
},
computed: {},
......@@ -1084,8 +1164,8 @@ export default {
checkPass: false,
dataType: "",
body_fields: [],
param_fields: [],
},
param_fields: []
}
];
this.activeName = "0";
this.code_1_index += 1;
......@@ -1193,11 +1273,11 @@ export default {
let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
let arr = [];
request.pop();
request.forEach((item) => {
request.forEach(item => {
arr.push({
key: item.requestEncoding,
val: item.requestValue,
field_type: "text",
field_type: "text"
});
});
bodys = JSON.stringify(arr);
......@@ -1220,9 +1300,9 @@ export default {
: this.activeBtn == 4
? this.zhyyVal
: 0,
response_type: this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
response_type: this.activeBtn == 3 ? this.gz_fhsjgs : "JSON"
};
this.$api.workbench.fwzcFwcs(query).then((response) => {
this.$api.workbench.fwzcFwcs(query).then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.body_fields = data.body_fields;
......@@ -1359,9 +1439,9 @@ export default {
getOrganization() {
if (this.$store.state.userInfo && this.$store.state.userInfo.user_id) {
let query = {
id: this.$store.state.userInfo.user_id,
id: this.$store.state.userInfo.user_id
};
this.$api.user.getUserDetail(query).then((request) => {
this.$api.user.getUserDetail(query).then(request => {
if (request.data.success == 1) {
this.form.origin = request.data.data.department;
this.oid = request.data.data.department_id;
......@@ -1375,9 +1455,9 @@ export default {
if (data.success == 1) {
self.$store.commit("userInfofun", data.data);
let query = {
id: self.$store.state.userInfo.user_id,
id: self.$store.state.userInfo.user_id
};
self.$api.user.getUserDetail(query).then((request) => {
self.$api.user.getUserDetail(query).then(request => {
if (request.data.success == 1) {
self.form.origin = request.data.data.department;
self.oid = request.data.data.department_id;
......@@ -1392,12 +1472,12 @@ export default {
}
},
registeMap() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
this.mapR = true;
let query = {};
if (this.is_map == 1) {
if (this.is_map == 1 || this.is_map == 5) {
query = {
name: this.form.name,
sectors: this.form.area,
......@@ -1421,9 +1501,9 @@ export default {
request_fields: [],
request_query_fields: [],
response_fields: [],
content_type: "JSON",
},
],
content_type: "JSON"
}
]
};
} else if (this.is_map == 4) {
query = {
......@@ -1448,12 +1528,12 @@ export default {
request_fields: [],
request_query_fields: [],
response_fields: [],
content_type: "JSON",
},
],
content_type: "JSON"
}
]
};
}
this.$api.workbench.serviceAdd(query).then((response) => {
this.$api.workbench.serviceAdd(query).then(response => {
this.mapR = false;
if (response.data.success == 1) {
this.$message.success("服务发布成功");
......@@ -1472,7 +1552,7 @@ export default {
});
},
registeProcess() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
this.proR = true;
......@@ -1484,9 +1564,9 @@ export default {
oid: this.oid, // 组织id
encode_method: this.form.code, // 接口编码
cover: this.cover[0], // 服务封面
openness: this.form.resource, // 开放程度，1共享/2受限/3敏感
openness: this.form.resource // 开放程度，1共享/2受限/3敏感
};
this.$api.workbench.releaseProcess(query).then((response) => {
this.$api.workbench.releaseProcess(query).then(response => {
this.proR = false;
if (response.data.success == 1) {
this.$message.success("服务发布成功");
......@@ -1512,7 +1592,7 @@ export default {
}
},
registePt() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (
(this.activeBtn == 2 && this.jkwds.length == 0) ||
......@@ -1522,7 +1602,12 @@ export default {
} else {
if (this.cover.length != 0) {
let contentType = "";
if (this.activeBtn == 1 && !this.is_portal) {
if (
this.activeBtn == 1 &&
!this.is_portal &&
window.serviceConfig &&
window.serviceConfig.state == "needLogin"
) {
this.addPortalItem();
} else {
this.fwR = true;
......@@ -1574,11 +1659,11 @@ export default {
? this.request_fields
: this.param_fields,
response_fields: this.response_fields,
content_type: contentType,
},
],
content_type: contentType
}
]
};
this.$api.workbench.serviceAdd(query).then((response) => {
this.$api.workbench.serviceAdd(query).then(response => {
this.fwR = false;
if (response.data.success == 1) {
this.$message.success("服务注册成功");
......@@ -1599,7 +1684,7 @@ export default {
});
},
registeOne() {
this.$refs.form.validate((valid) => {
this.$refs.form.validate(valid => {
if (valid) {
if (this.cover.length != 0) {
if (this.jkwds.length == 0) {
......@@ -1607,7 +1692,7 @@ export default {
} else {
this.fwR = true;
let urls = [];
this.liucheng_list.forEach((item) => {
this.liucheng_list.forEach(item => {
urls.push({
req_name: item.one_input,
response_type: "JSON",
......@@ -1624,7 +1709,7 @@ export default {
? item.request_fields
: item.param_fields,
response_fields: item.response_fields,
content_type: "JSON",
content_type: "JSON"
});
});
let query = {
......@@ -1639,9 +1724,9 @@ export default {
portal_id: this.portal_id,
encode_method: this.form.code,
urls: urls,
doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
doc_file: this.jkwds.length != 0 ? this.jkwds[0] : ""
};
this.$api.workbench.serviceAdd(query).then((response) => {
this.$api.workbench.serviceAdd(query).then(response => {
this.fwR = false;
if (response.data.success == 1) {
this.$message.success("服务注册成功");
......@@ -1700,7 +1785,7 @@ export default {
},
changeZhfwQqt() {},
getArea() {
this.$api.workbench.getServiceAreaList().then((response) => {
this.$api.workbench.getServiceAreaList().then(response => {
if (response.data.success == 1) {
this.optionsArea = response.data.data;
} else {
......@@ -1709,10 +1794,10 @@ export default {
});
},
getServiceType1() {
this.$api.workbench.getServiceTypeList().then((response) => {
this.$api.workbench.getServiceTypeList().then(response => {
if (response.data.success == 1) {
let arr = response.data.data;
arr.forEach((item) => {
arr.forEach(item => {
switch (item.id) {
case 5:
item.default = "nav_ic_shujufw";
......@@ -1744,7 +1829,9 @@ export default {
});
this.btnList = arr;
let skfwRadios = this.btnList[1].childDomains;
skfwRadios.splice(2, 1);
skfwRadios = skfwRadios.filter(function(item) {
return item.name != "地图" && item.name != "三维地图";
});
this.skfwRadios = skfwRadios;
this.skfwQqt = this.skfwRadios[0].id;
this.optionsZhyy = this.btnList[4].childDomains;
......@@ -1760,6 +1847,7 @@ export default {
self.is_map = self.$route.query.map;
self.jcxxtx = true;
if (self.$store.state.znztParams) {
self.mapBackText = "返回智能制图";
let data = this.$store.state.znztParams;
self.form.name = data.name;
self.form.desc = data.descript;
......@@ -1769,7 +1857,19 @@ export default {
self.cover[0] = data.cover;
self.portal_id = data.portalid;
self.is_portal = true;
} else if (self.$store.state.cesiumMapParams) {
self.mapBackText = "返回三维制图";
let data = this.$store.state.cesiumMapParams;
self.form.name = data.name;
self.form.desc = data.descript;
self.form.area = Number(data.sectors);
self.serviceUrl = data.url;
self.skfwQqt = Number(data.data_service_type2);
self.cover[0] = data.cover;
self.portal_id = data.portalid;
self.is_portal = true;
} else if (self.$store.state.appBuilderParams) {
self.mapBackText = "返回Web应用程序";
let data = this.$store.state.appBuilderParams;
self.form.name = data.name;
self.form.desc = data.descript;
......@@ -1808,6 +1908,12 @@ export default {
"/vmap/#/map" + `?id=${shareWebMapParam.portalid}`;
} else if (self.is_map == 4) {
self.$router.back(-1);
} else if (self.is_map == 5) {
let shareCesiumMapParam = JSON.parse(
window.sessionStorage.getItem("shareCesiumMapParam")
);
window.location.href =
"/cesiummap/#/map" + `?id=${shareCesiumMapParam.portalid}`;
} else {
let shareWebMapParam = JSON.parse(
window.sessionStorage.getItem("shareWebMapParam")
......@@ -1830,8 +1936,8 @@ export default {
url: self.serviceUrl,
sectors: self.form.area,
data_service_type2: self.skfwQqt,
descript: self.form.desc,
},
descript: self.form.desc
}
},
"*"
);
......@@ -1841,7 +1947,7 @@ export default {
document.getElementById("listener").contentWindow.postMessage(
{
cmd: "getPortalItemInfo",
params: itemid,
params: itemid
},
"*"
);
......@@ -1866,7 +1972,7 @@ export default {
self.dialogInfo.msg = `您的时空服务地址已更新为${
self.serviceUrl
}，服务类型更新为${
self.skfwRadios.find((item) => {
self.skfwRadios.find(item => {
return item.id == self.skfwQqt;
}).name
}。`;
......@@ -1893,7 +1999,7 @@ export default {
getProcessDetail() {
this.$api.workbench
.getProcessDetail({ id: this.process_id })
.then((response) => {
.then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.form.name = data.name;
......@@ -1905,7 +2011,7 @@ export default {
});
},
newOne(indexOne) {
this.$refs["ruleFormOne_" + indexOne][0].validate((valid) => {
this.$refs["ruleFormOne_" + indexOne][0].validate(valid => {
if (valid) {
if (this.liucheng_list[indexOne].resSuccess) {
this.checkOne(indexOne, true);
......@@ -1929,7 +2035,7 @@ export default {
checkPass: false,
dataType: "",
body_fields: [],
param_fields: [],
param_fields: []
});
} else {
this.$message.error(`请完善服务${indexOne + 1}中的信息`);
......@@ -2049,9 +2155,9 @@ export default {
content_type: contentType,
data_service_type1: this.btnList[this.activeBtn].id,
data_service_type2: 24,
response_type: "JSON",
response_type: "JSON"
};
this.$api.workbench.fwzcFwcs(query).then((response) => {
this.$api.workbench.fwzcFwcs(query).then(response => {
if (response.data.success == 1) {
let data = response.data.data;
this.liucheng_list[indexOne].body_fields = data.body_fields;
......@@ -2117,7 +2223,7 @@ export default {
self.checkTable(arr[i].children, rule, indexOne);
}
}
},
}
},
mounted() {
let self = this;
......@@ -2132,13 +2238,19 @@ export default {
if (webmap_data) {
_self.$store.commit("setZnztParams", webmap_data);
}
let cesiummap_data = JSON.parse(
sessionStorage.getItem("shareCesiumMapParam")
);
if (cesiummap_data) {
_self.$store.commit("setCesiumMapParams", cesiummap_data);
}
let appmap_data = JSON.parse(
sessionStorage.getItem("shareAppBuilderParam")
);
if (appmap_data) {
_self.$store.commit("setAppBuilderParams", appmap_data);
}
},
}
};
</script>
......
src/pages/workbench/workPlace.vue
View file @ 0986b54d
......@@ -982,16 +982,18 @@ export default {
pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
bg: "#e6ebfe",
color: "#515fe7",
url: "/progress",
// url: "/progress",
url: "/lcyq/ui/#/process/model",
target: 1
},
{
/* {
text: "可视化图表",
pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
bg: "#fff2e2",
color: "#ea7d19",
url: "/iam/api/bi/token",
target: 1
},
}, */
{
text: "应用创新",
pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
......@@ -1412,11 +1414,16 @@ export default {
.then(response => {
console.log(response);
let data = response.data.data;
var temp = Math.round(
(data.seriesData[0].value /
(data.seriesData[0].value + data.seriesData[1].value)) *
100
);
var temp = 0
if(data.seriesData[0].value + data.seriesData[1].value==0){
temp = 0
}else{
temp = Math.round(
(data.seriesData[0].value /
(data.seriesData[0].value + data.seriesData[1].value)) *
100
);
}
console.log(temp);
this.init_health(temp);
})
......
src/pages/workbench/yygl/app_debugger.vue
View file @ 0986b54d
......@@ -270,11 +270,11 @@ export default {
this.tableData.push({
icon:e.podStatus.status=="ContainerCreating"||e.podStatus.status=="Pending"?'3':e.podStatus.status=="Succeeded"?'2':e.podStatus.status=="Failed"?'4':'1',
icon:e.status=="ContainerCreating"||e.status=="Pending"?'3':e.status=="Succeeded"?'2':e.status=="Failed"?'4':'1',
name:e.objectMeta.name,
tag:temp_tag,
node:e.nodeName,
state:e.podStatus.status,
state:e.status,
times:e.restartCount,
cpu:e.metrics&&e.metrics.cpuUsageHistory?this.cpu_deal(e.metrics.cpuUsageHistory):[],
cpu_use:e.metrics&&e.metrics.cpuUsage?e.metrics.cpuUsage:'',
......
src/request/http.js
View file @ 0986b54d
......@@ -16,7 +16,7 @@ const tip = msg => {
* 跳转登录页
* 携带当前页面路由，以期在登录页面完成登录后返回当前页面
* 登录用 bg-login ，具体链接晚几天加
*/
*/
const toLogin = () => {
window.location.href = "/iam/login/#/login?redirect=" + router.currentRoute.fullPath
}
......
src/store/index.js
View file @ 0986b54d
......@@ -21,6 +21,7 @@ const store = new Vuex.Store({
menuCartState: 0, //购物车操作都要修改这个值，menu监听这个值的变化实时获取购物车列表
cartState: 0,
znztParams: null, //智能制图传入过来的数据
cesiumMapParams: null, //三维制图传入过来的数据
appBuilderParams: null, //应用程序传入过来的数据
znztIdParams: '', //智能制图服务id
znztDetailsParams: {
......@@ -32,11 +33,13 @@ const store = new Vuex.Store({
},
getters: {
// 1：超管 2：组织管理员 3：普通用户 4：开发者
is_admin: (state) => {
is_admin: (state) =>
{
return (state.userInfo && state.userInfo.is_admin) || 3;
},
// 0：普通用户，1：组织管理员，2：超级管理员
level: (state, getters) => {
level: (state, getters) =>
{
if (getters.is_admin == 1) {
return 2;
} else if (getters.is_admin == 2) {
......@@ -47,37 +50,52 @@ const store = new Vuex.Store({
},
},
mutations: {
userInfofun(state, newValue) {
userInfofun (state, newValue)
{
state.userInfo = newValue;
},
rolefun(state, newValue) {
rolefun (state, newValue)
{
state.role = newValue;
},
serviceShopMenuAct(state, newValue) {
serviceShopMenuAct (state, newValue)
{
state.serviceShopMenu = newValue;
},
setShoppingCart(state, newValue) {
setShoppingCart (state, newValue)
{
state.shoppingCart = newValue;
},
setMenuCartState(state) {
setMenuCartState (state)
{
state.menuCartState++;
},
setCartState(state) {
setCartState (state)
{
state.cartState++;
},
setZnztParams(state, newValue) {
setZnztParams (state, newValue)
{
state.znztParams = newValue;
},
setAppBuilderParams(state, newValue) {
setCesiumMapParams (state, newValue)
{
state.cesiumMapParams = newValue;
},
setAppBuilderParams (state, newValue)
{
state.appBuilderParams = newValue;
},
setZnztIdParams(state, newValue) {
setZnztIdParams (state, newValue)
{
state.znztIdParams = newValue;
},
setZnztDetailsParams(state, newValue) {
setZnztDetailsParams (state, newValue)
{
state.znztDetailsParams = newValue;
},
setUnreadMessageCount(state, newValue) {
setUnreadMessageCount (state, newValue)
{
state.unreadMessageCount = newValue;
},
},
......
src/utils/common.js
View file @ 0986b54d
function getRole(){
return new Promise((resolve,reject)=>{
if(true){
function getRole() {
return new Promise((resolve, reject) => {
if (true) {
resolve(1)
}else{
} else {
reject('error')
}
})
}
//时间戳转时间格式
var formatDateTime_date = function (date) {
//时间戳转时间格式
var formatDateTime_date = function (date) {
var y = date.getFullYear();
var M = date.getMonth() + 1;
M = M < 10 ? ('0' + M) : M;
......@@ -21,10 +21,101 @@ function getRole(){
m = m < 10 ? ('0' + m) : m;
var s = date.getSeconds();
s = s < 10 ? ('0' + s) : s;
return y + '-' + M + '-' + d+' '+h + ':' + m + ':' + s;
return y + '-' + M + '-' + d + ' ' + h + ':' + m + ':' + s;
};
import CryptoJS from 'crypto-js' //加密js
var data_flag = true
export{
//标准时间转换成时间戳
var formatDateTime = function (te) {
if (te == '') {
return ''
} else {
var time = new Date(te);
var dateTime = time.getTime();
return dateTime;
}
}
// 取得cookie
function getCookie(name) {
if (document.cookie.length > 0) {
var arr = document.cookie.split('; '); //这里显示的格式需要切割一下自己可输出看下
console.log(arr)
for (var i = 0; i < arr.length; i++) {
var arr2 = arr[i].split('='); //再次切割
//这里会切割出以username为第0项的数组、以password为第0项的数组，判断查找相对应的值
if (arr2[0] == 'username') {
name = arr2[1]; //拿到账号
} else if (arr2[0] == 'password') {
//拿到拿到加密后的密码arr2[1]并解密
var bytes = CryptoJS.AES.decrypt(arr2[1].toString(), 'swuE9cmCZQwrkYRV');
var plaintext = bytes.toString(CryptoJS.enc.Utf8); //拿到解密后的密码（登录时输入的密码）
name = plaintext;
}
}
}
// var nameEQ = name + '='
// var ca = document.cookie.split(';') // 把cookie分割成组
// for (var i = 0; i < ca.length; i++) {
// var c = ca[i] // 取得字符串
// while (c.charAt(0) == ' ') { // 判断一下字符串有没有前导空格
// c = c.substring(1, c.length) // 有的话，从第二位开始取
// }
// if (c.indexOf(nameEQ) == 0) { // 如果含有我们要的name
// return unescape(c.substring(nameEQ.length, c.length)) // 解码并截取我们要值
// }
// }
// return false
}
// 清除cookie
function clearCookie(name) {
setCookie(name, "", -1);
}
// 设置cookie
function setCookie(username, password, days) {
var text = CryptoJS.AES.encrypt(password, 'swuE9cmCZQwrkYRV');//使用CryptoJS方法加密
var saveDays = new Date(); //获取时间
saveDays.setTime(saveDays.getTime() + 24 * 60 * 60 * 1000 * days); //保存的天数
console.log(saveDays)
console.log(saveDays.toGMTString())
//字符串拼接存入cookie
window.document.cookie = "username" + "=" + username + ";path=/;expires=" + saveDays.toGMTString();
window.document.cookie = "password" + "=" + text + ";path=/;expires=" + saveDays.toGMTString();
// seconds = seconds || 0; //seconds有值就直接赋值，没有为0，这个根php不一样。
// var expires = "";
// if (seconds != 0 ) { //设置cookie生存时间
// var date = new Date();
// date.setTime(date.getTime()+(seconds*1000));
// expires = "; expires="+date.toGMTString();
// }
// document.cookie = name+"="+escape(value)+expires+"; path=/"; //转码并赋值
}
export {
data_flag,
getRole,
formatDateTime,
getCookie,
clearCookie,
setCookie,
formatDateTime_date
}
\ No newline at end of file
}
static/config/configmap.js
View file @ 0986b54d
window.serviceConfig = {
gisServiceRoot: 'https://apaasgis.wodcloud.com',
gisPortalSiteName: "portal",
state: "needLogin", // needLogin / notNeedLogin
cloudServiceRoot: 'https://cloud4.wodcloud.com/awecloud/login/#/',
};
\ No newline at end of file
static/view/demo/page-basic_web_map.html
View file @ 0986b54d
<!DOCTYPE html>
<html>
<head>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
<title>Portal Web Map</title>
......@@ -10,21 +10,25 @@
html,
body,
#viewDiv {
padding: 0;
margin: 0;
height: 100%;
width: 100%;
padding: 0;
margin: 0;
height: 100%;
width: 100%;
}
</style>
<script src="https://apaas.wodcloud.com/api_4.x/init.js"></script>
<script src="/apaas/ui/static/config/configmap.js"></script>
<script>
require([
"esri/config",
"esri/views/MapView",
"esri/WebMap"
], function(esriConfig, MapView, WebMap) {
], function (esriConfig, MapView, WebMap) {
//使用portal门户的地图资源
esriConfig.portalUrl = "https://apaasgis.wodcloud.com/portal";
esriConfig.portalUrl = window.serviceConfig.gisServiceRoot + "/" + (window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal");
var webmap = new WebMap({
portalItem: {
id: "aa912ada83904d7c901066673ee1a5aa"
......@@ -38,6 +42,7 @@
});
</script>
</head>
<body>
<div id="viewDiv"></div>
</body>
......
static/view/demo/page-echarts_web_map.html
View file @ 0986b54d
......@@ -34,13 +34,16 @@
<script src="https://apaas3.wodcloud.com/mapstatic/js/jquery-3.3.1.min.js"></script>
<script src="https://apaas3.wodcloud.com/mapstatic/js/echarts.min.js"></script>
<script src="https://apaas.wodcloud.com/api_4.x/init.js"></script>
<script src="/apaas/ui/static/config/configmap.js"></script>
<script>
require([
"esri/config",
"esri/views/MapView",
"esri/WebMap"
], function (esriConfig, MapView, WebMap) {
esriConfig.portalUrl = "https://apaasgis.wodcloud.com/portal";
esriConfig.portalUrl = window.serviceConfig.gisServiceRoot + "/" + (window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal");
var webmap = new WebMap({
portalItem: {
id: "b4f4797eb32342c5b679082bfbbef553"
......
static/view/demo/page-video_web_map.html
View file @ 0986b54d
<!DOCTYPE html>
<html>
<head>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
<title>Portal Web Map</title>
......@@ -10,29 +10,35 @@
html,
body,
#viewDiv {
padding: 0;
margin: 0;
height: 100%;
width: 100%;
padding: 0;
margin: 0;
height: 100%;
width: 100%;
}
.esri-view-width-xlarge .esri-popup__main-container {
width: 505px;
}
.esri-view-height-xlarge .esri-popup__main-container {
max-height: none;
}
.esri-popup__main-container {
max-height: none;
}
</style>
<script src="https://apaas.wodcloud.com/api_4.x/init.js"></script>
<script src="/apaas/ui/static/config/configmap.js"></script>
<script>
require([
"esri/config",
"esri/views/MapView",
"esri/WebMap"
], function(esriConfig, MapView, WebMap) {
esriConfig.portalUrl = "https://apaasgis.wodcloud.com/portal";
], function (esriConfig, MapView, WebMap) {
esriConfig.portalUrl = window.serviceConfig.gisServiceRoot + "/" + (window.serviceConfig.gisPortalSiteName
? window.serviceConfig.gisPortalSiteName
: "portal");
// 使用本地字体文件
esriConfig.fontsUrl = "https://apaas.wodcloud.com/mapstatic/font";
var webmap = new WebMap({
......@@ -46,11 +52,13 @@
container: "viewDiv"
});
view.when(function() {
view.popup.watch("selectedFeature", function(graphic) {
if (graphic && graphic.sourceLayer) {
view.when(function () {
view.popup.watch("selectedFeature", function (graphic) {
if (graphic && graphic.sourceLayer)
{
var layerName = graphic.sourceLayer.title;
switch (layerName) {
switch (layerName)
{
case "贵州视频监控要素微服务":
var name = graphic.attributes.NAME;
var code = graphic.attributes.CODE;
......@@ -72,7 +80,8 @@
var videoDomain = "https://apaas3.wodcloud.com/mapstatic/video/{0}.mp4";
var videoCode = code;
var videoSrc = undefined;
if (videoCode) {
if (videoCode)
{
videoSrc = videoDomain.replace("{0}", videoCode);
}
return "<iframe id='cameraiframe' src='https://apaas3.wodcloud.com/mapstatic/iframe/videoplay4test.html?camlist=" + videoCode + "&videosrc=" + videoSrc +
......@@ -81,6 +90,7 @@
});
</script>
</head>
<body>
<div id="viewDiv"></div>
</body>
......
yarn.lock
View file @ 0986b54d
......@@ -2450,6 +2450,11 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
crypto-js@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc"
integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg==
css-color-names@0.0.4, css-color-names@^0.0.4:
version "0.0.4"
resolved "https://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment