diff --git a/back/package.json b/back/package.json index d6d934e7..e9ac8253 100644 --- a/back/package.json +++ b/back/package.json @@ -22,6 +22,7 @@ "carddragger": "^0.3.6", "clipboard": "^2.0.6", "core-js": "^3.6.5", + "crypto-js": "^4.1.1", "echarts": "^4.7.0", "element-ui": "^2.13.2", "file-saver": "^2.0.5", diff --git a/back/src/assets/img/CapabilityOperationMonitoring/API-allNum.png b/back/src/assets/img/CapabilityOperationMonitoring/API-allNum.png new file mode 100644 index 00000000..92e98113 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/API-allNum.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/API-badNum.png b/back/src/assets/img/CapabilityOperationMonitoring/API-badNum.png new file mode 100644 index 00000000..3d352e94 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/API-badNum.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/bg-blue.png b/back/src/assets/img/CapabilityOperationMonitoring/bg-blue.png new file mode 100644 index 00000000..c22c553a Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/bg-blue.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/bg-yellow.png b/back/src/assets/img/CapabilityOperationMonitoring/bg-yellow.png new file mode 100644 index 00000000..22ba4dc8 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/bg-yellow.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/calendar.png b/back/src/assets/img/CapabilityOperationMonitoring/calendar.png new file mode 100644 index 00000000..3156f25f Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/calendar.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-bule-bg.png b/back/src/assets/img/CapabilityOperationMonitoring/number-bule-bg.png new file mode 100644 index 00000000..64c3b8ca Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-bule-bg.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-bule.png b/back/src/assets/img/CapabilityOperationMonitoring/number-bule.png new file mode 100644 index 00000000..4374742c Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-bule.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-grenn-bg.png b/back/src/assets/img/CapabilityOperationMonitoring/number-grenn-bg.png new file mode 100644 index 00000000..8286e32e Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-grenn-bg.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-grenn.png b/back/src/assets/img/CapabilityOperationMonitoring/number-grenn.png new file mode 100644 index 00000000..5971f4dc Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-grenn.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-red-bg.png b/back/src/assets/img/CapabilityOperationMonitoring/number-red-bg.png new file mode 100644 index 00000000..f31dfaac Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-red-bg.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/number-red.png b/back/src/assets/img/CapabilityOperationMonitoring/number-red.png new file mode 100644 index 00000000..37e84660 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/number-red.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/上一页.png b/back/src/assets/img/CapabilityOperationMonitoring/上一页.png new file mode 100644 index 00000000..8ee15672 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/上一页.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/下一页.png b/back/src/assets/img/CapabilityOperationMonitoring/下一页.png new file mode 100644 index 00000000..5ec01229 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/下一页.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/下拉.png b/back/src/assets/img/CapabilityOperationMonitoring/下拉.png new file mode 100644 index 00000000..5debda0a Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/下拉.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/更多.png b/back/src/assets/img/CapabilityOperationMonitoring/更多.png new file mode 100644 index 00000000..07eade12 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/更多.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/消息.png b/back/src/assets/img/CapabilityOperationMonitoring/消息.png new file mode 100644 index 00000000..e3b49722 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/消息.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/消息中心.png b/back/src/assets/img/CapabilityOperationMonitoring/消息中心.png new file mode 100644 index 00000000..45dbd380 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/消息中心.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/账号下拉.png b/back/src/assets/img/CapabilityOperationMonitoring/账号下拉.png new file mode 100644 index 00000000..bb717864 Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/账号下拉.png differ diff --git a/back/src/assets/img/CapabilityOperationMonitoring/选择.png b/back/src/assets/img/CapabilityOperationMonitoring/选择.png new file mode 100644 index 00000000..dbde1d4c Binary files /dev/null and b/back/src/assets/img/CapabilityOperationMonitoring/选择.png differ diff --git a/back/src/assets/img/一级图标.png b/back/src/assets/img/一级图标.png new file mode 100644 index 00000000..e7f339aa Binary files /dev/null and b/back/src/assets/img/一级图标.png differ diff --git a/back/src/assets/img/搜索.png b/back/src/assets/img/搜索.png new file mode 100644 index 00000000..22399624 Binary files /dev/null and b/back/src/assets/img/搜索.png differ diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue index 1166902c..84572707 100644 --- a/back/src/views/modules/ability/bsinfrastructure.vue +++ b/back/src/views/modules/ability/bsinfrastructure.vue @@ -46,8 +46,8 @@ diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 5d4a90f1..21b7db82 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -1,6 +1,27 @@ diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index 2c49710e..7e0d92d5 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -132,7 +132,7 @@ show-word-limit > - + - + // @ is an alias to /src export default { - data() { + data () { return { - fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload", + fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload', // 表格筛选条件对象 queryData: { - keyworld: "", + keyworld: '', pageIndex: 1, pageSize: 10, - total: 0, + total: 0 }, // 表格数据数组对象 tableData: [], @@ -359,307 +359,307 @@ export default { // imageUrl: '', // 新增数据表单对象 addDataFrom: { - title: "", - note1: "", - content: "", - imageUrl: "", - delFlag: 0, + title: '', + note1: '', + content: '', + imageUrl: '', + delFlag: 0 }, // 新增数据表单验证对象 addDataFromRules: { - title: [{ required: true, message: "请输入标题", trigger: "blur" }], - note1: [{ required: true, message: "请输入摘要", trigger: "blur" }], - content: [{ required: true, message: "请输入内容", trigger: "blur" }], + title: [{ required: true, message: '请输入标题', trigger: 'blur' }], + note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }], + content: [{ required: true, message: '请输入内容', trigger: 'blur' }], imageUrl: [ - { required: true, message: "请输入图片地址", trigger: "blur" }, - ], + { required: true, message: '请输入图片地址', trigger: 'blur' } + ] }, editDataDialogVisabled: false, eidtDataForm: { - title: "", - note1: "", - content: "", - imageUrl: "", + title: '', + note1: '', + content: '', + imageUrl: '' }, eidtDataFromRules: { - title: [{ required: true, message: "请输入标题", trigger: "blur" }], - note1: [{ required: true, message: "请输入摘要", trigger: "blur" }], - content: [{ required: true, message: "请输入内容", trigger: "blur" }], + title: [{ required: true, message: '请输入标题', trigger: 'blur' }], + note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }], + content: [{ required: true, message: '请输入内容', trigger: 'blur' }], imageUrl: [ - { required: true, message: "请输入图片地址", trigger: "blur" }, - ], + { required: true, message: '请输入图片地址', trigger: 'blur' } + ] }, perviewDataDialogVisabled: false, previewData: { - title: "", - note1: "", - content: "", - imageUrl: "", - delFlag: 0, + title: '', + note1: '', + content: '', + imageUrl: '', + delFlag: 0 }, - previewImg: "", // 预览图片 + previewImg: '', // 预览图片 deleteDataArr: [], - dialogVisibleImg: false, - }; + dialogVisibleImg: false + } }, - created() { - this.getTableData(); + created () { + this.getTableData() }, methods: { - tableChange(val) { - this.deleteDataArr = val.map((item) => item.id); - console.log(this.deleteDataArr); + tableChange (val) { + this.deleteDataArr = val.map((item) => item.id) + console.log(this.deleteDataArr) }, - restTableData() { - this.queryData.keyworld = ""; - this.getTableData(); + restTableData () { + this.queryData.keyworld = '' + this.getTableData() }, - showView(file) { - this.previewImg = file.url; - this.dialogVisibleImg = true; + showView (file) { + this.previewImg = file.url + this.dialogVisibleImg = true }, - getTableData() { + getTableData () { this.$http - .get("/workdynamics/page", { + .get('/workdynamics/page', { params: { limit: this.queryData.pageSize, page: this.queryData.pageIndex, - name: this.queryData.keyworld, - }, + name: this.queryData.keyworld + } }) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.tableData = res.data.list; - this.queryData.total = res.data.total; + this.tableData = res.data.list + this.queryData.total = res.data.total }) - .catch(() => {}); + .catch(() => {}) }, - flashTableData() { - this.queryData.pageIndex = 1; - this.getTableData(); + flashTableData () { + this.queryData.pageIndex = 1 + this.getTableData() }, // 分页大小更改 - handleSizeChange(value) { - this.queryData.pageSize = value; - this.getTableData(); + handleSizeChange (value) { + this.queryData.pageSize = value + this.getTableData() }, // 当前索引更改 - handleCurrentChange(val) { - this.queryData.pageIndex = val; - this.getTableData(); + handleCurrentChange (val) { + this.queryData.pageIndex = val + this.getTableData() }, // 新增数据窗口关闭事件 - addDataDialogClose() { - this.$refs.addDataFormRef.resetFields(); - this.addDataFrom.imageUrl = ""; - this.$refs.addUpload.clearFiles(); + addDataDialogClose () { + this.$refs.addDataFormRef.resetFields() + this.addDataFrom.imageUrl = '' + this.$refs.addUpload.clearFiles() // this.addDataFrom.imagesFiles = [] // this.$refs.addDataFromUploadRef.clearFiles() }, - editDataDialogClose() { - this.$refs.editDataFormRef.resetFields(); - this.eidtDataForm.imageUrl = ""; - this.$refs.editUpload.clearFiles(); + editDataDialogClose () { + this.$refs.editDataFormRef.resetFields() + this.eidtDataForm.imageUrl = '' + this.$refs.editUpload.clearFiles() }, // 追加数据 - addDataDialogConfirm() { + addDataDialogConfirm () { this.$refs.addDataFormRef.validate(async (valid) => { if (valid) { - //console.log("新增新增", this.addDataFrom); + // console.log("新增新增", this.addDataFrom); this.$http - .post("/workdynamics/insert", this.addDataFrom) + .post('/workdynamics/insert', this.addDataFrom) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.$message.success("新增成功"); - this.addDataDialogVisabled = false; - this.getTableData(); + this.$message.success('新增成功') + this.addDataDialogVisabled = false + this.getTableData() }) - .catch(() => {}); + .catch(() => {}) } else { - this.$message.success("表单数据填写不完整"); + this.$message.success('表单数据填写不完整') } - }); + }) }, // 限定图片 - handleExceed() { - this.$message({ type: "error", message: "最多支持一张图片上传" }); + handleExceed () { + this.$message({ type: 'error', message: '最多支持一张图片上传' }) }, // 限制标题 - titleExceed(str) { + titleExceed (str) { if (str.length >= 200) { - this.$message.error("标题文字不能超过200字"); + this.$message.error('标题文字不能超过200字') } }, // 限制内容 - contentExceed(str) { + contentExceed (str) { if (str.length >= 2000) { - this.$message.error("内容文字不能超过2000字"); + this.$message.error('内容文字不能超过2000字') } }, - //限制摘要 - noteExceed(str) { + // 限制摘要 + noteExceed (str) { if (str.length >= 1000) { - this.$message.error("摘要文字不能超过1000字"); + this.$message.error('摘要文字不能超过1000字') } }, // 删除数据 - deleteData(row) { - console.log(row); - this.$confirm("此操作将删除当前数据, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + deleteData (row) { + console.log(row) + this.$confirm('此操作将删除当前数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' }) .then(async () => { - let ids = []; + let ids = [] if (this.deleteDataArr.length > 1) { - ids = this.deleteDataArr; + ids = this.deleteDataArr } else { - ids = [row.id]; + ids = [row.id] } - console.log(ids); + console.log(ids) this.$http - .delete("/workdynamics/delete", { - data: ids, + .delete('/workdynamics/delete', { + data: ids }) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } this.$message({ - type: "success", - message: "删除成功!", - }); - this.getTableData(); - }); + type: 'success', + message: '删除成功!' + }) + this.getTableData() + }) }) .catch(() => { this.$message({ - type: "info", - message: "已取消删除", - }); - }); + type: 'info', + message: '已取消删除' + }) + }) }, - //预览工作动态信息 - async openPreviewData(row) { - console.log("预览预览", row); + // 预览工作动态信息 + async openPreviewData (row) { + console.log('预览预览', row) const { data: res } = await this.$http.get( `workdynamics/select/${row.id}` - ); + ) if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.previewData = res.data; + this.previewData = res.data - this.perviewDataDialogVisabled = true; + this.perviewDataDialogVisabled = true }, - perviewDataDialogClose() { - this.perviewDataDialogVisabled = false; + perviewDataDialogClose () { + this.perviewDataDialogVisabled = false }, - handleAvatarSuccess(res, file) { + handleAvatarSuccess (res, file) { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.addDataFrom.imageUrl = res.data; + this.addDataFrom.imageUrl = res.data // this.imageUrl = URL.createObjectURL(file.raw); }, - beforeAvatarUpload(file) { + beforeAvatarUpload (file) { const isImage = - file.type === "image/jpeg" || - file.type === "image/jpg" || - file.type === "image/png"; - const isLt2M = file.size / 1024 / 1024 < 2; + file.type === 'image/jpeg' || + file.type === 'image/jpg' || + file.type === 'image/png' + const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { - this.$message.error("上传头像图片只能是 JPG 格式!"); + this.$message.error('上传头像图片只能是 JPG 格式!') } if (!isLt2M) { - this.$message.error("上传头像图片大小不能超过 2MB!"); + this.$message.error('上传头像图片大小不能超过 2MB!') } - return isImage && isLt2M; + return isImage && isLt2M }, - eidtHandleAvatarSuccess(res, file) { + eidtHandleAvatarSuccess (res, file) { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.eidtDataForm.imageUrl = res.data; + this.eidtDataForm.imageUrl = res.data // this.imageUrl = URL.createObjectURL(file.raw); }, - editBeforeAvatarUpload(file) { + editBeforeAvatarUpload (file) { const isImage = - file.type === "image/jpeg" || - file.type === "image/jpg" || - file.type === "image/png"; - const isLt2M = file.size / 1024 / 1024 < 2; + file.type === 'image/jpeg' || + file.type === 'image/jpg' || + file.type === 'image/png' + const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { - this.$message.error("上传头像图片只能是 JPG 格式!"); + this.$message.error('上传头像图片只能是 JPG 格式!') } if (!isLt2M) { - this.$message.error("上传头像图片大小不能超过 2MB!"); + this.$message.error('上传头像图片大小不能超过 2MB!') } - return isImage && isLt2M; + return isImage && isLt2M }, - async openEditDialog(row) { + async openEditDialog (row) { const { data: res } = await this.$http.get( `workdynamics/select/${row.id}` - ); + ) if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.eidtDataForm = res.data; + this.eidtDataForm = res.data - this.editDataDialogVisabled = true; + this.editDataDialogVisabled = true }, - eidtDataDialogConfirm() { + eidtDataDialogConfirm () { this.$refs.editDataFormRef.validate(async (valid) => { if (valid) { - console.log(this.eidtDataForm); + console.log(this.eidtDataForm) this.$http - .put("/workdynamics/update", this.eidtDataForm) + .put('/workdynamics/update', this.eidtDataForm) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.$message.success("编辑成功"); - this.editDataDialogVisabled = false; - this.getTableData(); + this.$message.success('编辑成功') + this.editDataDialogVisabled = false + this.getTableData() }) - .catch(() => {}); + .catch(() => {}) } else { - this.$message.success("表单数据填写不完整"); + this.$message.success('表单数据填写不完整') } - }); + }) }, - addUploadRemoveFile(file, fileList) { - this.$refs.addUpload.clearFiles(); - this.addDataFrom.imageUrl = ""; - }, - editUploadRemoveFile(file, fileList) { - this.$refs.editUpload.clearFiles(); - this.eidtDataForm.imageUrl = ""; + addUploadRemoveFile (file, fileList) { + this.$refs.addUpload.clearFiles() + this.addDataFrom.imageUrl = '' }, + editUploadRemoveFile (file, fileList) { + this.$refs.editUpload.clearFiles() + this.eidtDataForm.imageUrl = '' + } }, computed: { - editDialogShowFileList() { + editDialogShowFileList () { if (this.eidtDataForm.imageUrl) { return [ - { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl }, - ]; + { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl } + ] } - }, - }, -}; + } + } +} diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue index 22197ae7..09559184 100644 --- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue +++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/AnalysisOfTheRequest.vue @@ -1,22 +1,1115 @@ + diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/CapabilityOperationMonitoringTime.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/components/CapabilityOperationMonitoringTime.vue deleted file mode 100644 index b7fd48d8..00000000 --- a/back/src/views/modules/sys/CapabilityOperationMonitoring/components/CapabilityOperationMonitoringTime.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - diff --git a/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue b/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue index 04ab1b8e..eebaeb82 100644 --- a/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue +++ b/back/src/views/modules/sys/CapabilityOperationMonitoring/index.vue @@ -1,8 +1,23 @@ diff --git a/front/public/index.html b/front/public/index.html index 5a8fe4fe..afc695e8 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -1,8 +1,8 @@ @@ -47,7 +47,8 @@ window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; + window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; // window.SITE_CONFIG['previewUrl'] = 'http://124.222.94.39:9796/'; diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 8e825bd7..83566908 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -189,3 +189,19 @@ export function getCategoryTreePage(params) { params, }) } +// 申购车根据部门分类 +export function selectResourceCarGroupByDept(params) { + return request({ + url: '/resourcecar/selectResourceCarGroupByDept', + method: 'get', + params, + }) +} +// 申购车根据部门查询 +export function selectResourceListByDept(params) { + return request({ + url: '/resourcecar/selectResourceListByDept', + method: 'get', + params, + }) +} diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js index dc4320e3..9671313f 100644 --- a/front/src/supermap/advance-init.js +++ b/front/src/supermap/advance-init.js @@ -1681,6 +1681,7 @@ export function MapFun(mapObj) { // }) // } + _removeLayerByLayerName(layerName) let layers = null // 判断是否是聚合图层 layers = createMarkerClusterLayer() @@ -1691,12 +1692,7 @@ export function MapFun(mapObj) { features.map((feature) => { var bounds = map.getBounds() // console.log("看看有没有坐标",feature.latLng); - if ( - layerName == '全部' - ? feature.hasOwnProperty('latLng') && - bounds.contains(L.latLng(feature.latLng.lat, feature.latLng.lng)) - : feature.hasOwnProperty('latLng') - ) { + if ( feature.hasOwnProperty('latLng')) { const marker = L.marker(feature.latLng, { icon }) if (createPopupFun !== null) { marker.uuid = feature.uuid || '' @@ -1735,38 +1731,6 @@ export function MapFun(mapObj) { }) featureGroup.addLayer(layers) layerGroup.set(layerName, layers) - // map.on('zoom', () => { - // _removeLayerByLayerName(layerName) - // let layers = null - // // 判断是否是聚合图层 - // layers = createMarkerClusterLayer() - // features.map(feature => { - // var bounds = map.getBounds() - // // console.log("看看有没有坐标",feature.latLng); - // if (feature.hasOwnProperty('latLng') && bounds.contains(L.latLng(feature.latLng.lat, feature.latLng.lng))) { - // const marker = L.marker(feature.latLng, { icon }) - // if (createPopupFun !== null) { - // marker.uuid = feature.uuid || '' - // marker.resId = feature.resId || '' - // marker.on('click', async e => { - // if (feature.resourceName === 'video') { - // const params = [feature.indexCode] - // DS.openVideo(params) - // } else { - // const elementHtml = createPopupFun(feature) - // if (elementHtml) { - // console.log('L._addReMapWithter===============>', feature.latLng, elementHtml, map) - // L.popup({ className: 'detail-dialog' }).setLatLng(feature.latLng).setContent(elementHtml).openOn(map) - // } - // } - // }) - // } - // layers.addLayer(marker) - // } - // }) - // featureGroup.addLayer(layers) - // layerGroup.set(layerName, layers) - // }) } /** * 点击展示弹窗 diff --git a/front/src/utils/request.js b/front/src/utils/request.js index 0ab87260..021c203b 100644 --- a/front/src/utils/request.js +++ b/front/src/utils/request.js @@ -87,9 +87,9 @@ instance.interceptors.request.use( */ instance.interceptors.response.use( (response) => { - console.log('接口返回', response) - console.log('接口返回headers', response.headers) - console.log('接口返回REDIRECT', response.headers.redirect) + // 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) @@ -109,7 +109,7 @@ instance.interceptors.response.use( new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com } } - console.log('已清除') + // console.log('已清除') setTimeout(() => { location.reload() }, 1000) @@ -147,13 +147,13 @@ instance.interceptors.response.use( // } }, (error) => { - console.log('接口error', error) + // console.log('接口error', error) if (loadingInstance) loadingInstance.close() const { response, message } = error if (error.response && error.response.data) { - console.log('接口返回', response) - console.log('接口返回headers', response.headers) - console.log('接口返回REDIRECT1111', response.headers.redirect) + // console.log('接口返回', response) + // console.log('接口返回headers', response.headers) + // console.log('接口返回REDIRECT1111', response.headers.redirect) if (response.headers.redirect === '/#/login') { var keys = document.cookie.match(/[^ =;]+(?=\=)/g) if (keys) { @@ -172,7 +172,7 @@ instance.interceptors.response.use( new Date(0).toUTCString() //清除一级域名下的或指定的，例如 .kevis.com } } - console.log('已清除') + // console.log('已清除') setTimeout(() => { location.reload() }, 1000) diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js index 45489e96..f417ba89 100644 --- a/front/src/vab/plugins/permissions.js +++ b/front/src/vab/plugins/permissions.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 17:23:11 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-04 16:32:38 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-06-29 09:54:19 * @Description: 告诉大家这是什么 */ /** @@ -26,11 +26,11 @@ router.beforeEach(async (to, from, next) => { // setAccessToken(SSOTOKEN) // } const token = getAccessToken() - console.log('token', token) + // console.log('token', token) let hasToken = token || store.getters['user/accessToken'] // debugger if (!loginInterception) hasToken = true - console.log('hasToken存在巨大问题', hasToken) + // console.log('hasToken存在巨大问题', hasToken) if (hasToken) { setAccessToken(hasToken) await store.dispatch('user/getUserInfo') diff --git a/front/src/views/capabilityCloud/components/ComponentServices.vue b/front/src/views/capabilityCloud/components/ComponentServices.vue index 7fe4d749..32fdaf2e 100644 --- a/front/src/views/capabilityCloud/components/ComponentServices.vue +++ b/front/src/views/capabilityCloud/components/ComponentServices.vue @@ -93,7 +93,8 @@
TOP 名称 - 应用数 + 应用数 + 分数
{{ index + 1 }} @@ -126,7 +127,12 @@ let dataclick = ref('total') let dataList = ref([]) let timeSwitchindex = ref('周') - let servicesSnum = ref([]) + let servicesSnum = ref([ + { amount: '', type: '智能算法' }, + { amount: '', type: '图层服务' }, + { amount: '', type: '开发组件' }, + { amount: '', type: '业务组件' }, + ]) let callTheTrendData = ref({ time: [], snum: [] }) //年月切换 const timeSwitch = (name) => { @@ -162,6 +168,19 @@ let myChart = echarts.init(chartDom) let option option = { + tooltip: { + backgroundColor: 'rgba(17,61,116,0.8)', + borderWidth: 0, + trigger: 'axis', + formatter: function (val) { + console.log(val) + let res = `
+ 日期 : ${val[0].name} +
调用次数 : ${val[0].value}
+
` + return res + }, + }, grid: { top: '10%', left: '0%', @@ -288,7 +307,11 @@ snum.value[0].num = res.data.data[0].amount res.data.data.map((item, index) => { if (index != 0) { - servicesSnum.value.push(item) + servicesSnum.value.map((servicesSnumitem, servicesSnumindex) => { + if (servicesSnumitem.type == item.type) { + servicesSnum.value[servicesSnumindex].amount = item.amount + } + }) } }) }) diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index cbf6ca70..40b0669f 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -231,6 +231,7 @@ size="small" pageSize="8" :total="total" + v-model:current="page" @change="handleCurrentChange" /> @@ -248,7 +249,7 @@ import { demandComment, demandCommentPage, - demandCommentDelete, + // demandCommentDelete, demandCommentApply, } from '@/api/demandCenter' import { getUser, getUserInfo } from '@/api/home' @@ -264,15 +265,15 @@ }) }) //删除提示框 - const confirm = (item) => { - console.log(item) - evaluateDelete(item) - } + // const confirm = (item) => { + // console.log(item) + // evaluateDelete(item) + // } - const cancel = (e) => { - console.log(e) - message.error('已取消删除') - } + // const cancel = (e) => { + // console.log(e) + // message.error('已取消删除') + // } // const store = useStore() const router = useRouter() @@ -322,14 +323,14 @@ // }) // } - const evaluateDelete = (item) => { - demandCommentDelete([item.id]).then((res) => { - if (res.data.code == 0) { - message.success('删除评论成功！') - } - evaluateList() - }) - } + // const evaluateDelete = (item) => { + // demandCommentDelete([item.id]).then((res) => { + // if (res.data.code == 0) { + // message.success('删除评论成功！') + // } + // evaluateList() + // }) + // } const evaluateList = () => { const params = { page: page.value, @@ -339,6 +340,7 @@ demandCommentPage(params).then((res) => { evaluateData.value = res.data.data.list total.value = res.data.data.total + console.log(evaluateData, 'evaluateData') }) } @@ -382,6 +384,7 @@ // formName.value = formData.value const id = router.currentRoute.value.query.id getDemandForm(id).then((res) => { + console.log(res, 'res') const { data } = res.data formName.value.applyUserName = data.applyUserName formName.value.applyUserPhone = data.applyUserPhone diff --git a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue index 464a42d3..c436c734 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperTrial.vue @@ -11,7 +11,9 @@

{{ dataFrom.linkName }}

-

{{ dataFrom.link }}

+

+ {{ dataFrom.link }} +

{{ dataFrom.numberName }}

@@ -63,6 +65,10 @@ }) } } + const clickLink = (link) => { + debugger + window.open(link) + } //复制方法 const copyFunction = (data, name) => { let url = data diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue index 4be1bfff..5887693d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceInformation.vue @@ -93,7 +93,16 @@ const flag = ref(true) if (props.dataList.infoList) { let obj = props.dataList.infoList.filter( - (item) => item.attrType === '技术文档' + (item) => + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' )[0] if (!obj) { flag.value = false @@ -128,7 +137,18 @@ () => props.dataList, (val) => { if (val) { - let obj = val.infoList.filter((item) => item.attrType === '技术文档')[0] + let obj = val.infoList.filter( + (item) => + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + )[0] if (!obj) { flag.value = false } else { @@ -211,7 +231,7 @@ font-size: 0.2rem; color: #666666; display: block; - margin-right: 0.8rem; + margin-right: 0.5rem; width: 120px; } p { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index 9e120f43..b6c96318 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -89,15 +89,35 @@ list.value.push(item.attrType) } else if (item.attrType === '图层缩略图') { list.value.push('图层展示') - } else if (item.attrType === '坐标系') { - list.value.push('图层信息') } else if (item.attrType === '是否可预览') { if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) - list.value.push('使用方式') + navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -144,14 +164,35 @@ list.value.push(item.attrType) } else if (item.attrType === '图层缩略图') { list.value.push('图层展示') - } else if (item.attrType === '坐标系') { - list.value.push('图层信息') } else if (item.attrType === '是否可预览') { if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) + list.value.push('图层信息') list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue index c0f50a4d..8611e43d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue @@ -8,7 +8,7 @@