diff --git a/back/src/utils/location.js b/back/src/utils/location.js index 82fc8775..25cd9f33 100644 --- a/back/src/utils/location.js +++ b/back/src/utils/location.js @@ -1,12 +1,12 @@ /* * @Author: hisense.guoyue * @Date: 2022-08-23 10:30:11 - * @LastEditors: hisense.guoyue - * @LastEditTime: 2022-10-02 14:47:05 + * @LastEditors: hisense.wuhongjian + * @LastEditTime: 2022-10-18 17:44:33 * @Description: 判断当前环境是西海岸还是青岛市局 */ const returnLocationStr = () => { - return CONFIGITEM.version + return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao' } export default returnLocationStr diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index 76edd456..f2b086f6 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -44,7 +44,12 @@ 部门名称： - + @@ -55,7 +60,7 @@ 类型： - + @@ -108,9 +113,12 @@ 能力使用明细 --> - - 明细 - + 返回
@@ -157,8 +165,14 @@ - - + + @@ -204,7 +218,8 @@ import AbilityDetail from './components/abilityDetails' import applicationResources from './applicationResources.vue' import ComponentUsed from './componentUsed.vue' import qs from 'qs' -import { mapState } from 'vuex' +import Template from '../devtools/template.vue' +// import { mapState } from 'vuex' // const props = defineProps({ // processDefinitionName: { type: String, default: null }, // businessKey: { type: String, default: null }, @@ -214,9 +229,11 @@ import { mapState } from 'vuex' // showType: { type: String, default: null }, // }) export default { - components: { componentServices, applicationResources, ComponentUsed, AbilityDetail }, - data() { + components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template }, + data () { return { + checked: false, + departmentSelects: [], exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export', exportExcelCondition: '', exportExcelType: '', @@ -308,6 +325,7 @@ export default { { name: '会议室', value: 6 } ], tableData: [], + tableDataClone: [], tableData2: [ { approveStatus: '', @@ -337,7 +355,14 @@ export default { endDate: '' // 结束时间 } }, - created() { + created () { + this.$http.get('/sys/dept/all').then(res => { + console.log('获取部门=========>', res) + this.departmentSelects = [] + res.data.data.map(val => { + this.departmentSelects.push({ label: val.name, value: val.name }) + }) + }) // 当前设定的日期时间 // const d = new Date() // let year1, month1, day1 @@ -363,10 +388,19 @@ export default { } }, computed: { - ...mapState(['departmentSelects']) + // ...mapState(['departmentSelects']) }, methods: { - closeModal() { + chagneCheckbox () { + if (this.checked) { + this.tableData = this.tableDataClone.filter(val => val.count !== 0) + this.total = this.tableData.length + } else { + this.tableData = this.tableDataClone + this.total = this.tableData.length + } + }, + closeModal () { this.detailsVisible = false }, handleCurrentChange(val) { @@ -470,6 +504,7 @@ export default { parseInt(result[i].hys) } this.tableData = res.data.data + this.tableDataClone = res.data.data this.total = res.data.data.total this.exportExcelCondition = qs.stringify({ approveStatus: this.status, @@ -534,6 +569,7 @@ export default { parseInt(result[i].hys) } this.tableData = res.data.data + this.tableDataClone = res.data.data this.total = res.data.data.total this.exportExcelCondition = qs.stringify({ approveStatus: this.status, @@ -614,6 +650,7 @@ export default { .then((res) => { console.log('111111', this.tableData, res.data.data) this.tableData = res.data.data.list + this.tableDataClone = res.data.data.list this.total = res.data.data.total this.exportExcelCondition = qs.stringify({ approveStatus: this.status, @@ -651,6 +688,7 @@ export default { }) .then((res) => { this.tableData = res.data.data.list + this.tableDataClone = res.data.data.list this.total = res.data.data.total this.exportExcelCondition = qs.stringify({ approveStatus: this.status, @@ -757,8 +795,8 @@ export default { // } // }, // 选择发布or使用表格 - handleChose(index) { - this.currentPage = 1; + handleChose (index) { + this.checked = false this.departmentId = index if (index === 1) { if (this.choseId === 0) { @@ -830,7 +868,8 @@ export default { } }, // 返回按钮 - goToBack() { + goToBack () { + this.checked = false // departmentId 1，3 2，4 两个值共同判断 this.detailFlag = !this.detailFlag if (this.departmentId === 3) { diff --git a/front/public/static/css/modal.css b/front/public/static/css/modal.css index 858877fa..d8acc9dd 100644 --- a/front/public/static/css/modal.css +++ b/front/public/static/css/modal.css @@ -13,14 +13,13 @@ } .model-container { - width: 360px; - height: 150px; + width: 446px; + height: 194px; background: #fff; - border-radius: 10px; - /* box-shadow: 0px 0px 12px 4px #ff3; */ text-align: center; font-size: 18px; - color: #333; + color: #707070; + font-family: 'Alibaba PuHuiTi'; position: absolute; top: 50%; left: 50%; @@ -33,7 +32,32 @@ } .model-container .model-title { - font-size: 16px; + height: 40px; + padding-left: 24px; + padding-right: 24px; + padding-top: 10px; + background: #007fff; + text-align: left; +} + +.model-container .title-span { + font-family: 'Alibaba PuHuiTi'; + font-size: 18px !important; + color: #ffffff; +} + +.model-container .model-close { + position: absolute; + right: 20px; + top: 10px; + width: 18px; + height: 18px; + cursor: pointer; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAALZJREFUOE9jZACC////ZwIpcyBOZGRk/A8SIwSAehqAatiB6itBahmBAhVAuh2qcRGQTiBkGNSQeqie6UA6G2QQyGSYIEgOr2E41UO9RpRh+CxlhIUFIZcRkocbhM9lUK/j9T6KQTgMuwgU10eKRaxhiGEQDsNg5uCMCKwGQQ07AKTtkVxyF8hWxZU0aOciLLFDehjhimKSYo1QOiEkDw4jQoqISbTUy2tUy/1Qr1FeHiElOIqYAKkPngur14nOAAAAAElFTkSuQmCC); +} + +.model-container .model-content { + margin-top: 24px; } .model-container .controls { @@ -51,25 +75,32 @@ cursor: pointer; } -.model-container .confirm { - width: 60px; - height: 30px; +.model-container .confirmChrome { + width: 140px; + height: 36px; background: #0087ff; border-radius: 0.04rem !important; - font-size: 14px; - font-weight: 400; + font-size: 16px; + font-family: 'Alibaba PuHuiTi'; color: #fff; - line-height: 30px; + line-height: 36px; + border-radius: 6px; } -.model-container .cancel { - width: 60px; - height: 30px; +.model-container .confirm360 { + width: 140px; + height: 36px; background: #0087ff; border-radius: 0.04rem !important; - font-size: 14px; - font-weight: 400; + font-size: 16px; + font-family: 'Alibaba PuHuiTi'; color: #fff; - line-height: 30px; - margin-left: 100px; + line-height: 36px; + margin-left: 50px; + border-radius: 6px; +} + +@font-face { + font-family: 'Alibaba PuHuiTi'; + src: url('~@/assets/home/font/Alibaba-PuHuiTi-Light.otf'); } \ No newline at end of file diff --git a/front/public/static/download/360se13.1.6110.0.exe b/front/public/static/download/360se13.1.6110.0.exe new file mode 100644 index 00000000..3971fcf5 Binary files /dev/null and b/front/public/static/download/360se13.1.6110.0.exe differ diff --git a/front/public/static/download/360se13.1.6260.0.exe b/front/public/static/download/360se13.1.6260.0.exe new file mode 100644 index 00000000..7f27509a Binary files /dev/null and b/front/public/static/download/360se13.1.6260.0.exe differ diff --git a/front/public/static/js/modal.js b/front/public/static/js/modal.js index cfd026dd..1da4faf9 100644 --- a/front/public/static/js/modal.js +++ b/front/public/static/js/modal.js @@ -64,17 +64,22 @@ var ModelBox = (function() { _this.isShow = this.option.isShow var html = '
' + - '

title

' + - '
' + + '
' + + 'title' + + '
' + + '
' + + '
content
' + '
' + - '下载' + - '取消' + + '下载谷歌浏览器' + + '下载360浏览器' + '
' + '
' var ModelBoxCon = document.createElement('div') ModelBoxCon.setAttribute('class', 'mask-layer') ModelBoxCon.innerHTML = html - ModelBoxCon.querySelector('.model-title').innerHTML = + // ModelBoxCon.querySelector('.model-title').innerHTML = + // _this.option.title + ModelBoxCon.querySelector('.title-span').innerHTML = _this.option.title ModelBoxCon.querySelector('.model-content').innerHTML = _this.option.content @@ -82,8 +87,9 @@ var ModelBox = (function() { if (!_this.isShow) { ModelBoxCon.style.display = 'none' } - ModelBoxCon.querySelector('.cancel').onclick = - ModelBoxCon.querySelector('.confirm').onclick = + ModelBoxCon.querySelector('.model-close').onclick = + ModelBoxCon.querySelector('.confirmChrome').onclick = + ModelBoxCon.querySelector('.confirm360').onclick = _this.eventsFn.bind('', this, ModelBoxCon) }, show: function() { @@ -95,9 +101,13 @@ var ModelBox = (function() { this.isShow = false }, eventsFn: function(e, doc, target) { + debugger var _thisEvent = target.target - if (_thisEvent.classList.contains('confirm')) { - e.option.confirmCallBack() + if (_thisEvent.classList.contains('confirmChrome')) { + e.option.confirmCallBack('Chrome') + + } else if (_thisEvent.classList.contains('confirm360')) { + e.option.confirmCallBack('360') } doc.style.display = 'none' e.isShow = false @@ -108,26 +118,45 @@ var ModelBox = (function() { })() var opt = new ModelBox({ - title: '当前系统不支持IE内核，建议使用Chrome浏览器或360浏览器极速模式', - content: '', + title: '提示信息', + content: '平台暂不支持IE内核浏览器访问，建议使用谷歌(Chrome)或360浏览器极速模式登录！', isShow: false, - confirmCallBack: function() { + confirmCallBack: function(data) { + debugger // 获取当前系统的方法 const agent = getPCNum() - console.log('agent------------>', agent) - if (agent == 64) { - // 64位操作系统 - downloadFile( - 'ChromeStandaloneSetup64.exe', - '/static/download/ChromeStandaloneSetup64.exe' - ) + //console.log('agent------------>', agent) + //console.log('datadatadatadata----------->', data) + if (data === 'Chrome') { + if (agent == 64) { + // 64位操作系统 + downloadFile( + 'ChromeStandaloneSetup64.exe', + '/static/download/ChromeStandaloneSetup64.exe' + ) + } else { + // 32位操作系统 + downloadFile( + 'ChromeStandalonesetup32.exe', + '/static/download/standalonesetup32.exe' + ) + } } else { - // 32位操作系统 - downloadFile( - 'ChromeStandalonesetup32.exe', - '/static/download/standalonesetup32.exe' - ) + if (agent == 64) { + // 64位操作系统 + downloadFile( + '360se13.1.6260.0.exe', + '/static/download/360se13.1.6260.0.exe' + ) + } else { + // 32位操作系统 + downloadFile( + '360se13.1.6110.0.exe', + '/static/download/360se13.1.6110.0.exe' + ) + } } + }, }) diff --git a/front/src/assets/index/close-button-remind.png b/front/src/assets/index/close-button-remind.png new file mode 100644 index 00000000..fd302a9b Binary files /dev/null and b/front/src/assets/index/close-button-remind.png differ diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index b8fcc4c9..49d2ed6f 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -262,7 +262,7 @@
- +
@@ -409,7 +409,7 @@
模糊搜索 -
@@ -494,8 +494,11 @@ export default defineComponent({ const router = useRouter() let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB const select2 = router.currentRoute.value.query.select + const type2 = router.currentRoute.value.query.type + const queryName=ref('') const str = router.currentRoute.value.query.str const searchValue = ref(str) + const searchType= ref(str) let tecHnosphere = router.currentRoute.value.query.tecHnosphere let appLiCation = router.currentRoute.value.query.appLiCation const Cardsname = ref(select) @@ -682,6 +685,7 @@ export default defineComponent({ } ListContent.records.forEach((val) => { + if (!val) { return } @@ -689,6 +693,7 @@ export default defineComponent({ paramsGetResources.infoList = paramsGetResources.infoList.filter( (item) => item.attrType !== name ) + if ( val.selectedTags && val.selectedTags.indexOf(tag.dict_label) == -1 @@ -798,7 +803,34 @@ export default defineComponent({ ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy)) ListContent.records = [] ListContent.records = JSON.parse(JSON.stringify(dataCopy)) - + if(select2=='组件服务'){ + queryName.value='组件类型' + }else if(select2=='应用资源'){ + queryName.value='应用领域' + }else{ + queryName.value='' + } + ListContent.records.forEach((val) => { + + if (!val) { + return + } + if (val.name === queryName.value ) { + if ( + val.selectedTags && + val.selectedTags.indexOf(type2) == -1 + ) { + val.selectedTags = [type2] + } else { + val.selectedTags && + val.selectedTags.splice( + val.selectedTags.indexOf(type2), + 1 + ) + } + + } + }) // 智能算法-特殊处理 if (whoShow1.value.itShowXiHaiAn) { if (!storageSearchInfo) { @@ -859,6 +891,7 @@ export default defineComponent({ // 校验 const re = /^[0-9\u4E00-\u9FA5]*$/ const getAppResources2 = () => { + globalFlag.value = false if ( whoShow1.value.itShowQingDao && @@ -1236,7 +1269,24 @@ export default defineComponent({ if (searchValue.value && !select2) { globalSearch() } else { + paramsGetResources.infoList=[] + if(select2=='组件服务'){ + queryName.value='组件类型' + }else if(select2=='应用资源'){ + queryName.value='应用领域' + }else if(select2=='基础设施'){ + searchType.value=type2 + }else{ + queryName.value=type2 + searchType.value='' + } + let info={attrType:queryName.value, attrValue: type2} + paramsGetResources.infoList.push(info) + paramsGetResources.type=select2 getAppResources2() + + + listKey.value++ } } }) diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue index 0c62dfb6..fc13a08c 100644 --- a/front/src/views/home/components/integrationServiceOrder.vue +++ b/front/src/views/home/components/integrationServiceOrder.vue @@ -47,6 +47,7 @@ const integrationOrder = reactive({ // 融合服务--排序 const changeOrder = (i, val, type) => { + console.log('i, val, type------------>', i, val, type); integrationOrder.orderField = val integrationOrder.orderType = type; diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 96d345a2..99d22fcc 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -230,6 +230,21 @@
+
+ 发布时间： + + +
发布时间：