diff --git a/src/api/home/index.js b/src/api/home/index.js new file mode 100644 index 0000000..f62d17b --- /dev/null +++ b/src/api/home/index.js @@ -0,0 +1,8 @@ +import request from '@/utils/request.js' + +export const getHomeInfo = () => { + return request({ + url: '/workflow/mosr/process/task', + method: "get" + }); +}; diff --git a/src/api/project-demand/index.js b/src/api/project-demand/index.js new file mode 100644 index 0000000..2d236b5 --- /dev/null +++ b/src/api/project-demand/index.js @@ -0,0 +1,68 @@ +import request from '@/utils/request.js' +//需求征集 +export const getDemandInfo = (param) => { + return request({ + url: '/workflow/mosr/requirement', + method: "get", + params: param + }); +}; +export const getWorkflowInfo = () => { + return request({ + url: '/workflow/mosr/requirement/process', + method: "get" + }); +}; +export const getInfo = (requirementId) => { + return request({ + url: `/workflow/mosr/requirement/info/${requirementId}`, + method: "get" + }); +}; +export const getFormInfo = (requirementId) => { + return request({ + url: `/workflow/mosr/requirement/form/${requirementId}`, + method: "get" + }); +}; +export const agreeTask = (data) => { + return request({ + url: `/workflow/mosr/process/task/agree`, + method: "post", + data: data + }); +}; +export const rejectTask = (data) => { + return request({ + url: `/workflow/mosr/process/task/reject`, + method: "post", + data: data + }); +}; + +export const addRequirement = (data) => { + return request({ + url: '/workflow/mosr/requirement', + method: "post", + data: data + }); +}; +export const resubmit = (data) => { + return request({ + url: '/workflow/mosr/requirement/resubmit', + method: "post", + data: data + }); +}; +export const deleteFile = (fileId) => { + return request({ + url: `/workflow/process/file/delete/${fileId}`, + method: "delete" + }); +}; +export const getCompanyOption = () => { + return request({ + url: '/admin/mosr/sub/company/companyOption', + method: "get" + }); +}; diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 5c1a3c7..d94c6bf 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -19,7 +19,7 @@ html, body, #app, .el-container, .el-aside, .el-main { } .el-main { - background: #F4F6F8; + background: #EFEFEF; padding: 0 0 0 18px; position: fixed; left: 200px; @@ -27,6 +27,7 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-left: 0; transition: margin-left .15s; width: calc(100vw - 200px); + &::-webkit-scrollbar { width: 6px; } @@ -83,9 +84,11 @@ html, body, #app, .el-container, .el-aside, .el-main { align-items: center; margin-bottom: 10px; } -.el-dialog__body{ + +.el-dialog__body { padding: 10px 20px; } + .stateIcon { margin-top: 9px; margin-right: 7px; @@ -248,7 +251,8 @@ html, body, #app, .el-container, .el-aside, .el-main { justify-content: center; z-index: 0; position: relative; - .el-icon{ + + .el-icon { width: 1.4em; height: 1.4em; } @@ -287,9 +291,10 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout { display: flex; justify-content: space-around; + .scrollbar-user { - height: calc(100vh - 250px)!important; - overflow: auto!important; + height: calc(100vh - 250px) !important; + overflow: auto !important; } .scrollbar-dict { @@ -374,6 +379,7 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-top: 10px; z-index: 666; position: absolute; + //top: -20px; } .el-overlay-dialog { @@ -401,6 +407,15 @@ html, body, #app, .el-container, .el-aside, .el-main { } //SvgIcon组件的样式 +.home-icon { + width: 4em; + height: 4em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; + margin-right: 5px; +} + .svg-icon { width: 1.2em; height: 1.2em; @@ -445,10 +460,12 @@ html, body, #app, .el-container, .el-aside, .el-main { overflow: hidden; margin-right: 5px; } -.fen-icon{ + +.fen-icon { width: 1.8em; height: 1.7em; } + .middle-icon { width: 1.4em; height: 1.4em; diff --git a/src/assets/svg/home1.svg b/src/assets/svg/home1.svg new file mode 100644 index 0000000..0a99452 --- /dev/null +++ b/src/assets/svg/home1.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home2.svg b/src/assets/svg/home2.svg new file mode 100644 index 0000000..a71b307 --- /dev/null +++ b/src/assets/svg/home2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home3.svg b/src/assets/svg/home3.svg new file mode 100644 index 0000000..98d2c13 --- /dev/null +++ b/src/assets/svg/home3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/svg/home4.svg b/src/assets/svg/home4.svg new file mode 100644 index 0000000..d9206cd --- /dev/null +++ b/src/assets/svg/home4.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/components/FileUpload.vue b/src/components/FileUpload.vue new file mode 100644 index 0000000..2992a8f --- /dev/null +++ b/src/components/FileUpload.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/components/Tinymce.vue b/src/components/Tinymce.vue index f294790..0295cdb 100644 --- a/src/components/Tinymce.vue +++ b/src/components/Tinymce.vue @@ -60,13 +60,21 @@ const props = defineProps({ toolbar: { type: [String, Array], default: [ - "fullscreen undo redo restoredraft | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | bullist numlist | blockquote subscript superscript removeformat ", + "fullscreen undo redo | cut copy paste pastetext | forecolor backcolor bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify outdent indent | bullist numlist | blockquote subscript superscript removeformat ", "styleselect formatselect fontselect fontsizeselect | table image axupimgs media pagebreak insertdatetime selectall visualblocks searchreplace | code preview | indent2em lineheight formatpainter", ], }, fontFormats: { type: [String, Array], default: "微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;" + }, + width:{ + type: String, + default: 'auto' + }, + height:{ + type: Number, + default: 450 } }) const content = ref(props.value); @@ -78,9 +86,10 @@ const init = reactive({ content_css: '/skins/content/default/content.css', language: 'zh_CN', placeholder: "在这里输入文字", //textarea中的提示信息 - min_width: 320, - min_height: 220, - height: 500, //注：引入autoresize插件时，此属性失效 + min_width: 300, + min_height: 200, + width:props.width, + height: props.height, //注：引入autoresize插件时，此属性失效 resize: "both", //编辑器宽高是否可变，false-否,true-高可变，'both'-宽高均可，注意引号 promotion: false, branding: false, //tiny技术支持信息是否显示 diff --git a/src/fvcomponents/fvSearchForm/index.vue b/src/fvcomponents/fvSearchForm/index.vue index 0994c8c..f082ac7 100644 --- a/src/fvcomponents/fvSearchForm/index.vue +++ b/src/fvcomponents/fvSearchForm/index.vue @@ -1,28 +1,28 @@ - { getList() }) - + \ No newline at end of file + diff --git a/src/layout/navbar/BellSocket.vue b/src/layout/navbar/BellSocket.vue index ba6aac4..b0877d1 100644 --- a/src/layout/navbar/BellSocket.vue +++ b/src/layout/navbar/BellSocket.vue @@ -1,37 +1,37 @@