diff --git a/src/assets/imgs/home_tool_ic_dmxs.png b/src/assets/imgs/home_tool_ic_dmxs.png new file mode 100644 index 0000000000000000000000000000000000000000..f01d5a67950a7125bfa3e82c9c49455b71eb4ec3 Binary files /dev/null and b/src/assets/imgs/home_tool_ic_dmxs.png differ diff --git a/src/assets/imgs/home_tool_ic_jxxs.png b/src/assets/imgs/home_tool_ic_jxxs.png new file mode 100644 index 0000000000000000000000000000000000000000..200a7473fb59a3c373234bd9605f55cdd147fd4f Binary files /dev/null and b/src/assets/imgs/home_tool_ic_jxxs.png differ diff --git a/src/assets/imgs/list_ic_hot.png b/src/assets/imgs/list_ic_hot.png new file mode 100644 index 0000000000000000000000000000000000000000..7b5592c27971a6bdd0a56970e64f6fc7ac3e5466 Binary files /dev/null and b/src/assets/imgs/list_ic_hot.png differ diff --git a/src/assets/imgs/list_ic_topone.png b/src/assets/imgs/list_ic_topone.png new file mode 100644 index 0000000000000000000000000000000000000000..256716532fb40ab475cd03e0a3482e075522a8cf Binary files /dev/null and b/src/assets/imgs/list_ic_topone.png differ diff --git a/src/assets/imgs/list_ic_topthree.png b/src/assets/imgs/list_ic_topthree.png new file mode 100644 index 0000000000000000000000000000000000000000..4c434e8e80e80570613974bf58d6e4cc739e0814 Binary files /dev/null and b/src/assets/imgs/list_ic_topthree.png differ diff --git a/src/assets/imgs/list_ic_toptwo.png b/src/assets/imgs/list_ic_toptwo.png new file mode 100644 index 0000000000000000000000000000000000000000..099d86c00c983317b68b40edec545c743d9bb059 Binary files /dev/null and b/src/assets/imgs/list_ic_toptwo.png differ diff --git a/src/assets/imgs/progress_ic_bushudata.png b/src/assets/imgs/progress_ic_bushudata.png new file mode 100644 index 0000000000000000000000000000000000000000..903a93227c4c6ae4622a95b8332b6e548de00420 Binary files /dev/null and b/src/assets/imgs/progress_ic_bushudata.png differ diff --git a/src/assets/imgs/progress_ic_jingxiang.png b/src/assets/imgs/progress_ic_jingxiang.png new file mode 100644 index 0000000000000000000000000000000000000000..635a81c03bd3ba60e2efcccd0cdee0035748470c Binary files /dev/null and b/src/assets/imgs/progress_ic_jingxiang.png differ diff --git a/src/assets/imgs/progress_ic_xinxitx.png b/src/assets/imgs/progress_ic_xinxitx.png new file mode 100644 index 0000000000000000000000000000000000000000..bcd45cec07ba9c1b58ed1360187c461553b72651 Binary files /dev/null and b/src/assets/imgs/progress_ic_xinxitx.png differ diff --git a/src/components/app-build-step.vue b/src/components/app-build-step.vue new file mode 100644 index 0000000000000000000000000000000000000000..51422948d78d09353e79c38505a5f577d93b3a11 --- /dev/null +++ b/src/components/app-build-step.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/components/app-build-steps.vue b/src/components/app-build-steps.vue new file mode 100644 index 0000000000000000000000000000000000000000..a7cd2d327282dc15e17d5ed6067d63384b18fedc --- /dev/null +++ b/src/components/app-build-steps.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/components/infoList.vue b/src/components/infoList.vue index e943ea626bd9366e75ae2a5a6f5fe152de681168..dcf922b2b7f6a8daf07b2a39e0560703966b25d0 100644 --- a/src/components/infoList.vue +++ b/src/components/infoList.vue @@ -6,8 +6,11 @@ {{ item.title }}

- - 访问地址: {{ item.info }} + + 下载文件

