diff --git a/.env.development b/.env.development index 4aa4d21..65db24a 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.106:9040' +VUE_APP_BASE_API = 'http://192.168.0.105:9040' # VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 路由懒加载 diff --git a/src/api/jin_ji_hu/policyDocument/index.js b/src/api/jin_ji_hu/policyDocument/index.js new file mode 100644 index 0000000..afa07c5 --- /dev/null +++ b/src/api/jin_ji_hu/policyDocument/index.js @@ -0,0 +1,45 @@ +import request from "@/utils/request" + +// 分页查询政策文件 +export function getJPolicyFile(params) { + return request({ + url: "/jjh/jPolicyFile", + method: "get", + params + }) +} + +// 新增政策文件 +export function jPolicyFileNew(data) { + return request({ + url: "/jjh/jPolicyFile", + method: "post", + data + }) +} + +// 删除政策文件 +export function jPolicyFileChange(data) { + return request({ + url: "/jjh/jPolicyFile", + method: "put", + data + }) +} + +// 根据主键查询政策文件 +export function jPolicyFileId(id) { + return request({ + url: "/jjh/jPolicyFile/" + id, + method: "get", + }) +} + +// 删除政策文件 +export function jPolicyFileDel(params) { + return request({ + url: "/jjh/jPolicyFile", + method: "delete", + params + }) +} \ No newline at end of file diff --git a/src/api/onlineDeclartion/records.js b/src/api/onlineDeclartion/records.js index dbc7981..32642f8 100644 --- a/src/api/onlineDeclartion/records.js +++ b/src/api/onlineDeclartion/records.js @@ -72,7 +72,7 @@ export function putMunicipalBureauReview(data) { // 导出zip压缩包 export function exportZip(params) { return request({ - url: '/system/declarationRecords/exportZip', + url: '/system/declarationRecords/fileList', method: 'get', responseType: 'blob', headers: { diff --git a/src/assets/images/workbench.png b/src/assets/images/workbench.png new file mode 100644 index 0000000..bab740a Binary files /dev/null and b/src/assets/images/workbench.png differ diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 6e7e078..96024d0 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -123,14 +123,26 @@ .table-operation { span { cursor: pointer; - &:nth-of-type(1) { - color: #192A92; - margin-right: 15px; - } - &:nth-of-type(2) { - color: #C51717; - } } + .look-info { + color: #192A92; + margin-right: 15px; + } + .edit-info { + color: #29A07A; + margin-right: 15px; + } + .del-info { + color: #C51717; + } + } + .project-name { + text-decoration: underline; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #1890FF; + cursor: pointer; } } .el-pagination { @@ -593,54 +605,56 @@ } } // 导入新项目弹框 -.importFormItem { - .el-form-item__label { - text-align: left; - } - .el-form-item__content { - .el-select,.el-date-editor { - // width: 280px; - width: calc(100% - 20px); +.project-import-dialog { + .importFormItem { + .el-form-item__label { + text-align: left; } - .btnsFlex { - display: flex; - align-items: center; - margin-top: 40px; - .el-upload { - // .el-upload-dragger { - display: flex; - align-items: center; - justify-content: center; - width: 120px; - height: 36px; - background: #F1D78C; - border: none; - border-radius: 5px 5px 5px 5px; - font-family: PingFang-SC, PingFang-SC; - font-weight: bold; - font-size: 14px; - color: #000000; - i { - margin-right: 5px; - } - // } - // .el-upload-dragger:hover { - // background: oklab(.88 0 .1 / .5); - // border-color: #f1d78c; - // // border: 1px solid #f1d78c; - // color: #000; - // } - } - .el-upload:hover { - background: oklab(.88 0 .1 / .5); - border-color: #f1d78c; - // border: 1px solid #f1d78c; - color: #000; + .el-form-item__content { + .el-select,.el-date-editor { + // width: 280px; + width: calc(100% - 20px); } - a { - text-decoration: underline; - color: #134EE6; - margin-left: 20px; + .btnsFlex { + display: flex; + align-items: center; + margin-top: 40px; + .el-upload { + // .el-upload-dragger { + display: flex; + align-items: center; + justify-content: center; + width: 120px; + height: 36px; + background: #F1D78C; + border: none; + border-radius: 5px 5px 5px 5px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #000000; + i { + margin-right: 5px; + } + // } + // .el-upload-dragger:hover { + // background: oklab(.88 0 .1 / .5); + // border-color: #f1d78c; + // // border: 1px solid #f1d78c; + // color: #000; + // } + } + .el-upload:hover { + background: oklab(.88 0 .1 / .5); + border-color: #f1d78c; + // border: 1px solid #f1d78c; + color: #000; + } + a { + text-decoration: underline; + color: #134EE6; + margin-left: 20px; + } } } } @@ -699,4 +713,202 @@ } .el-table__fixed::before,.el-table__fixed-right::before { height: 0; +} + +// 新增发文 +.newArticle { + .el-date-editor { + width: 100%; + } + .el-select { + width: 100%; + } +} + +// 发文详情 +.info-dialog { + .el-dialog__body { + padding: 10px 20px; + } + .info-content { + padding: 10px 20px; + .info-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 20px; + color: #000000; + text-align: center; + } + .info-content-top { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #999999; + margin: 20px 0 10px 0; + display: flex; + align-items: center; + div { + &:first-child { + width: 200px; + } + } + } + .info-content-content { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #000000; + max-height: 400px; + overflow-y: scroll; + } + } + .el-dialog__header { + border-bottom: 1px solid #DDDDDD; + span { + font-family: PingFang-SC, PingFang-SC; + font-weight: 800; + font-size: 16px; + color: #000000; + } + } + .el-dialog__footer { + border-top: 1px solid #DDDDDD; + padding: 10px 20px; + .dialog-footer { + .el-form { + .dialog-from-item { + margin-bottom: 0; + .el-form-item__content { + .el-button { + padding: 10px 17px; + } + } + } + } + } + } +} + +// 工作台 +.workbench-box { + height: 100%; + header { + height: 32%; + background: url("../images/workbench.png"); + background-size: 100% 100%; + display: flex; + align-items: center; + .workbench-serch { + padding-left: 200px; + .workbench-title { + display: flex; + margin-bottom: 5px; + .title-item { + padding: 10px 60px 10px 40px; + border-top-right-radius: 30% 100%; + margin-right: 15px; + background: #FFFFFF; + box-shadow: 2px 0 3px 0px #ccc; + } + } + .workbench-btn { + height: 45px; + .el-input { + width: 800px; + height: 100%; + input { + height: 100%; + } + .el-input-group__append { + width: 80px; + text-align: center; + cursor: pointer; + // background: radial-gradient( farthest-side at 40px 40px, #1B84D2 20%, #30CEF5 100%); + background: linear-gradient( to right, #1B84D2, #30CEF5); + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 16px; + color: #FFFFFF; + } + } + } + } + } + main { + padding: 10px; + height: calc(100% - 38%); + overflow-y: scroll; + .main-row { + height: 100%; + display: flex; + background-color: #f6f7f9; + .work-main-left { + background-color: #fff; + margin-right: 10px; + height: 100%; + } + .work-main-right { + background-color: #fff; + height: 100%; + .main-right { + padding: 10px 20px; + .right-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15px; + .title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .el-button { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #134EE6; + } + } + .right-main { + .main-items { + display: flex; + align-items: center; + padding: 10px 30px; + background: #F5F8FA; + border: 1px solid #D9D9D9; + border-bottom: none; + text-align: center; + &:last-child { + border-bottom: 1px solid #D9D9D9; + } + div { + width: 40%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow:ellipsis; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #666666; + &:last-child { + width: 20%; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #1890FF; + text-decoration: underline; + cursor: pointer; + } + } + } + .main-item { + background-color: #fff; + } + } + } + } + } + } } \ No newline at end of file diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 8981d76..7ea4322 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -71,6 +71,19 @@ export default { bounds: document.body, debug: "warn", modules: { + // 工具栏配置 + // toolbar: [ + // ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 + // ["blockquote", "code-block"], // 引用 代码块 + // [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 + // [{ indent: "-1" }, { indent: "+1" }], // 缩进 + // [{ size: ["small", false, "large", "huge"] }], // 字体大小 + // [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 + // [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 + // [{ align: [] }], // 对齐方式 + // ["clean"], // 清除文本格式 + // ["link", "image", "video"] // 链接、图片、视频 + // ], // 工具栏配置 toolbar: [ ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 @@ -81,8 +94,7 @@ export default { [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 [{ align: [] }], // 对齐方式 - ["clean"], // 清除文本格式 - ["link", "image", "video"] // 链接、图片、视频 + ["link", "image"] // 链接、图片、视频 ], }, placeholder: "请输入内容", diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 9b27a58..ace9f6f 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,5 +1,5 @@ - + @@ -15,6 +15,24 @@ import iframeToggle from "./IframeToggle/index"; export default { name: "AppMain", components: { iframeToggle }, + watch:{ + $route: { + handler(route) { + // console.log(route,"route"); + if(route.path == "/workbench") { + this.breadcrumb = false; + } else { + this.breadcrumb = true; + } + }, + immediate:true + } + }, + data() { + return { + breadcrumb: false, + }; + }, computed: { cachedViews() { return this.$store.state.tagsView.cachedViews; @@ -37,6 +55,10 @@ export default { background: #f6f7f9; overflow: hidden; } +.app-main-breadcrumb { + height: calc(100% - 1px); + padding: 0 0 10px 0; +} .fixed-header + .app-main { padding-top: 50px; diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue index 37237f4..e2f98b1 100644 --- a/src/layout/components/FixedHeader/index.vue +++ b/src/layout/components/FixedHeader/index.vue @@ -33,7 +33,7 @@ - + @@ -52,9 +52,23 @@ export default { data() { return { systemTitle: process.env.VUE_APP_TITLE, - username: "" + username: "", + breadcrumbShow: false, }; }, + watch:{ + $route: { + handler(route) { + // console.log(route,"route"); + if(route.path == "/workbench") { + this.breadcrumbShow = false; + } else { + this.breadcrumbShow = true; + } + }, + immediate:true + } + }, computed: { ...mapGetters(["avatar", "name", "sidebarRouters"]), variables() { diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue index 3d58a13..20a76fd 100644 --- a/src/views/components/myDialog/index.vue +++ b/src/views/components/myDialog/index.vue @@ -12,7 +12,7 @@ - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ addFrom.name }} + + 发布人:{{ addFrom.createBy }} + 发布时间:{{ addFrom.enterTime }} + + + + + diff --git a/src/views/project/index.vue b/src/views/project/index.vue index afaba09..0f824c7 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -121,7 +121,7 @@ > - + diff --git a/src/views/project/projectInfo/components/projectProgress/index.vue b/src/views/project/projectInfo/components/projectProgress/index.vue index 4182927..5c5de94 100644 --- a/src/views/project/projectInfo/components/projectProgress/index.vue +++ b/src/views/project/projectInfo/components/projectProgress/index.vue @@ -94,7 +94,7 @@ export default { // approvalStatus 0:待审核 1:审核通过 2:审核不通过 getFlow(id){ declarationRecordsId(id).then(res=>{ - this.flow = res.data; + this.flow = res.data[0] ? res.data : []; }) } }, diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue index 58e3ddf..6380a90 100644 --- a/src/views/project/projectInfo/index.vue +++ b/src/views/project/projectInfo/index.vue @@ -90,7 +90,7 @@ export default { }) }, goback(id){ - console.log(id,"id"); + // console.log(id,"id"); this.$router.replace({ path: '/project/index', query: { projectId: id } diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue new file mode 100644 index 0000000..bc28b45 --- /dev/null +++ b/src/views/workbench/index.vue @@ -0,0 +1,77 @@ + + + + + + + 查企业 + + + 查项目 + + + 查荣誉 + + + + + 搜索 + + + + + + + + + + + + + + + 【待办提醒】 + >> 更多记录 + + + + {{ item.projectName }} + 审批【知识产权】材料 + 去审批 + + + + + + + + + +