diff --git a/.gitignore b/.gitignore index 1d85f8ff..b1d42a94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ back/dist-西海岸-后台管理.zip -front/public/index.html -front/public/index.html back/public/index.html back/dist-西海岸-后台管理-带配置文件.zip back/dist-市局-后台管理-带配置文件.zip -front/public/index.html diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js index a3c903e3..e78f7fd2 100644 --- a/back/src/i18n/zh-CN.js +++ b/back/src/i18n/zh-CN.js @@ -545,4 +545,19 @@ t.notice.new = '有新通知' t.notice.disconnect = '连接断开' t.notice.disconnectMessage = 'WebSocket连接已断开,请检查网络' +t.projectList = {} +t.projectList.projectName='项目名称' +t.projectList.projectUnit='申请单位' +t.projectList.departm='责任处室' +t.projectList.date='申请日期' +t.projectList.district='所属区市' +t.projectList.contacts='业务联系人' +t.projectList.contactstel='业务联系人电话' +t.projectList.technology='技术联系人电话' +t.projectList.technologytel='技术联系人电话' + + + + + export default t diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index cc07db43..ab4c9931 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -2,7 +2,7 @@ import Cookies from 'js-cookie' import qs from 'qs' import { deepClone } from '@/utils/form-generator/index' export default { - data () { + data() { /* eslint-disable */ return { // 设置属性 @@ -17,8 +17,8 @@ export default { exportURL: '', // 导出接口,API地址 requestCallback: null // 获取列表以后执行的回调 }, - flag:false, - time:null, + flag: false, + time: null, // 默认属性 dataForm: { }, // 查询条件 @@ -38,19 +38,19 @@ export default { } /* eslint-enable */ }, - created () { + created() { if (this.mixinViewModuleOptions.createdIsNeed) { this.query() } }, - activated () { + activated() { if (this.mixinViewModuleOptions.activatedIsNeed) { this.query() } }, methods: { // 获取数据列表 - query () { + query() { this.dataListLoading = true this.$http.get( this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({ @@ -118,11 +118,11 @@ export default { }) }, // 多选 - dataListSelectionChangeHandle (val) { + dataListSelectionChangeHandle(val) { this.dataListSelections = val }, // 排序 - dataListSortChangeHandle (data) { + dataListSortChangeHandle(data) { if (!data.order || !data.prop) { this.order = '' this.orderField = '' @@ -133,13 +133,13 @@ export default { this.query() }, // 分页, 每页条数 - pageSizeChangeHandle (val) { + pageSizeChangeHandle(val) { this.page = 1 this.limit = val this.query() }, // 分页, 当前页 - pageCurrentChangeHandle (val) { + pageCurrentChangeHandle(val) { this.page = val this.query() }, @@ -148,7 +148,7 @@ export default { this.query() }, // 新增 - addOrUpdateHandle (id) { + addOrUpdateHandle(id) { this.addOrUpdateVisible = true this.disabled = false this.$nextTick(() => { @@ -159,7 +159,7 @@ export default { }, // 组件服务新增 - addOrUpdateHandleAI (id) { + addOrUpdateHandleAI(id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -217,7 +217,7 @@ export default { }, 100) }, // 应用资源新增 - addOrUpdateHandleServe (id) { + addOrUpdateHandleServe(id) { // const infoList = [] let showList = [] this.$http.get('category/getCategoryTree').then(({ data: res }) => { @@ -275,7 +275,7 @@ export default { }, 100) }, // 修改 - UpdateHandle (val) { + UpdateHandle(val) { this.addOrUpdateVisible = true this.disabled = false const cloneVal = deepClone(val) @@ -300,7 +300,7 @@ export default { }) }, // 关闭当前窗口 - closeCurrentTab (data) { + closeCurrentTab(data) { var tabName = this.$store.state.contentTabsActiveName this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) if (this.$store.state.contentTabs.length <= 0) { @@ -312,7 +312,7 @@ export default { } }, // 删除 - deleteHandle (id) { + deleteHandle(id) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { return this.$message({ message: this.$t('prompt.deleteBatch'), @@ -346,7 +346,7 @@ export default { }).catch(() => { }) }, - deleteHandle2 (id) { + deleteHandle2(id) { console.log('删除========================》', id, this.dataListSelections) const ids = [] if (id) { @@ -364,7 +364,7 @@ export default { }) }, // 导出 - exportHandle () { + exportHandle() { var params = qs.stringify({ token: Cookies.get('ucsToken'), ...this.dataForm diff --git a/back/src/views/main-sidebar.vue b/back/src/views/main-sidebar.vue index 00535e99..af5f8261 100644 --- a/back/src/views/main-sidebar.vue +++ b/back/src/views/main-sidebar.vue @@ -2,7 +2,7 @@ * @Author: kongjun qdkongjun@gmail.com * @Date: 2022-06-20 09:29:59 * @LastEditors: kongjun qdkongjun@gmail.com - * @LastEditTime: 2022-06-21 10:37:47 + * @LastEditTime: 2022-06-22 10:04:56 * @FilePath: \back\src\views\main-sidebar.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -47,7 +47,19 @@ export default { width: 266px; .aui-sidebar__inner { width: 260px; - overflow-y: hidden; + //overflow-y: hidden; + /*滚动条样式*/ + &::-webkit-scrollbar { + width: 0px; + } + &::-webkit-scrollbar-thumb { + border-radius: 5; + background: rgba(0, 0, 0, 0.25); + } + &::-webkit-scrollbar-track { + border-radius: 0; + background: #f2f2f2; + } .aui-sidebar__menu { width: 266px; } diff --git a/back/src/views/main.vue b/back/src/views/main.vue index 2dd2f26a..612ba48d 100644 --- a/back/src/views/main.vue +++ b/back/src/views/main.vue @@ -136,8 +136,5 @@ export default { diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index e06e60dc..947710db 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -1,10 +1,7 @@