From a0e272971a450b96c789ff168371a973499db1b7 Mon Sep 17 00:00:00 2001 From: zhangjun1 Date: Tue, 19 May 2020 17:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=93=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/ic_newdata.png | Bin 0 -> 1059 bytes src/assets/imgs/ic_olddata.png | Bin 0 -> 1059 bytes src/components/dialog-action.vue | 5 +- src/components/infoList.vue | 115 ++++---- src/components/service-header.vue | 223 ++++++++++------ src/pages/app_detail.vue | 424 ++++++++++++++++++++++++++++++ src/pages/app_edit.vue | 394 +++++++++++++++++++++++++++ src/pages/approval_app_detail.vue | 347 ++++++++++++++++++++++++ src/pages/workPlace.vue | 4 + src/router/index.js | 15 ++ src/store/index.js | 2 +- static/appdetail.json | 46 ++++ static/data.json | 7 + 13 files changed, 1448 insertions(+), 134 deletions(-) create mode 100644 src/assets/imgs/ic_newdata.png create mode 100644 src/assets/imgs/ic_olddata.png create mode 100644 src/pages/app_detail.vue create mode 100644 src/pages/app_edit.vue create mode 100644 src/pages/approval_app_detail.vue create mode 100644 static/appdetail.json diff --git a/src/assets/imgs/ic_newdata.png b/src/assets/imgs/ic_newdata.png new file mode 100644 index 0000000000000000000000000000000000000000..147b4361f7787afb25ecbf007d1ef1e78af72e84 GIT binary patch literal 1059 zcmaJ=Pe>F|93ETUM3V|F%aUFrgoZn_v+J%qgPV>!ySn6>tP3s#;q1&?chH$P&OF^! z3d9P`i-KJwD5z5qf*5u1(8Y@od5`GesY^(m3Kr>&y4s;_;LZEP_kF)V?|V;%2K(x2 znrbMDs*CqaNix@xai-c${%>FRJtxy;98Ke4l*M`3f|RJD3m9tkA82{Qt7TK}vC zhi3;<%Ivtpt917*&{YtKfDW+?3i^a$3xzO!pevBIbIj7<0D{NE^kGuz#1M!e3xWU> z^e9|M0Ce&U7xZ`Vd^_-Yxe)6Ov7Fz-1%(c;;PZi_k0#M9H7g{g*ikI93)4A_O@U?e z`8<>NGsqfaIiBZPuaEWlJOtsfXACSCJciv;QjnmnSel77WB^A|&Y&qArb(uUCFtg{ ztYIIui8PEY$R^7%UZB_RM(HuHcrBmeE%tIr)EsZCZUa{EQMTLw#5l$3K0v+ z7+EQVCQ4l#${~#G95O*9;&hD%ts|PDqP*R9z)2*8xM5@2P+(jN(?o^QG*yTNqJen(95q)h41z$LDF!j;N$9XseIi7Y`&n}%x4LOM7o zThPkqB9_%V;;Q9y=`G7;NiwW+xqn@D>4-SUSsq)LY>v$j4dQrvBcf&TVj`r#I(9l?&Y)Jr~xhc3tU)PnDTY@U>#=Ui(n}S=W#DtBa!h z_k8Z6yGW^by-&Y?lzP@18+Ixtt5=K73-4X)rxqR>Kbyh+(jx?JzkK#)ey0hq?7dpO zf91vY;;#XB+kVy7yPjg>lCWGv%ew|(T)X{UM0L8N@)A{l=X&d7<$Tt8w(;nowAMR1 F{|DyVPyYY_ literal 0 HcmV?d00001 diff --git a/src/assets/imgs/ic_olddata.png b/src/assets/imgs/ic_olddata.png new file mode 100644 index 0000000000000000000000000000000000000000..cfd5c72e2350189ddda4c0ef41ba61a88890df66 GIT binary patch literal 1059 zcmaJ=O-K|`93NMR@Cy$jee)Pg4BVZabw8ZJ&DNcDcfk=^m)wY`*_pTNpfhirdAg%W zWEN!+1Rf%Sv|ABGNry@(5a6vL56;V(Yf}|$pVG2sh&N3Qzjgo z>QBp4BQmGZ-KRj8%@Y9)VhPyVsBZCgm@ew_WbGU?G$=ywNSNM9DkBbnC^8`kc!F-3 z^#?$R^RU4VKgYELpO@`qyqyf&;bw!p-^=@ap!CrsnyKXYl+as>MRs9&7-NHHm_ni8 zDRg*{nP*sz;~1}x@%h{Y;kG7qEZJ_|YAGuS(2`Bnz$(&#qbOz3I1bY!)14ADV^>zU zN^K$yV{FM_SdZ5!sSFgw|3fux7j5Ab+{^c$!d80HfJ_QnXxx;^#pPO@PzE10p@fl{ zMrgF$#erdjku{7A5RE!r<3QVxsw=2qoh))hkx%LtmUI~=g)mK2JgTbjv0#uBdVB&G z3`AHq7KwQMY{Vb%vqC7ua(-W#D{le3p Hi&y>t=sQu3 literal 0 HcmV?d00001 diff --git a/src/components/dialog-action.vue b/src/components/dialog-action.vue index 6486049..f903f86 100644 --- a/src/components/dialog-action.vue +++ b/src/components/dialog-action.vue @@ -4,7 +4,7 @@ :visible.sync="show" width="400px" top="25vh" - class="user-dialog" + :class="{'user-dialog':true,'out':confirmOptions.position}" > @@ -85,6 +85,9 @@ export default { .el-dialog__body { padding: 49px 20px !important; } +.out .el-dialog__body{ + text-align: left; +} \ No newline at end of file + diff --git a/src/components/service-header.vue b/src/components/service-header.vue index 5395adb..e7dd52e 100644 --- a/src/components/service-header.vue +++ b/src/components/service-header.vue @@ -1,105 +1,170 @@ diff --git a/src/pages/app_detail.vue b/src/pages/app_detail.vue new file mode 100644 index 0000000..99b159b --- /dev/null +++ b/src/pages/app_detail.vue @@ -0,0 +1,424 @@ + + + + + + diff --git a/src/pages/app_edit.vue b/src/pages/app_edit.vue new file mode 100644 index 0000000..bb88bbb --- /dev/null +++ b/src/pages/app_edit.vue @@ -0,0 +1,394 @@ + + + + + + + + diff --git a/src/pages/approval_app_detail.vue b/src/pages/approval_app_detail.vue new file mode 100644 index 0000000..dc9c8c8 --- /dev/null +++ b/src/pages/approval_app_detail.vue @@ -0,0 +1,347 @@ + + + + + + diff --git a/src/pages/workPlace.vue b/src/pages/workPlace.vue index dbff60a..e4d3990 100644 --- a/src/pages/workPlace.vue +++ b/src/pages/workPlace.vue @@ -201,6 +201,7 @@ > {{now_user == 0?'我的应用':'平台应用'}} import("@/pages/yyglList"), }, + { + path: "/yygldetail/:level/0", // 应用仓库详情 + name: "appdetail", + component: () => import("@/pages/app_detail"), + }, + { + path: "/yygledit/:level/0", // 应用仓库编辑 + name: "appedit", + component: () => import("@/pages/app_edit"), + }, + { + path: "/yyglapprovaldetail/:level/1", // 应用仓库编辑 + name: "approval_app_detail", + component: () => import("@/pages/approval_app_detail"), + }, ], }, // 工作台 - 应用管理模块 { diff --git a/src/store/index.js b/src/store/index.js index 83ded3e..cf5d245 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -4,7 +4,7 @@ Vue.use(Vuex); const store = new Vuex.Store({ state: { - role: 1, // 0:普通用户,1:组织管理员,2:超级管理员 + role: 2, // 0:普通用户,1:组织管理员,2:超级管理员 serviceShopMenu: "shopDataList", // 服务超市侧边栏 fwglNav: [ ["注册发布的服务", "申请的服务", "审批的服务", "云资源服务"], // 普通用户 diff --git a/static/appdetail.json b/static/appdetail.json new file mode 100644 index 0000000..65afa5c --- /dev/null +++ b/static/appdetail.json @@ -0,0 +1,46 @@ +{ + "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": "应急领域" + } + ], + "second": [ + { + "name": "申请类型", + "text": "申请开发" + }, + { + "name": "申请开发次数", + "text": "41次" + }, + { + "name": "申请部署次数", + "text": "41次" + }, + { + "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'

" + } + } +} \ No newline at end of file diff --git a/static/data.json b/static/data.json index 878ecab..ca971b7 100644 --- a/static/data.json +++ b/static/data.json @@ -535,6 +535,13 @@ } ], + "imagearr":[ + { + "id":1, + "jxmc":"五五五五呜呜呜", + "bbh":"1.0.2" + } + ], "fhcstx": [ { "id": 1, -- 2.26.0