@@ -12,109 +16,125 @@
+
diff --git a/back/src/views/modules/ability/bsabilityai-relate-application.vue b/back/src/views/modules/ability/bsabilityai-relate-application.vue
new file mode 100644
index 00000000..a08a977a
--- /dev/null
+++ b/back/src/views/modules/ability/bsabilityai-relate-application.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+ {{ $t("cancel") }}
+ {{
+ $t("confirm")
+ }}
+
+
+
+
+
+
+
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index e06e60dc..7d38f206 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -1,10 +1,7 @@
-
+
- {{
+ {{
$t("query")
}}
@@ -49,7 +46,7 @@
:height="qp ? '650px' : '650px'"
border
@selection-change="dataListSelectionChangeHandle"
- style="width: 100%;"
+ style="width: 100%"
>
- {{
- findValue(scope.row.infoList, item.attrType)
- }}
+ {{ findValue(scope.row.infoList, item.attrType) }}
开发文档
+ 关联应用
@@ -124,192 +120,228 @@
ref="addOrUpdate"
@refreshDataList="getDataList"
>
+
diff --git a/back/src/views/modules/ability/bsabilityservice-add-or-update.vue b/back/src/views/modules/ability/bsabilityservice-add-or-update.vue
index 81b7d5ed..57e7a85e 100644
--- a/back/src/views/modules/ability/bsabilityservice-add-or-update.vue
+++ b/back/src/views/modules/ability/bsabilityservice-add-or-update.vue
@@ -10,9 +10,27 @@
-
填写字段
-
- {{item.name}}
+
+ 填写字段
+
+
+ {{ item.name }}
-
-
必填信息
+
+
+ 必填信息
+
-
+
-
+
-
+
-
+
-
@@ -64,16 +104,47 @@
-
+
-
-
{{item.name}}
-
-
-
+
+
+ {{ item.name }}
+
+
+
+
@@ -85,9 +156,24 @@
>
-
-
-
+
+
+
+
组件服务
+
发布情况统计
+
+
+
+
+
+
+
被调用组件及数量
+
+
+
+
+
+ {{index+1}}
+
+
{{item.name}}
+
{{item.count}}
+
+
+
+
+
+
被申请组件及数量
+
+
+
+
+
+ {{index+1}}
+
+
{{item.name}}
+
{{item.count}}
+
+
+
+
+
+
+
+
+
+
+
+ 部门发布情况
+
+
+ 部门使用情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+
+
+
申请人信息
+
+
+ 申请人： {{dataForm.content.applyUserName || '--'}}
+ 电话：{{dataForm.content.applyUserPhone || '--'}}
+ 单位：{{dataForm.content.applyUserDeptName || '--'}}
+
+
+ 应用领域：{{dataForm.content.detailsField || '--'}}
+ 需求类型： {{dataForm.content.detailsType || '--'}}
+ 需求标题： {{dataForm.content.demandSubject || '--'}}
+
+
+ 需求描述： {{dataForm.content.demandDetails|| '--'}}
+
+
+ 申请附件： {{dataForm.content.enclosure|| '--'}}
+
+
+
+
+
申请能力
+
+ - {{item.address}}
+ -
+
+
+
{{item.name}}{{item.type}}
+
{{item.describe}}
+
+
+
+
审批
+
+
+ 同意
+ 退回
+
+
+
+ 提交
+
+
+
申请人信息
+
+
+ 申请人： {{dataForm.content.user || '--'}}
+ 电话：{{dataForm.content.phone || '--'}}
+ 单位：{{dataForm.content.unit || '--'}}
+
+
+ 申请应用：{{dataForm.content.system || '--'}}
+ 应用场景： {{dataForm.content.scene || '--'}}
+ 申请依据： {{dataForm.content.basis || '--'}}
+
+
+ 能力应用期望效果： {{dataForm.content.demandDetails|| '--'}}
+
+
+ 申请附件： {{dataForm.content.enclosure|| '--'}}
+
+
+
+
+
申请能力
+
+ - {{item.address}}
+ -
+
+
+
{{item.name}}{{item.type}}
+
{{item.describe}}
+
+
+
+
审批
+
+
+ 同意
+ 退回
+
+
+
+ 提交
+
+
-
+
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
- {{ $t('add') }}
+ {{
+ $t("add")
+ }}
- {{ $t('deleteBatch') }}
+ {{
+ $t("deleteBatch")
+ }}
-
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
+
- {{ $t('model.design') }}
- {{ $t('model.deploy') }}
- {{ $t('export') }}
- {{ $t('delete') }}
+ {{ $t("model.design") }}
+ {{ $t("model.deploy") }}
+ {{ $t("export") }}
+ {{ $t("delete") }}
@@ -47,76 +124,90 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
-
+
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
- {{ $t('process.ended0') }}
- {{ $t('process.ended1') }}
+ {{
+ $t("process.ended0")
+ }}
+ {{
+ $t("process.ended1")
+ }}
-
+
-
-
-
+
+
+
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.viewFlowImage") }}
@@ -44,39 +115,39 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-join-task.vue b/back/src/views/modules/activiti/my-join-task.vue
index 1cbac2bf..1e5731c0 100644
--- a/back/src/views/modules/activiti/my-join-task.vue
+++ b/back/src/views/modules/activiti/my-join-task.vue
@@ -1,12 +1,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
+ style="width: 100%"
+ >
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.viewFlowImage") }}
@@ -43,39 +101,39 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-todo-task-pool.vue b/back/src/views/modules/activiti/my-todo-task-pool.vue
index c6c0802f..0e37969f 100644
--- a/back/src/views/modules/activiti/my-todo-task-pool.vue
+++ b/back/src/views/modules/activiti/my-todo-task-pool.vue
@@ -1,12 +1,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
-
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
+
+
- {{ $t('process.claim') }}
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.claim") }}
+ {{ $t("process.viewFlowImage") }}
@@ -37,59 +105,62 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue
index 15a93f0c..d9c0482b 100644
--- a/back/src/views/modules/activiti/my-todo-task.vue
+++ b/back/src/views/modules/activiti/my-todo-task.vue
@@ -2,18 +2,28 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-27 19:34:30
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-04-28 19:26:07
+ * @LastEditTime: 2022-06-23 21:08:01
* @Description: 告诉大家这是什么
-->
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
+ style="width: 100%"
+ >
+
- {{scope.row.params && scope.row.params.user||scope.row.params && scope.row.params.applyUserName||scope.row.params && scope.row.params.userName||scope.row.params && scope.row.params.undercarriageUserName}}
+ {{
+ (scope.row.params && scope.row.params.user) ||
+ (scope.row.params && scope.row.params.applyUserName) ||
+ (scope.row.params && scope.row.params.userName) ||
+ (scope.row.params && scope.row.params.undercarriageUserName)||
+ (scope.row.params && scope.row.params.name)
+ }}
-
+
- {{scope.row.params && scope.row.params.system||scope.row.params && scope.row.params.demandSubject||scope.row.params && scope.row.params.resourceDTO && scope.row.params.resourceDTO.name||scope.row.params && scope.row.params.undercarriageReason}}
+ {{
+ (scope.row.params && scope.row.params.system) ||
+ (scope.row.params && scope.row.params.demandSubject) ||
+ (scope.row.params &&
+ scope.row.params.resourceDTO &&
+ scope.row.params.resourceDTO.name) ||
+ (scope.row.params && scope.row.params.undercarriageReason)||
+ (scope.row.params && scope.row.params.comment)
+ }}
-
-
+
+
-
-
+
+
- {{ $t('manage') }}
- {{ $t('process.viewFlowImage') }}
+ {{ $t("manage") }}
+ {{ $t("process.viewFlowImage") }}
@@ -54,7 +120,8 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
@@ -81,11 +148,11 @@ export default {
processInstanceId: ''
}
},
- components: {
- },
+ components: {},
methods: {
// 处理
taskHandle (row) {
+ console.log('row======================>', row, this.forwardHandleUrl)
if (!row.businessKey) {
return this.$message.error(this.$t('task.businessKeyError'))
}
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 269de89d..2c49710e 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -8,46 +8,70 @@
clearable
/>
- 查询
- 重置
+ 查询
+ 重置
批量删除
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ class="button-text-new"
+ @click="deleteData"
+ >批量删除
动态发布
+ >动态发布
-
-
-
-
+
+
+
+
- {{scope.row.title}}
+ {{ scope.row.title }}
- {{scope.row.content}}
+ {{ scope.row.content }}
-
+
- 编辑
-
-
+
+
-
+
+
+
-
-
- 点击上传
- 只能上传jpg/png文件，且不超过500kb
-
+
+ 点击上传
+
+ 只能上传jpg/png文件，且不超过500kb
+
+
-
-
+
+
+
+
-
-
- 点击上传
- 只能上传图片文件
-
-
+
+ 点击上传
+ 只能上传图片文件
+
+
+
+
+
+
+
+ {{ previewData.title }}
+
+
+ 发布时间：
+ {{ previewData.updateDate }}
+
+
+
+ 摘要：
+ {{ previewData.note1 }}
+
+
+
![]()
+
+
+
+ {{ previewData.content }}
+
+
![]()
+ ![]()
@@ -222,15 +340,15 @@
+
diff --git a/back/src/views/modules/bscatalogue/ManagementPop.vue b/back/src/views/modules/bscatalogue/ManagementPop.vue
index d38da34f..faab5067 100644
--- a/back/src/views/modules/bscatalogue/ManagementPop.vue
+++ b/back/src/views/modules/bscatalogue/ManagementPop.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-05-06 11:17:55
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-08 17:19:11
+ * @LastEditTime: 2022-06-20 17:40:52
* @Description: 编目弹窗
-->
@@ -441,17 +441,7 @@ export default {
const newData = [...this.data]
this.editData = {}
newData.forEach(val => {
- if (val.key === key) {
- this.editData = val
- } else {
- if (val.children) {
- val.children.forEach(item => {
- if (item.key === key) {
- this.editData = item
- }
- })
- }
- }
+ this.handleChangeFor(val, key)
})
if (this.editData) {
this.editData[column] = value
@@ -459,6 +449,17 @@ export default {
}
console.log(this.data)
},
+ handleChangeFor (val, key) {
+ if (val.key === key) {
+ this.editData = val
+ } else {
+ if (val.children) {
+ val.children.forEach(item => {
+ this.handleChangeFor(item, key)
+ })
+ }
+ }
+ },
edit (key) {
if (this.flag) {
const newData = [...this.data]
diff --git a/back/src/views/modules/canassigncase/canassigncase-add-or-update.vue b/back/src/views/modules/canassigncase/canassigncase-add-or-update.vue
new file mode 100644
index 00000000..cfffea3d
--- /dev/null
+++ b/back/src/views/modules/canassigncase/canassigncase-add-or-update.vue
@@ -0,0 +1,515 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dataFormShowDetails.name || "--" }}
+
+
+ {{ dataFormShowDetails.apiUrl || "--" }}
+
+
+ {{ item.attrValue || "--" }}
+
+
+
+ {{ $t("cancel") }}
+ {{
+ $t("confirm")
+ }}
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ {{
+ $t("query")
+ }}
+
+
+ {{
+ $t("export")
+ }}
+
+
+ 挂接
+
+
+ {{ $t("deleteBatch") }}
+
+
+ 重置
+
+
+
+
+
+
+
+
+ {{ findValue(scope.row.infoList, item.attrType) }}
+
+
+
+
+ {{ $t("update") }}
+ {{ $t("delete") }}
+ 展示
+ 开发文档
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+ 只能上传{{ accept }}文件，最多上传{{ limit }}个附件！
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue
new file mode 100644
index 00000000..ee292abe
--- /dev/null
+++ b/back/src/views/modules/project/list.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ {{ $t('reset') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/back/src/views/modules/project/use.vue b/back/src/views/modules/project/use.vue
new file mode 100644
index 00000000..916d3290
--- /dev/null
+++ b/back/src/views/modules/project/use.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/back/src/views/modules/sys/user-add-or-update.vue b/back/src/views/modules/sys/user-add-or-update.vue
index 7644356c..e8537498 100644
--- a/back/src/views/modules/sys/user-add-or-update.vue
+++ b/back/src/views/modules/sys/user-add-or-update.vue
@@ -7,10 +7,10 @@
-
-
+
+
-
+
@@ -51,6 +51,7 @@
diff --git a/back/src/views/pages/login.vue b/back/src/views/pages/login.vue
index 4c19e5f8..bd45c266 100644
--- a/back/src/views/pages/login.vue
+++ b/back/src/views/pages/login.vue
@@ -59,6 +59,7 @@
+
+
diff --git a/front/public/static/config/footerData.js b/front/public/static/config/footerData.js
new file mode 100644
index 00000000..87f76588
--- /dev/null
+++ b/front/public/static/config/footerData.js
@@ -0,0 +1,48 @@
+/*
+ * @Author: zhangfeihu
+ * @Date: 2022-06-16 16:37:31
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-20 16:18:04
+ * @FilePath: \qiantai\front\public\static\config\footerData.js
+ * @Description: 底部菜单数据配置配置
+ */
+// const footerDataList = {
+// 市局
+// company: {
+// left: '青岛市大数据发展管理局建设',
+// right: '海信网络科技股份有限公司'
+// },
+// address: [
+// {
+// name: '鲁IC备00000000号',
+// value: '政府标识码3702000106',
+// },
+// {
+// name: '版权所有：青岛市大数据发展管理局',
+// value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+// },
+// {
+// name: '电话：0532-8561234',
+// value: '传真：0532-2145122',
+// },
+// ]
+// 西海岸
+// company: {
+// left: '青岛西海岸新区大数据发展促进局建设',
+// right: 'v0.81'
+// },
+// address: [
+// {
+// name: '鲁IC备00000000号',
+// value: '政府标识码3702000106',
+// },
+// {
+// name: '版权所有：青岛西海岸新区大数据发展促进局',
+// value: '地址：青岛市西海岸新区长江中路369号',
+// },
+// {
+// name: '电话：0532-86986596',
+// value: '传真：0532-86986596',
+// },
+// ]
+// }
diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
new file mode 100644
index 00000000..0b247bc1
--- /dev/null
+++ b/front/public/static/config/location.js
@@ -0,0 +1,178 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2020-07-07 16:03:23
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-25 16:47:35
+ * @Description: 数据资源参数配置
+ */
+// const newLocation = 'qingdao'
+// const newLocation = 'baotou'
+const newLocation = 'qingdao'
+
+// 数据资源数据
+const whoShow = {}
+const launchedDataNumObject = {}
+// 导航数据
+const navListManagement = {}
+// 区市站点数据
+const mapTestNum = {}
+// 底部数据
+const footerDataList = {}
+// qingdao
+if (newLocation === 'qingdao') {
+ whoShow.itShowQingDao = true
+ navListManagement.navList = [
+ { name: '共享门户', key: 'home' },
+ { name: '能力集市', key: 'DetailsPageconetent' },
+ { name: '能力云图', key: 'capabilityCloud' },
+ { name: '能力统计', key: 'abilityStatistics' },
+ { name: '开发指南', key: 'developmentGuide' },
+ { name: '需求中心', key: 'demandCenter' },
+ // { name: '个人中心', key: 'personalCenter' },
+ { name: '区市站点', key: 'mapTest' },
+ // { name: '后台管理', key: 'houtaiguanli' },
+ { name: '赋能案例', key: 'assignCase' },
+ ]
+ footerDataList.footerList = {
+ company: {
+ left: '青岛市大数据发展管理局建设',
+ right: '海信网络科技股份有限公司',
+ },
+ address: [
+ {
+ name: '鲁IC备00000000号',
+ value: '政府标识码3702000106',
+ },
+ {
+ name: '版权所有：青岛市大数据发展管理局',
+ value: '地址：山东省青岛市香港中路17号市级机关办公楼',
+ },
+ {
+ name: '电话：0532-8561234',
+ value: '传真：0532-2145122',
+ },
+ ],
+ }
+ mapTestNum.lsNum = [
+ {
+ name: '基础设施',
+ key: 'lsjcss',
+ num: '20135路',
+ },
+ {
+ name: '数据资源',
+ key: 'lsjcss',
+ num: '857条',
+ },
+ {
+ name: '应用资源',
+ key: 'lsjcss',
+ num: '28个',
+ },
+ ]
+ mapTestNum.xhaNum = [
+ {
+ name: '基础设施',
+ key: 'xhajcss',
+ num: '35282路',
+ },
+ {
+ name: '数据资源',
+ key: 'xhajcss',
+ num: '11类',
+ },
+ {
+ name: '应用资源',
+ key: 'xhajcss',
+ num: '23个',
+ },
+ {
+ name: '组件服务',
+ key: 'xhazjfw',
+ num: '8个',
+ },
+ ]
+}
+// baotou
+else if (newLocation === 'baotou') {
+ whoShow.itShowBaoTou = true
+ launchedDataNumObject.launchedDataNum = [
+ {
+ num: 10372,
+ },
+ {
+ num: 1080,
+ },
+ {
+ num: 976,
+ },
+ ]
+ navListManagement.navList = [
+ { name: '共享门户', key: 'home' },
+ { name: '能力集市', key: 'DetailsPageconetent' },
+ { name: '能力云图', key: 'capabilityCloud' },
+ { name: '能力统计', key: 'abilityStatistics' },
+ { name: '开发指南', key: 'developmentGuide' },
+ { name: '需求中心', key: 'demandCenter' },
+ // { name: '个人中心', key: 'personalCenter' },
+ // { name: '区市站点', key: 'mapTest' },
+ // { name: '后台管理', key: 'houtaiguanli' },
+ { name: '赋能案例', key: 'assignCase' },
+ ]
+ footerDataList.footerList = {
+ company: {
+ left: '包头市工业和信息化局大数据中心建设',
+ right: '海信网络科技股份有限公司',
+ },
+ address: [
+ {
+ name: '蒙ICP备05003330-1号',
+ value: '政府标识码1502000040',
+ },
+ {
+ name: '版权所有：包头市工业和信息化局大数据中心',
+ value: '地址：内蒙古自治区包头市九原区开元大街1号',
+ },
+ {
+ name: '电话：0472-5618235',
+ value: '传真：0472-5618235',
+ },
+ ],
+ }
+}
+// xihaian
+else if (newLocation === 'xihaian') {
+ whoShow.itShowXiHaiAn = true
+ navListManagement.navList = [
+ { name: '共享门户', key: 'home' },
+ { name: '能力集市', key: 'DetailsPageconetent' },
+ { name: '能力云图', key: 'capabilityCloud' },
+ { name: '能力统计', key: 'abilityStatistics' },
+ { name: '开发指南', key: 'developmentGuide' },
+ { name: '需求中心', key: 'demandCenter' },
+ // { name: '个人中心', key: 'personalCenter' },
+ // { name: '区市站点', key: 'mapTest' },
+ // { name: '后台管理', key: 'houtaiguanli' },
+ { name: '赋能案例', key: 'assignCase' },
+ ]
+ footerDataList.footerList = {
+ company: {
+ left: '青岛西海岸新区大数据发展促进局建设',
+ right: 'v0.81',
+ },
+ address: [
+ {
+ name: '鲁IC备00000000号',
+ value: '政府标识码3702000106',
+ },
+ {
+ name: '版权所有：青岛西海岸新区大数据发展促进局',
+ value: '地址：青岛市西海岸新区长江中路369号',
+ },
+ {
+ name: '电话：0532-86986596',
+ value: '传真：0532-86986596',
+ },
+ ],
+ }
+}
diff --git a/front/public/static/image/test.jpg b/front/public/static/image/test.jpg
index 9feacaa9..63525d55 100644
Binary files a/front/public/static/image/test.jpg and b/front/public/static/image/test.jpg differ
diff --git a/front/src/App.vue b/front/src/App.vue
index fb388474..ee08e473 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -1,8 +1,8 @@
@@ -26,4 +26,11 @@
diff --git a/front/src/api/capabilityCloud.js b/front/src/api/capabilityCloud.js
new file mode 100644
index 00000000..109ccc44
--- /dev/null
+++ b/front/src/api/capabilityCloud.js
@@ -0,0 +1,82 @@
+/*
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-20 09:20:28
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-22 16:06:08
+ * @Description: 告诉大家这是什么
+ */
+import request from '@/utils/request'
+//能力云图-知识库
+export function KnowledgeBaseStatic() {
+ return request({
+ url: '/census/center/v2/knowledgeInfo',
+ method: 'get',
+ })
+}
+//能力云图-概览总数
+export function wholeAmount() {
+ return request({
+ url: '/census/center/v2/whole_amount',
+ method: 'get',
+ })
+}
+//能力云图-概览ehcarts
+export function trafficStatistics(data) {
+ return request({
+ url: '/census/center/v2/trafficStatistics',
+ method: 'post',
+ data,
+ })
+}
+//能力云图-应用资源总数
+export function applicationNum() {
+ return request({
+ url: '/census/center/v2/applicationNum',
+ method: 'get',
+ })
+}
+//能力云图-区市应用资源排名
+export function districtResourceRank() {
+ return request({
+ url: '/census/center/v2/districtResourceRank',
+ method: 'get',
+ })
+}
+//能力云图-委办局应用资源分布
+export function cityResourceRank() {
+ return request({
+ url: '/census/center/v2/cityResourceRank',
+ method: 'get',
+ })
+}
+//能力云图-组件服务
+export function assemblerBaseStatic() {
+ return request({
+ url: '/census/center/v2/assemblerInfo',
+ method: 'get',
+ })
+}
+//能力云图-组件服务排行
+export function componentServiceRank(params) {
+ return request({
+ url: '/census/center/v2/componentServiceRank',
+ method: 'get',
+ params,
+ })
+}
+//能力云图-基础设施
+export function infrastructureInfo(params) {
+ return request({
+ url: '/census/center/v2/infrastructureInfo',
+ method: 'get',
+ params,
+ })
+}
+//能力云图-数据资源
+export function dataResourceInfo(params) {
+ return request({
+ url: '/census/center/v2/dataResourceInfo',
+ method: 'get',
+ params,
+ })
+}
diff --git a/front/src/api/demandCenter.js b/front/src/api/demandCenter.js
index 21fdb8fb..75d5dd37 100644
--- a/front/src/api/demandCenter.js
+++ b/front/src/api/demandCenter.js
@@ -1,3 +1,10 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:43:30
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-06-23 20:04:39
+ * @Description: 告诉大家这是什么
+ */
import request from '@/utils/request'
export function demandComment(data) {
@@ -7,6 +14,13 @@ export function demandComment(data) {
data,
})
}
+export function demandCommentApply(data) {
+ return request({
+ url: '/comment/center/apply',
+ method: 'post',
+ data,
+ })
+}
export function demandCommentPage(params) {
return request({
diff --git a/front/src/api/file.js b/front/src/api/file.js
index 9777ab36..96f3d1ea 100644
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-04-20 17:16:35
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-05-26 22:40:46
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-22 14:57:16
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
@@ -46,3 +46,50 @@ export function correct(params) {
export function paddleocr(params) {
return axios.post('http://15.72.183.90:7008/paddleocr', params, config2)
}
+
+// 能力云图-数据资源
+export function count() {
+ return axios.post(
+ 'http://10.134.135.24:30058/share-portal/platform/index/abilityMarket/count',
+ config2
+ )
+}
+export function getVideoList(params) {
+ return axios.get(
+ 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraListByName?name=' +
+ params.name +
+ '&pageNo=' +
+ params.pageNo +
+ '&pageSize=' +
+ params.pageSize,
+ config2
+ )
+}
+// 能力云图-数据资源-总数据数
+export function getRecord(params) {
+ return axios.get(
+ 'http://10.134.135.24:30090/api/share-portal/platform/catalogue/query?serviceName=' +
+ params.serviceName +
+ '&orderField=' +
+ params.orderField +
+ '&orderType=' +
+ params.orderType +
+ '&pageNum=' +
+ params.pageNum +
+ '&pageSize=' +
+ params.pageSize +
+ '&serviceType=' +
+ params.serviceType,
+ config2
+ )
+}
+
+export function getHls(params) {
+ return axios.get(
+ 'http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=' +
+ params.cameraId +
+ '&protocol=' +
+ params.protocol,
+ config2
+ )
+}
diff --git a/front/src/api/home.js b/front/src/api/home.js
index 45b11360..6f560eb9 100644
--- a/front/src/api/home.js
+++ b/front/src/api/home.js
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-01 19:19:40
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-05-24 19:58:09
+ * @LastEditTime: 2022-06-22 18:59:03
* @Description: 告诉大家这是什么
*/
import request from '@/utils/request'
@@ -62,7 +62,14 @@ export function pageWithAttrs(data) {
data,
})
}
-
+// 获取hls视频流
+export function getHls(params) {
+ return request({
+ url: '/resource/hls/getHls',
+ method: 'get',
+ params,
+ })
+}
// 加入申购车
export function sgcInsert(data) {
return request({
@@ -282,3 +289,11 @@ export function mynoticeRead(params) {
params,
})
}
+// 消息提醒已读
+export function getDataResource(data) {
+ return request({
+ url: '/resource/getDataResource',
+ method: 'post',
+ data,
+ })
+}
diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js
index db9b6a2e..8e825bd7 100644
--- a/front/src/api/personalCenter.js
+++ b/front/src/api/personalCenter.js
@@ -78,6 +78,14 @@ export function scInsert(data) {
})
}
+// 查询浏览列表
+export function getBsList(params) {
+ return request({
+ url: '/resourceBrowse/page',
+ method: 'get',
+ params,
+ })
+}
// 查询收藏列表
export function getScList(params) {
return request({
@@ -86,7 +94,6 @@ export function getScList(params) {
params,
})
}
-
// 批量取消收藏
export function scDel(data) {
return request({
@@ -95,6 +102,14 @@ export function scDel(data) {
data,
})
}
+// 批量取消浏览
+export function BsDel(data) {
+ return request({
+ url: '/resourceBrowse/delete',
+ method: 'delete',
+ data,
+ })
+}
// 查询我的发布列表
export function wodepage(params) {
return request({
diff --git a/front/src/assets/capabilityCloud/Component_services_bg.png b/front/src/assets/capabilityCloud/Component_services_bg.png
new file mode 100644
index 00000000..3005bd0f
Binary files /dev/null and b/front/src/assets/capabilityCloud/Component_services_bg.png differ
diff --git a/front/src/assets/capabilityCloud/Component_services_content_bg.png b/front/src/assets/capabilityCloud/Component_services_content_bg.png
new file mode 100644
index 00000000..457c47f3
Binary files /dev/null and b/front/src/assets/capabilityCloud/Component_services_content_bg.png differ
diff --git a/front/src/assets/capabilityCloud/Component_services_snum.png b/front/src/assets/capabilityCloud/Component_services_snum.png
new file mode 100644
index 00000000..6a77791d
Binary files /dev/null and b/front/src/assets/capabilityCloud/Component_services_snum.png differ
diff --git a/front/src/assets/capabilityCloud/Component_services_title.png b/front/src/assets/capabilityCloud/Component_services_title.png
new file mode 100644
index 00000000..6e29000f
Binary files /dev/null and b/front/src/assets/capabilityCloud/Component_services_title.png differ
diff --git a/front/src/assets/capabilityCloud/Component_services_title_bg.png b/front/src/assets/capabilityCloud/Component_services_title_bg.png
new file mode 100644
index 00000000..5e75ec53
Binary files /dev/null and b/front/src/assets/capabilityCloud/Component_services_title_bg.png differ
diff --git a/front/src/assets/capabilityCloud/Knowledge-look.png b/front/src/assets/capabilityCloud/Knowledge-look.png
new file mode 100644
index 00000000..bad7219e
Binary files /dev/null and b/front/src/assets/capabilityCloud/Knowledge-look.png differ
diff --git a/front/src/assets/capabilityCloud/Knowledge-title.png b/front/src/assets/capabilityCloud/Knowledge-title.png
new file mode 100644
index 00000000..6b536f8b
Binary files /dev/null and b/front/src/assets/capabilityCloud/Knowledge-title.png differ
diff --git a/front/src/assets/capabilityCloud/Knowledge-up.png b/front/src/assets/capabilityCloud/Knowledge-up.png
new file mode 100644
index 00000000..7b086805
Binary files /dev/null and b/front/src/assets/capabilityCloud/Knowledge-up.png differ
diff --git a/front/src/assets/capabilityCloud/bg.png b/front/src/assets/capabilityCloud/bg.png
new file mode 100644
index 00000000..79fed5e8
Binary files /dev/null and b/front/src/assets/capabilityCloud/bg.png differ
diff --git a/front/src/assets/capabilityCloud/bt.png b/front/src/assets/capabilityCloud/bt.png
new file mode 100644
index 00000000..5e75ec53
Binary files /dev/null and b/front/src/assets/capabilityCloud/bt.png differ
diff --git a/front/src/assets/capabilityCloud/font/DIN-Bold.otf b/front/src/assets/capabilityCloud/font/DIN-Bold.otf
new file mode 100644
index 00000000..782e68e8
Binary files /dev/null and b/front/src/assets/capabilityCloud/font/DIN-Bold.otf differ
diff --git a/front/src/assets/capabilityCloud/font/SourceHanSansCN-Regular.otf b/front/src/assets/capabilityCloud/font/SourceHanSansCN-Regular.otf
new file mode 100644
index 00000000..886f82f8
Binary files /dev/null and b/front/src/assets/capabilityCloud/font/SourceHanSansCN-Regular.otf differ
diff --git a/front/src/assets/capabilityCloud/font/ZhiheiJ-W5.ttf b/front/src/assets/capabilityCloud/font/ZhiheiJ-W5.ttf
new file mode 100644
index 00000000..55bb8909
Binary files /dev/null and b/front/src/assets/capabilityCloud/font/ZhiheiJ-W5.ttf differ
diff --git a/front/src/assets/capabilityCloud/header.png b/front/src/assets/capabilityCloud/header.png
new file mode 100644
index 00000000..cd594768
Binary files /dev/null and b/front/src/assets/capabilityCloud/header.png differ
diff --git a/front/src/assets/capabilityCloud/infrastructure_gz.png b/front/src/assets/capabilityCloud/infrastructure_gz.png
new file mode 100644
index 00000000..44dddf51
Binary files /dev/null and b/front/src/assets/capabilityCloud/infrastructure_gz.png differ
diff --git a/front/src/assets/capabilityCloud/infrastructure_sz.png b/front/src/assets/capabilityCloud/infrastructure_sz.png
new file mode 100644
index 00000000..832336c5
Binary files /dev/null and b/front/src/assets/capabilityCloud/infrastructure_sz.png differ
diff --git a/front/src/assets/capabilityCloud/infrastructure_title.png b/front/src/assets/capabilityCloud/infrastructure_title.png
new file mode 100644
index 00000000..a8503dac
Binary files /dev/null and b/front/src/assets/capabilityCloud/infrastructure_title.png differ
diff --git a/front/src/assets/capabilityCloud/infrastructure_yz.png b/front/src/assets/capabilityCloud/infrastructure_yz.png
new file mode 100644
index 00000000..413a071d
Binary files /dev/null and b/front/src/assets/capabilityCloud/infrastructure_yz.png differ
diff --git a/front/src/assets/capabilityCloud/jszyys.png b/front/src/assets/capabilityCloud/jszyys.png
new file mode 100644
index 00000000..b1adc77e
Binary files /dev/null and b/front/src/assets/capabilityCloud/jszyys.png differ
diff --git a/front/src/assets/capabilityCloud/pt_bg.png b/front/src/assets/capabilityCloud/pt_bg.png
new file mode 100644
index 00000000..c1acfaa1
Binary files /dev/null and b/front/src/assets/capabilityCloud/pt_bg.png differ
diff --git a/front/src/assets/capabilityCloud/resources-left.png b/front/src/assets/capabilityCloud/resources-left.png
new file mode 100644
index 00000000..64d356c1
Binary files /dev/null and b/front/src/assets/capabilityCloud/resources-left.png differ
diff --git a/front/src/assets/capabilityCloud/resources-right.png b/front/src/assets/capabilityCloud/resources-right.png
new file mode 100644
index 00000000..792bd246
Binary files /dev/null and b/front/src/assets/capabilityCloud/resources-right.png differ
diff --git a/front/src/assets/capabilityCloud/resources-title.png b/front/src/assets/capabilityCloud/resources-title.png
new file mode 100644
index 00000000..a8503dac
Binary files /dev/null and b/front/src/assets/capabilityCloud/resources-title.png differ
diff --git a/front/src/assets/capabilityCloud/select.png b/front/src/assets/capabilityCloud/select.png
new file mode 100644
index 00000000..b2d66308
Binary files /dev/null and b/front/src/assets/capabilityCloud/select.png differ
diff --git a/front/src/assets/capabilityCloud/select_sj.png b/front/src/assets/capabilityCloud/select_sj.png
new file mode 100644
index 00000000..4ca5b6b2
Binary files /dev/null and b/front/src/assets/capabilityCloud/select_sj.png differ
diff --git a/front/src/assets/capabilityCloud/top_bg.png b/front/src/assets/capabilityCloud/top_bg.png
new file mode 100644
index 00000000..3005bd0f
Binary files /dev/null and b/front/src/assets/capabilityCloud/top_bg.png differ
diff --git a/front/src/assets/capabilityCloud/tyyys.png b/front/src/assets/capabilityCloud/tyyys.png
new file mode 100644
index 00000000..d498103b
Binary files /dev/null and b/front/src/assets/capabilityCloud/tyyys.png differ
diff --git a/front/src/assets/capabilityCloud/zyys.png b/front/src/assets/capabilityCloud/zyys.png
new file mode 100644
index 00000000..dd8b0bbd
Binary files /dev/null and b/front/src/assets/capabilityCloud/zyys.png differ
diff --git a/front/src/assets/capabilityCloud/字体/DIN-Bold.otf b/front/src/assets/capabilityCloud/字体/DIN-Bold.otf
new file mode 100644
index 00000000..782e68e8
Binary files /dev/null and b/front/src/assets/capabilityCloud/字体/DIN-Bold.otf differ
diff --git a/front/src/assets/capabilityCloud/字体/SourceHanSansCN-Regular.otf b/front/src/assets/capabilityCloud/字体/SourceHanSansCN-Regular.otf
new file mode 100644
index 00000000..886f82f8
Binary files /dev/null and b/front/src/assets/capabilityCloud/字体/SourceHanSansCN-Regular.otf differ
diff --git a/front/src/assets/capabilityCloud/字体/腾祥智黑简-W5.ttf b/front/src/assets/capabilityCloud/字体/腾祥智黑简-W5.ttf
new file mode 100644
index 00000000..55bb8909
Binary files /dev/null and b/front/src/assets/capabilityCloud/字体/腾祥智黑简-W5.ttf differ
diff --git a/front/src/assets/detailsAll/business/business_element_content.png b/front/src/assets/detailsAll/business/business_element_content.png
new file mode 100644
index 00000000..fcc845ad
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_element_content.png differ
diff --git a/front/src/assets/detailsAll/business/business_module_bg.png b/front/src/assets/detailsAll/business/business_module_bg.png
new file mode 100644
index 00000000..e2103195
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_module_bg.png differ
diff --git a/front/src/assets/detailsAll/business/business_next.png b/front/src/assets/detailsAll/business/business_next.png
new file mode 100644
index 00000000..eb117001
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_next.png differ
diff --git a/front/src/assets/detailsAll/business/business_previous.png b/front/src/assets/detailsAll/business/business_previous.png
new file mode 100644
index 00000000..626b1ec4
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_previous.png differ
diff --git a/front/src/assets/detailsAll/business/business_right_bg.png b/front/src/assets/detailsAll/business/business_right_bg.png
new file mode 100644
index 00000000..a20d8200
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_right_bg.png differ
diff --git a/front/src/assets/detailsAll/business/business_usage_mode_bg.png b/front/src/assets/detailsAll/business/business_usage_mode_bg.png
new file mode 100644
index 00000000..3c2ef340
Binary files /dev/null and b/front/src/assets/detailsAll/business/business_usage_mode_bg.png differ
diff --git a/front/src/assets/detailsAll/kfzj_sybg.png b/front/src/assets/detailsAll/kfzj_sybg.png
new file mode 100644
index 00000000..da73cecb
Binary files /dev/null and b/front/src/assets/detailsAll/kfzj_sybg.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-apply-using.png b/front/src/assets/detailsAll/layer-service/layer-apply-using.png
new file mode 100644
index 00000000..c3a2e867
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-apply-using.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-bg.png b/front/src/assets/detailsAll/layer-service/layer-bg.png
new file mode 100644
index 00000000..f4d8bce5
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-bg.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-bgShow.png b/front/src/assets/detailsAll/layer-service/layer-bgShow.png
new file mode 100644
index 00000000..763ba6a7
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-bgShow.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-icon.png b/front/src/assets/detailsAll/layer-service/layer-icon.png
new file mode 100644
index 00000000..4550574a
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-icon.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-shopping-car.png b/front/src/assets/detailsAll/layer-service/layer-shopping-car.png
new file mode 100644
index 00000000..930fd77d
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-shopping-car.png differ
diff --git a/front/src/assets/detailsAll/layer-service/layer-top-bg.png b/front/src/assets/detailsAll/layer-service/layer-top-bg.png
new file mode 100644
index 00000000..cfb09d6d
Binary files /dev/null and b/front/src/assets/detailsAll/layer-service/layer-top-bg.png differ
diff --git a/front/src/assets/home/font/Alibaba-PuHuiTi-Bold.otf b/front/src/assets/home/font/Alibaba-PuHuiTi-Bold.otf
new file mode 100644
index 00000000..2ed20268
Binary files /dev/null and b/front/src/assets/home/font/Alibaba-PuHuiTi-Bold.otf differ
diff --git a/front/src/assets/home/font/Alibaba-PuHuiTi-Heavy.otf b/front/src/assets/home/font/Alibaba-PuHuiTi-Heavy.otf
new file mode 100644
index 00000000..28c3b45b
Binary files /dev/null and b/front/src/assets/home/font/Alibaba-PuHuiTi-Heavy.otf differ
diff --git a/front/src/assets/home/font/Alibaba-PuHuiTi-Light.otf b/front/src/assets/home/font/Alibaba-PuHuiTi-Light.otf
new file mode 100644
index 00000000..3f4a6e30
Binary files /dev/null and b/front/src/assets/home/font/Alibaba-PuHuiTi-Light.otf differ
diff --git a/front/src/assets/home/font/Alibaba-PuHuiTi-Medium.otf b/front/src/assets/home/font/Alibaba-PuHuiTi-Medium.otf
new file mode 100644
index 00000000..a308250b
Binary files /dev/null and b/front/src/assets/home/font/Alibaba-PuHuiTi-Medium.otf differ
diff --git a/front/src/assets/home/font/Alibaba-PuHuiTi-Regular.otf b/front/src/assets/home/font/Alibaba-PuHuiTi-Regular.otf
new file mode 100644
index 00000000..5960ba12
Binary files /dev/null and b/front/src/assets/home/font/Alibaba-PuHuiTi-Regular.otf differ
diff --git a/front/src/assets/home/jcss-bg.png b/front/src/assets/home/jcss-bg.png
new file mode 100644
index 00000000..3f669f05
Binary files /dev/null and b/front/src/assets/home/jcss-bg.png differ
diff --git a/front/src/assets/home/pageResource/bg.png b/front/src/assets/home/pageResource/bg.png
new file mode 100644
index 00000000..9c2bde45
Binary files /dev/null and b/front/src/assets/home/pageResource/bg.png differ
diff --git a/front/src/assets/home/pageResource/catalogue-bg.png b/front/src/assets/home/pageResource/catalogue-bg.png
new file mode 100644
index 00000000..4d1e7cde
Binary files /dev/null and b/front/src/assets/home/pageResource/catalogue-bg.png differ
diff --git a/front/src/assets/home/pageResource/catalogue-icon.png b/front/src/assets/home/pageResource/catalogue-icon.png
new file mode 100644
index 00000000..b7fbaa91
Binary files /dev/null and b/front/src/assets/home/pageResource/catalogue-icon.png differ
diff --git a/front/src/assets/home/pageResource/left.png b/front/src/assets/home/pageResource/left.png
new file mode 100644
index 00000000..5671136d
Binary files /dev/null and b/front/src/assets/home/pageResource/left.png differ
diff --git a/front/src/assets/home/pageResource/port-bg.png b/front/src/assets/home/pageResource/port-bg.png
new file mode 100644
index 00000000..e801a36e
Binary files /dev/null and b/front/src/assets/home/pageResource/port-bg.png differ
diff --git a/front/src/assets/home/pageResource/port-icon.png b/front/src/assets/home/pageResource/port-icon.png
new file mode 100644
index 00000000..099067a9
Binary files /dev/null and b/front/src/assets/home/pageResource/port-icon.png differ
diff --git a/front/src/assets/home/pageResource/service-bg.png b/front/src/assets/home/pageResource/service-bg.png
new file mode 100644
index 00000000..a38eb99e
Binary files /dev/null and b/front/src/assets/home/pageResource/service-bg.png differ
diff --git a/front/src/assets/home/pageResource/service-icon.png b/front/src/assets/home/pageResource/service-icon.png
new file mode 100644
index 00000000..15151cae
Binary files /dev/null and b/front/src/assets/home/pageResource/service-icon.png differ
diff --git a/front/src/assets/home/remove-hover.png b/front/src/assets/home/remove-hover.png
new file mode 100644
index 00000000..9152216b
Binary files /dev/null and b/front/src/assets/home/remove-hover.png differ
diff --git a/front/src/assets/home/remove.png b/front/src/assets/home/remove.png
new file mode 100644
index 00000000..87b146ba
Binary files /dev/null and b/front/src/assets/home/remove.png differ
diff --git a/front/src/assets/mynoticeView/all.png b/front/src/assets/mynoticeView/all.png
new file mode 100644
index 00000000..ba1003fc
Binary files /dev/null and b/front/src/assets/mynoticeView/all.png differ
diff --git a/front/src/assets/mynoticeView/comment.png b/front/src/assets/mynoticeView/comment.png
new file mode 100644
index 00000000..6bb4f32c
Binary files /dev/null and b/front/src/assets/mynoticeView/comment.png differ
diff --git a/front/src/assets/mynoticeView/notice.png b/front/src/assets/mynoticeView/notice.png
new file mode 100644
index 00000000..57f3b79b
Binary files /dev/null and b/front/src/assets/mynoticeView/notice.png differ
diff --git a/front/src/assets/mynoticeView/other.png b/front/src/assets/mynoticeView/other.png
new file mode 100644
index 00000000..91e0bf8f
Binary files /dev/null and b/front/src/assets/mynoticeView/other.png differ
diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js
index 8c2342f0..ee70f8b7 100644
--- a/front/src/config/default/setting.config.js
+++ b/front/src/config/default/setting.config.js
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-03-29 17:48:03
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-15 19:40:28
+ * @LastEditTime: 2022-06-20 16:10:57
* @Description: 告诉大家这是什么
*/
/**
@@ -50,7 +50,7 @@ const setting = {
//路由模式，可选值为 history 或 hash
routerMode: 'hash',
//不经过token校验的路由
- routesWhiteList: ['/login', '/register', '/callback', '/404', '/403'],
+ routesWhiteList: ['/login', '/register', '/callback', '/404', '/403', '/capabilityCloud'], // 新增统计云图白名单
//加载时显示文字
loadingText: '正在加载中...',
//token名称
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 4574c207..235b7f3b 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -138,6 +138,16 @@ export const constantRoutes = [
icon: 'error-warning-line',
},
},
+ {
+ path: '/mynoticeView',
+ name: 'mynoticeView',
+ hidden: true,
+ component: () => import('@/views/mynoticeView'),
+ meta: {
+ title: '我的消息',
+ icon: 'error-warning-line',
+ },
+ },
{
path: '/WorkDynDetails',
name: 'WorkDynDetails',
@@ -376,6 +386,16 @@ export const constantRoutes = [
icon: 'error-warning-line',
},
},
+ // 能力云图
+ {
+ path: '/capabilityCloud',
+ name: 'capabilityCloud',
+ component: () => import('@/views/capabilityCloud'),
+ meta: {
+ title: '能力云图',
+ icon: 'error-warning-line',
+ },
+ },
// 赋能案例详情
{
path: '/AssignCaseDetailPage',
diff --git a/front/src/utils/crypto.js b/front/src/utils/crypto.js
new file mode 100644
index 00000000..2be42882
--- /dev/null
+++ b/front/src/utils/crypto.js
@@ -0,0 +1,58 @@
+/*
+ * @Author: hisense.liangjunhua
+ * @Date: 2022-06-24 16:00:58
+ * @LastEditors: hisense.liangjunhua
+ * @LastEditTime: 2022-06-24 16:44:28
+ * @Description: 告诉大家这是什么
+ */
+import CryptoJS from 'crypto-js/crypto-js'
+
+// 默认的 KEY 与 iv 与后端保持一致 ，不采用后端传值密钥 上上下下左右左右BABA 一往无前虎山行拨开云雾见光明梦里花开牡丹亭幻想成真歌舞升平
+const KEY = CryptoJS.enc.Utf8.parse('YwwqhsxBkywjgm01') // 密钥
+const IV = CryptoJS.enc.Utf8.parse('SSXXZYZYBABA30TM') // 偏移量
+/**
+ * AES加密 ：字符串 key iv 返回base64
+ */
+export function Encrypt(word, keyStr, ivStr) {
+ let key = KEY
+ let iv = IV
+
+ if (keyStr) {
+ key = CryptoJS.enc.Utf8.parse(keyStr)
+ iv = CryptoJS.enc.Utf8.parse(ivStr)
+ }
+
+ const srcs = CryptoJS.enc.Utf8.parse(word)
+ var encrypted = CryptoJS.AES.encrypt(srcs, key, {
+ iv: iv,
+ mode: CryptoJS.mode.CBC,
+ padding: CryptoJS.pad.ZeroPadding,
+ })
+
+ return CryptoJS.enc.Base64.stringify(encrypted.ciphertext)
+}
+/**
+ * AES 解密 ：字符串 key iv 返回base64
+ *
+ */
+export function Decrypt(word, keyStr, ivStr) {
+ let key = KEY
+ let iv = IV
+
+ if (keyStr) {
+ key = CryptoJS.enc.Utf8.parse(keyStr)
+ iv = CryptoJS.enc.Utf8.parse(ivStr)
+ }
+
+ const base64 = CryptoJS.enc.Base64.parse(word)
+ const src = CryptoJS.enc.Base64.stringify(base64)
+
+ var decrypt = CryptoJS.AES.decrypt(src, key, {
+ iv: iv,
+ mode: CryptoJS.mode.CBC,
+ padding: CryptoJS.pad.ZeroPadding,
+ })
+
+ var decryptedStr = decrypt.toString(CryptoJS.enc.Utf8)
+ return decryptedStr.toString()
+}
diff --git a/front/src/utils/request.js b/front/src/utils/request.js
index a939dd25..0ab87260 100644
--- a/front/src/utils/request.js
+++ b/front/src/utils/request.js
@@ -90,6 +90,30 @@ instance.interceptors.response.use(
console.log('接口返回', response)
console.log('接口返回headers', response.headers)
console.log('接口返回REDIRECT', response.headers.redirect)
+
+ if (response.headers.redirect === '/#/login') {
+ var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
+ if (keys) {
+ for (var i = keys.length; i--; ) {
+ document.cookie =
+ keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
+ document.cookie =
+ keys[i] +
+ '=0;path=/;domain=' +
+ document.domain +
+ ';expires=' +
+ new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
+ document.cookie =
+ keys[i] +
+ '=0;path=/;domain=kevis.com;expires=' +
+ new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
+ }
+ }
+ console.log('已清除')
+ setTimeout(() => {
+ location.reload()
+ }, 1000)
+ }
response['Access-Control-Expose-Headers'] = 'redirect'
const { code, message } = response.data
if (response.headers.token) {
@@ -129,7 +153,30 @@ instance.interceptors.response.use(
if (error.response && error.response.data) {
console.log('接口返回', response)
console.log('接口返回headers', response.headers)
- console.log('接口返回REDIRECT', response.headers.redirect)
+ console.log('接口返回REDIRECT1111', response.headers.redirect)
+ if (response.headers.redirect === '/#/login') {
+ var keys = document.cookie.match(/[^ =;]+(?=\=)/g)
+ if (keys) {
+ for (var i = keys.length; i--; ) {
+ document.cookie =
+ keys[i] + '=0;path=/;expires=' + new Date(0).toUTCString() //清除当前域名下的,例如：m.kevis.com
+ document.cookie =
+ keys[i] +
+ '=0;path=/;domain=' +
+ document.domain +
+ ';expires=' +
+ new Date(0).toUTCString() //清除当前域名下的，例如 .m.kevis.com
+ document.cookie =
+ keys[i] +
+ '=0;path=/;domain=kevis.com;expires=' +
+ new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com
+ }
+ }
+ console.log('已清除')
+ setTimeout(() => {
+ location.reload()
+ }, 1000)
+ }
if (response.headers.redirect) {
window.location.href = response.headers.redirect
return Promise.reject(error)
diff --git a/front/src/views/abilityStatistics/components/AtlasResources.vue b/front/src/views/abilityStatistics/components/AtlasResources.vue
index 703024c6..375b6f73 100644
--- a/front/src/views/abilityStatistics/components/AtlasResources.vue
+++ b/front/src/views/abilityStatistics/components/AtlasResources.vue
@@ -49,10 +49,10 @@
>
- {{ dept.deptName || dept.type + '(' + dept.total + ')' }}
+ {{ (dept.deptName || dept.type) + '(' + dept.total + ')' }}
- {{ dept.deptName || dept.type + '(' + dept.total + ')' }}
+ {{ (dept.deptName || dept.type) + '(' + dept.total + ')' }}
@@ -218,6 +218,7 @@
const initBubbleList = (res) => {
if (navSelect.value === '能力类型-能力集') {
bubbleList.value = res.data.data.maxDept.resourceList.slice(0, 20)
+ console.log('能力类型============>', res.data.data.typeList)
bubbleList.value.unshift({
id: res.data.data.maxDept.typeName,
name: res.data.data.maxDept.typeName,
@@ -232,6 +233,7 @@
departmentList.value = res.data.data.appAreaList
} else {
bubbleList.value = res.data.data.maxDept.resourceList.slice(0, 20)
+ console.log('其它 ============>', res.data.data.deptList)
bubbleList.value.unshift({
id: res.data.data.maxDept.deptId,
name: res.data.data.maxDept.deptName,
diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
index 12e7f225..ffb04a83 100644
--- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue
+++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue
@@ -20,7 +20,7 @@
{{ item.type }}
- {{ item.amount }}
+ {{ item.amount || 0 }}
{{ item.organization }}