@@ -25,12 +28,20 @@ export default { }, props: ["list_arr"], mounted() { - console.log(this.$solts); + console.log(this.$slots); }, + methods:{ + download(val){ + this.$emit('download',val) + } + } }; + + diff --git a/src/pages/app_detail.vue b/src/pages/app_detail.vue index 99b159bc8f6272e18428b1d3e47254c3c872d667..74325a95e4e864d61a4382105a25c1fc2ec4d7bc 100644 --- a/src/pages/app_detail.vue +++ b/src/pages/app_detail.vue @@ -149,6 +149,7 @@ export default { first: [], second: [], yydetail: true, + aqdetail: true, }, now_service: 0, header_arr: [ diff --git a/src/pages/apply_app_detail.vue b/src/pages/apply_app_detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..316c943000334368bf28d209c994fcb608ca10fa --- /dev/null +++ b/src/pages/apply_app_detail.vue @@ -0,0 +1,377 @@ + + + + + diff --git a/src/pages/approval_app_detail.vue b/src/pages/approval_app_detail.vue index dc9c8c89aa8772696ad888684edd97afd0248821..17adb68b3852718b656723ffac230fd812de59c2 100644 --- a/src/pages/approval_app_detail.vue +++ b/src/pages/approval_app_detail.vue @@ -1,294 +1,314 @@ + diff --git a/src/pages/approval_service_detail.vue b/src/pages/approval_service_detail.vue index 4ea9c95ab77759bfd63300b7dfbeeda2a0efaf88..63972ab769f1583f93b025e0c7bd8e454331d309 100644 --- a/src/pages/approval_service_detail.vue +++ b/src/pages/approval_service_detail.vue @@ -17,12 +17,12 @@ >{{item}}
- +
- +

审批结果:

- 提交 + 提交 取消
@@ -72,7 +72,11 @@ export default { }, now_user: 1, //0:普通用户,1:组织管理员,2:超级管理员 rules:{ + result:[ + { required: true, message: '请选择意见', trigger: 'change' }, + ], option:[ + { required: true, message: '请输入意见', trigger: 'blur' }, { min: 10, message: '长度大于10个字符', trigger: 'blur' } @@ -90,6 +94,7 @@ export default { } ], approval_arr:[ + [], [], [ { @@ -114,53 +119,7 @@ export default { }, ] }, - ], - [ - { - title:'一级审批', - result:'审批通过', - arr:[ - { - title:'审批时间:', - info:'2020-02-28 15:23:45' - }, - { - title:'审批单位:', - info:'某某某城管局' - }, - { - title:'审批人:', - info:'张先生' - }, - { - title:'审批意见:', - info:'同意' - }, - ] - }, - { - title:'二级审批', - result:'审批通过', - arr:[ - { - title:'审批时间:', - info:'2020-02-28 15:23:45' - }, - { - title:'审批单位:', - info:'某某某城管局' - }, - { - title:'审批人:', - info:'张先生' - }, - { - title:'审批意见:', - info:'同意' - }, - ] - }, - ], + ] ], header_arr: [ { @@ -223,6 +182,7 @@ export default { service_arr: ["服务申请信息", "服务审批"], now_service: 0, servicead_arr: [ + [], [ { title: "一级审批:", @@ -239,26 +199,12 @@ export default { solt_name: "sp_card" }, { - title: "一级审批:", - prop: "title", - type: "solt", - solt_name: "sp_result" - }, - ], - [ - { - title: "审批信息:", - prop: "title", - type: "solt", - solt_name: "sp_card" - }, - { - title: "三级审批:", + title: "二级审批:", prop: "title", type: "solt", solt_name: "sp_result" }, - ], + ] ], list_arr: [ { @@ -288,6 +234,7 @@ export default { { title: "申请文件:", info: "xxxx文件名称.txt", + url:'www.baidu.com', type: "down" }, { @@ -312,8 +259,18 @@ export default { created() {}, mounted() {}, methods: { - onSubmit(){ - console.log('1111'); + onSubmit(formName){ + this.$refs[formName].validate((valid) => { + if (valid) { + alert('submit!'); + } else { + console.log('error submit!!'); + return false; + } + }); + }, + download(val){ + console.log(val); } } }; diff --git a/src/pages/deploy_app_detail.vue b/src/pages/deploy_app_detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..60f19f6cd611a4ef2975063b1c3c7ede9151f963 --- /dev/null +++ b/src/pages/deploy_app_detail.vue @@ -0,0 +1,865 @@ + + + + + + diff --git a/src/pages/index.vue b/src/pages/index.vue index 241f68ee4be1b78db9587d1cbbd78b6f81614e32..8c5414c9eba5471e47c6893beb159cddd33008a5 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,6 +1,6 @@ diff --git a/src/router/index.js b/src/router/index.js index 3e105c672986948724b170fee2b94f2fb70e4fb9..95ac5432a93aba0854ddf3bd5763517da28ecdb7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -92,7 +92,17 @@ export default new Router({ component: () => import("@/pages/app_edit"), }, { - path: "/yygl/:level/:type/approvaldetail/:id", // 我部署的应用详情 + path: "/yygl/:level/:type/deploydetail/:id", // 我部署的应用详情 + name: "deploy_app_detail", + component: () => import("@/pages/deploy_app_detail"), + }, + { + path: "/yygl/:level/:type/applydetail/:id", // 我申请的应用详情 + name: "apply_app_detail", + component: () => import("@/pages/apply_app_detail"), + }, + { + path: "/yygl/:level/:type/approvaldetail/:id", // 我申请的应用详情 name: "approval_app_detail", component: () => import("@/pages/approval_app_detail"), }, @@ -181,6 +191,11 @@ export default new Router({ name: "services_shop", component: () => import("@/pages/services_shop"), }, // 主页 - 服务超市 + { + path: "/app_build", + name: "app_build", + component: () => import("@/pages/app_build"), + }, // 应用构建(镜像形式) { path: "/user", // 个人中心 name: "user", diff --git a/src/utils/common.js b/src/utils/common.js index 4482fa0cca5df12570fbae815b294599a28caf77..8a7ce5a272fd741a8f7e425f3e88f28ed1c0c0b4 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,7 +1,7 @@ function getRole(){ return new Promise((resolve,reject)=>{ if(true){ - resolve(0) + resolve(2) }else{ reject('error') } diff --git a/static/applyappdetail.json b/static/applyappdetail.json new file mode 100644 index 0000000000000000000000000000000000000000..e2668e51dc513c33a54c662645c0efce43f22e26 --- /dev/null +++ b/static/applyappdetail.json @@ -0,0 +1,52 @@ +{ + "data": { + "appInfo": { + "id":"321321qeqweds", + "name": "Mapvideos", + "pic": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1589794724576&di=d0bff81ff3bb08f3120b3eb2bac58024&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201511%2F21%2F20151121171107_zMZcy.thumb.700_0.jpeg", + "first": [ + { + "name": "应用类型", + "text": "数据服务" + }, + { + "name": "业务领域", + "text": "应急领域" + }, + { + "name": "在线区域", + "text": "平台应用" + } + ], + "second": [ + { + "name": "审批状态", + "text": "审批通过", + "color":"#515fe7" + }, + { + "name": "所属组织", + "text": "北京比格大数据有限公司" + }, + { + "name": "申请时间", + "text": "2020-02-28 17:59:30" + } + ] + }, + "appbaseinfo":{ + "intorduce":"本应用将视频设备的空间位置信息精准匹配至地图上,通过点击地图上的视频设备能够实现在设备真实位置对视频进行调用,包括实时视频流数据的调用和对视频设备的操作,包括实时视频流数据的调用和对视频设备的操作,", + "action":"

1、在地图上查找视频设备\n 2、在地图上定位视频设备位置;\n3、调用多路视频的实时视频数据;\n4、操作球机视频设备

", + "use":"本应用将视频设备的空间位置信息精准匹配至地图上,通过点击地图上的视频设备能够实现在设备真实位置对视频进行调用,包括实时视频流数据的调用和对视频设备的操作,包括实时视频流数据的调用和对视频设备的操作,", + "appcode":"

repository: 'hub.wodcloud.com/apaas/apaas-mapvideos'\ntag: '1.0.0'\n\nhost: 'mapvideo.wodcloud.local'

", + "person":"张三丰", + "phone":13255668899 + }, + "appapplyinfo":{ + "scene":"申请mapvideos服务用于贵州省疫情监控决策指挥系统。", + "filename":"mapvideos申请书.docx", + "fileurl":"http://www.baidu.com", + "size":"申请获取应用镜像部署权限" + } + } +} diff --git a/static/approvalappdetail.json b/static/approvalappdetail.json new file mode 100644 index 0000000000000000000000000000000000000000..37e618e815b29ceec05520e00cd0cdbb20fa4b33 --- /dev/null +++ b/static/approvalappdetail.json @@ -0,0 +1,117 @@ +{ + "data":{ + "appInfo":{ + "name":"Mapvideos", + "pic":"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1589794724576&di=d0bff81ff3bb08f3120b3eb2bac58024&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201511%2F21%2F20151121171107_zMZcy.thumb.700_0.jpeg", + "first": [ + { + "name": "应用类型", + "text": "业务应用" + }, + { + "name": "业务领域", + "text": "应急领域" + }, + { + "name": "审批状态", + "text": "待审批", + "color":"#ef9433" + } + ], + "second": [ + { + "name": "在线区域", + "text": "平台应用" + }, + { + "name": "申请类型", + "text": "申请开发" + }, + { + "name":"所属组织", + "text":"北京比格大数据" + } + ] + }, + "appbaseinfo":{ + "company":"北京比格大数据有限公司", + "person":"李子维", + "phone":13566445588, + "desc":"

申请贵州省行政区划地图服务用于贵州省疫情监控决策指挥系统。

", + "filename":"xxxx文件名称.txt", + "fileurl":"http://www.baidu.com", + "time":"2020-02-25 12:23:25" + }, + "imagearr":[ + { + "name":"apaas-mapvideos镜像1123123123123", + "data":[ + { + "id":1, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + }, + { + "name":"apaas-mapvideos镜像2", + "data":[ + { + "id":1, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + }, + { + "name":"apaas-mapvideos镜像3", + "data":[ + { + "id":1, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/static/data.json b/static/data.json index 5e5d96cf2db9db2d2c2c330da01899b7eb4f591c..cb094b13818094b701cb0c655f439556c834b583 100644 --- a/static/data.json +++ b/static/data.json @@ -536,6 +536,44 @@ "bbh":"1.0.2" } ], + "fw_rank_arr":[ + { + "id":1, + "rank":1, + "name":"map", + "address":"http://www.baidu.com", + "times":45, + "time":0.5, + "hot":true + }, + { + "id":2, + "rank":2, + "name":"map", + "address":"http://www.baidu.com", + "times":45, + "time":0.5, + "hot":true + }, + { + "id":3, + "rank":3, + "name":"map", + "address":"http://www.baidu.com", + "times":45, + "time":0.5, + "hot":false + }, + { + "id":4, + "rank":4, + "name":"map", + "address":"http://www.baidu.com", + "times":45, + "time":0.5, + "hot":false + } + ], "fhcstx": [ { "id": 1, diff --git a/static/deployappdetail.json b/static/deployappdetail.json new file mode 100644 index 0000000000000000000000000000000000000000..8f1d704079a8a5c407f1e9ed0fe4681f03b1f4b9 --- /dev/null +++ b/static/deployappdetail.json @@ -0,0 +1,122 @@ +{ + "data":{ + "appInfo":{ + "name":"Mapvideos", + "pic":"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1589794724576&di=d0bff81ff3bb08f3120b3eb2bac58024&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201511%2F21%2F20151121171107_zMZcy.thumb.700_0.jpeg", + "first": [ + { + "name": "业务类型", + "text": "业务应用" + }, + { + "name": "业务领域", + "text": "应急领域" + } + ], + "second": [ + { + "name": "上架区域", + "text": "应用商店" + }, + { + "name": "部署区域", + "text": "apaas" + }, + { + "name":"部署时间", + "text":"2019-11-28" + } + ] + }, + "appbaseinfo":{ + "intorduce":"本应用将视频设备的空间位置信息精准匹配至地图上,通过点击地图上的视频设备能够实现在设备真实位置对视频进行调用,包括实时视频流数据的调用和对视频设备的操作,包括实时视频流数据的调用和对视频设备的操作,", + "action":"

1、在地图上查找视频设备\n 2、在地图上定位视频设备位置;\n3、调用多路视频的实时视频数据;\n4、操作球机视频设备

", + "use":"本应用将视频设备的空间位置信息精准匹配至地图上,通过点击地图上的视频设备能够实现在设备真实位置对视频进行调用,包括实时视频流数据的调用和对视频设备的操作,包括实时视频流数据的调用和对视频设备的操作,", + "appcode":"

repository: 'hub.wodcloud.com/apaas/apaas-mapvideos'\ntag: '1.0.0'\n\nhost: 'mapvideo.wodcloud.local'

", + "url":"http://www.baidu.com", + "url1":{ + "ip":"localhost", + "port":1122, + "user":"root", + "password":"1231231" + }, + "url2":{ + "text":"xxxx使用说明.doc", + "url":"http://www.baidu.com" + }, + "state":2, + "public":true + }, + "imagearr":[ + { + "name":"apaas-mapvideos镜像1123123123123", + "data":[ + { + "id":1, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + }, + { + "name":"apaas-mapvideos镜像2", + "data":[ + { + "id":1, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0.1", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + }, + { + "name":"apaas-mapvideos镜像3", + "data":[ + { + "id":1, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":2, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + }, + { + "id":3, + "vision":"V1.0.2", + "state":"运行中", + "date":"2020-05-07 09:10:47" + } + ] + } + ] + } +} \ No newline at end of file