diff --git a/.env.development b/.env.development index 3707f58..67c38a4 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.114:9040' +# VUE_APP_BASE_API = 'http://192.168.0.114:9040' +VUE_APP_BASE_API = 'http://192.168.0.109:9040' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/jin_ji_hu/project/index.js b/src/api/jin_ji_hu/project/index.js new file mode 100644 index 0000000..18796dd --- /dev/null +++ b/src/api/jin_ji_hu/project/index.js @@ -0,0 +1,77 @@ +import request from "@/utils/request" + +// 分页查询项目库 +export function jProject(params) { + return request({ + url: "/jjh/jProject", + method: "get", + params + }) +} +// 根据主键查询单个项目库 +export function jProjectId(id) { + return request({ + url: "/jjh/jProject/" + id, + method: "get", + }) +} +// 删除单个项目 +export function jProjectDel(params) { + return request({ + url: "/jjh/jProject", + method: "delete", + params + }) +} + + +/** + * 备忘录 + */ +// 分页查询所有数据 +export function getJMemorandum(params) { + return request({ + url: "/jjh/jMemorandum", + method: "get", + params + }) +} +// 未使用分页 +export function getJMemorandumList(params) { + return request({ + url: "/jjh/jMemorandum/getIdToList", + method: "get", + params + }) +} +// id查询单条数据 +export function getJMemorandumId(id) { + return request({ + url: "/jjh/jMemorandum/" + id, + method: "get", + }) +} +// 新建备忘录 +export function postJMemorandum(data) { + return request({ + url: "/jjh/jMemorandum", + method: "post", + data + }) +} +// 修改备忘录 +export function putJMemorandum(data) { + return request({ + url: "/jjh/jMemorandum", + method: "put", + data + }) +} +// 删除备忘录 +export function delJMemorandum(params) { + return request({ + url: "/jjh/jMemorandum", + method: "delete", + params + }) +} \ No newline at end of file diff --git a/src/assets/static/icon/demo_index.html b/src/assets/static/icon/demo_index.html index 060da7d..17cf4f1 100644 --- a/src/assets/static/icon/demo_index.html +++ b/src/assets/static/icon/demo_index.html @@ -55,45 +55,87 @@ @@ -114,9 +156,9 @@ 
@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1711346025444') format('woff2'),
-       url('iconfont.woff?t=1711346025444') format('woff'),
-       url('iconfont.ttf?t=1711346025444') format('truetype');
+  src: url('iconfont.woff2?t=1711530177681') format('woff2'),
+       url('iconfont.woff?t=1711530177681') format('woff'),
+       url('iconfont.ttf?t=1711530177681') format('truetype');
 }

第二步：定义使用 iconfont 的样式

@@ -143,65 +185,128 @@ diff --git a/src/assets/static/icon/iconfont.css b/src/assets/static/icon/iconfont.css index 74a5a76..16fc301 100644 --- a/src/assets/static/icon/iconfont.css +++ b/src/assets/static/icon/iconfont.css @@ -1,53 +1,71 @@ @font-face { font-family: "iconfont"; /* Project id 4480457 */ - src: url('iconfont.woff2?t=1711346025444') format('woff2'), - url('iconfont.woff?t=1711346025444') format('woff'), - url('iconfont.ttf?t=1711346025444') format('truetype'); + src: url('iconfont.woff2?t=1711530177681') format('woff2'), + url('iconfont.woff?t=1711530177681') format('woff'), + url('iconfont.ttf?t=1711530177681') format('truetype'); } .iconfont { font-family: "iconfont" !important; - font-size: 14px; + font-size: 16px; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -[class^="icon-jc"], -[class*="icon-jc"] - { - font-family: "iconfont" !important; - font-size: 14px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +.icon-jc-55fanhui:before { + content: "\e630"; +} + +.icon-jc-dian:before { + content: "\e606"; +} + +.icon-jc-shenpitongguo-copy:before { + content: "\e74b"; +} + +.icon-jc-daishenpi1:before { + content: "\e62d"; +} + +.icon-jc-shenpitongguo:before { + content: "\e742"; +} + +.icon-jc-daishenpi1-copy:before { + content: "\e74a"; +} + +.icon-jc-dian-green:before { + content: "\e705"; } -.icon-jc-anquanbaozhang:before { - content: "\e61e"; +.icon-jc-kong-yuan:before { + content: "\e704"; } -.icon-jc-xiaoxi-zhihui:before { +.icon-jc-shanchu:before { content: "\e61f"; } -.icon-jc-xihuan:before { - content: "\e620"; +.icon-jc-shanchu-select:before { + content: "\e600"; } -.icon-jc-gengduo:before { - content: "\e621"; +.icon-jc-bianji-copy:before { + content: "\e63d"; } -.icon-jc-shouye-zhihui:before { - content: "\e622"; +.icon-jc-bianji:before { + content: "\e603"; } -.icon-jc-gerenzhongxin-zhihui:before { - content: "\e623"; +.icon-jc-xinjian:before { + content: "\e63c"; } -.icon-jc-kandian-zhihui:before { - content: "\e624"; +.icon-jc-daoru:before { + content: "\e635"; } diff --git a/src/assets/static/icon/iconfont.js b/src/assets/static/icon/iconfont.js index 4962414..a7f907f 100644 --- a/src/assets/static/icon/iconfont.js +++ b/src/assets/static/icon/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_4480457='',function(a){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var i,n,o,l,c,d=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}i=function(){var t,e=document.createElement("div");e.innerHTML=a._iconfont_svg_string_4480457,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?d(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(n=function(){document.removeEventListener("DOMContentLoaded",n,!1),i()},document.addEventListener("DOMContentLoaded",n,!1)):document.attachEvent&&(o=i,l=a.document,c=!1,m(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,s())})}function s(){c||(c=!0,o())}function m(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(m,50)}s()}}(window); \ No newline at end of file +window._iconfont_svg_string_4480457='',function(a){var l=(l=document.getElementsByTagName("script"))[l.length-1],c=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var t,i,z,m,o,e=function(l,c){c.parentNode.insertBefore(l,c)};if(c&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}t=function(){var l,c=document.createElement("div");c.innerHTML=a._iconfont_svg_string_4480457,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(l=document.body).firstChild?e(c,l.firstChild):l.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),t()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(z=t,m=a.document,o=!1,n(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,h())})}function h(){o||(o=!0,z())}function n(){try{m.documentElement.doScroll("left")}catch(l){return void setTimeout(n,50)}h()}}(window); \ No newline at end of file diff --git a/src/assets/static/icon/iconfont.json b/src/assets/static/icon/iconfont.json index e4879c2..3363320 100644 --- a/src/assets/static/icon/iconfont.json +++ b/src/assets/static/icon/iconfont.json @@ -1,58 +1,107 @@ { "id": "4480457", - "name": "no name", + "name": "jin-ji-hu", "font_family": "iconfont", "css_prefix_text": "icon-jc-", "description": "", "glyphs": [ { - "icon_id": "33986995", - "name": "安全保障", - "font_class": "anquanbaozhang", - "unicode": "e61e", - "unicode_decimal": 58910 + "icon_id": "16589939", + "name": "返回", + "font_class": "55fanhui", + "unicode": "e630", + "unicode_decimal": 58928 }, { - "icon_id": "33986996", - "name": "消息-置灰", - "font_class": "xiaoxi-zhihui", + "icon_id": "14046404", + "name": "点", + "font_class": "dian", + "unicode": "e606", + "unicode_decimal": 58886 + }, + { + "icon_id": "39693775", + "name": "审批通过-copy", + "font_class": "shenpitongguo-copy", + "unicode": "e74b", + "unicode_decimal": 59211 + }, + { + "icon_id": "20831612", + "name": "待审批", + "font_class": "daishenpi1", + "unicode": "e62d", + "unicode_decimal": 58925 + }, + { + "icon_id": "23249943", + "name": "审批通过", + "font_class": "shenpitongguo", + "unicode": "e742", + "unicode_decimal": 59202 + }, + { + "icon_id": "39693752", + "name": "待审批-copy", + "font_class": "daishenpi1-copy", + "unicode": "e74a", + "unicode_decimal": 59210 + }, + { + "icon_id": "39692796", + "name": "点-copy", + "font_class": "dian-green", + "unicode": "e705", + "unicode_decimal": 59141 + }, + { + "icon_id": "23114773", + "name": "空-圆", + "font_class": "kong-yuan", + "unicode": "e704", + "unicode_decimal": 59140 + }, + { + "icon_id": "9262906", + "name": "删除", + "font_class": "shanchu", "unicode": "e61f", "unicode_decimal": 58911 }, { - "icon_id": "33986997", - "name": "喜欢", - "font_class": "xihuan", - "unicode": "e620", - "unicode_decimal": 58912 + "icon_id": "27859940", + "name": "删除", + "font_class": "shanchu-select", + "unicode": "e600", + "unicode_decimal": 58880 }, { - "icon_id": "33986998", - "name": "更多", - "font_class": "gengduo", - "unicode": "e621", - "unicode_decimal": 58913 + "icon_id": "39683075", + "name": "编辑-copy", + "font_class": "bianji-copy", + "unicode": "e63d", + "unicode_decimal": 58941 }, { - "icon_id": "33986999", - "name": "首页-置灰", - "font_class": "shouye-zhihui", - "unicode": "e622", - "unicode_decimal": 58914 + "icon_id": "2211276", + "name": "编辑", + "font_class": "bianji", + "unicode": "e603", + "unicode_decimal": 58883 }, { - "icon_id": "33987000", - "name": "个人中心-置灰", - "font_class": "gerenzhongxin-zhihui", - "unicode": "e623", - "unicode_decimal": 58915 + "icon_id": "774412", + "name": "新建 ", + "font_class": "xinjian", + "unicode": "e63c", + "unicode_decimal": 58940 }, { - "icon_id": "33987001", - "name": "看点-置灰", - "font_class": "kandian-zhihui", - "unicode": "e624", - "unicode_decimal": 58916 + "icon_id": "4770724", + "name": "导入", + "font_class": "daoru", + "unicode": "e635", + "unicode_decimal": 58933 } ] } diff --git a/src/assets/static/icon/iconfont.ttf b/src/assets/static/icon/iconfont.ttf index a2d9695..d2d094a 100644 Binary files a/src/assets/static/icon/iconfont.ttf and b/src/assets/static/icon/iconfont.ttf differ diff --git a/src/assets/static/icon/iconfont.woff b/src/assets/static/icon/iconfont.woff index 1d766fd..16c94a4 100644 Binary files a/src/assets/static/icon/iconfont.woff and b/src/assets/static/icon/iconfont.woff differ diff --git a/src/assets/static/icon/iconfont.woff2 b/src/assets/static/icon/iconfont.woff2 index a398b9f..be413e5 100644 Binary files a/src/assets/static/icon/iconfont.woff2 and b/src/assets/static/icon/iconfont.woff2 differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 260ef2d..4909ebb 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -192,3 +192,7 @@ aside { margin-bottom: 10px; } } +/* 此处的 div 可以依照情况替换成对应的元素名称 */ +div::-webkit-scrollbar{ + display:none +} diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index aa41360..d31c442 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1,5 +1,18 @@ +// 面包屑样式 +.my-L-breadcrumb { + height: 55px; + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 20px; + .icon-jc-55fanhui { + color: #192a92; + font-size: 20px; + cursor: pointer; + } +} .L-public-main { - padding: 6px 6px 39px 6px; + padding: 6px 6px 6px 6px; width: 100%; height: 100%; .L-main { @@ -10,15 +23,8 @@ header { margin-bottom: 25px; .import-btn { - padding: 1px 5px; - span { - display: flex; - align-items: center; - .btn-img { - width: 15px; - margin: 5px; - } - } + margin-top: 3px; + padding: 6px 15px; } } .el-table { @@ -93,4 +99,511 @@ } } } +} +.projectInfo { + .el-row { + height: 100%; + .el-col { + height: 100%; + } + } + .left-info{ + height: calc(25% - 5px); + background-color: white; + padding: 28px 28px 0 28px; + .project-info-title { + margin-bottom: 28px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .el-descriptions-item__label { + background: #F5F8FA; + width: 230px; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #333333; + } + .el-descriptions-item__content { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + width: 430px; + font-size: 14px; + color: #333333; + } + .info-link { + // display: flex; + // align-items: center; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #333; + a { + text-decoration: underline; + color: #134EE6; + margin-left: 20px; + } + .a-primary { + margin-left: 0; + color: #1890FF; + } + } + } + .left-tabs{ + height: calc(75% - 5px); + margin-top: 10px; + background-color: white; + .tabs-top { + width: 100%; + display: flex; + padding: 15px 28px; + border-bottom: 1px solid #E4E7ED; + .tabs-top-item { + padding: 5px 34px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #999999; + cursor: pointer; + } + .active-item { + background: #1890FF; + border-radius: 5px 5px 5px 5px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #FFFFFF; + } + } + .tabs-bottom { + padding: 20px 28px 0 28px; + .tabOneLabel,.tabOneContent { + width: 220px; + } + // .tabOneContent {} + .el-descriptions-item__label { + background: #F5F8FA; + width: 220px; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #333333; + } + .el-descriptions-item__content { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #333333; + } + .project-info-title { + margin-bottom: 28px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + } + } + // 备忘录 + .projectInfo-memo { + width: 100%; + .memo-top { + width: 100%; + // margin-bottom: 15px; + .project-info-top { + display: flex; + align-items: center; + .project-info { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + margin-right: 60px; + } + } + .el-date-editor { + width: 340px; + } + .el-input { + width: 340px; + } + .query-item { + margin-left: 15px; + .el-form-item__content { + width: 100%; + button { + height: 32px; + } + } + } + } + .memo-bottom { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + grid-gap: 15px; + height: 400px; + width: 100%; + overflow-y: auto; + .el-card { + overflow: visible; + } + .el-card__header { + background-color: #F5F8FA; + border-bottom: 1px solid #D9D9D9; + .clearfix { + display: flex; + align-items: center; + .clearfix-left { + flex: 1; + display: flex; + flex-direction: column; + span { + &:nth-of-type(1) { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + &:nth-of-type(2) { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + margin-top: 15px; + } + } + } + .clearfix-right { + display: flex; + .clearfix-bianji,.clearfix-shanchu { + display: flex; + align-items: center; + padding: 5px 15px; + cursor: pointer; + // border-radius: 15px; + border-radius: 50px; + i { + margin-right: 5px; + } + } + .clearfix-bianji { + background: rgba(24,144,255,0.3); + } + .clearfix-shanchu { + background: rgba(243,110,65,0.3); + margin-left: 10px; + } + } + } + } + .clearfix-body { + .memo-keyword { + padding: 20px 15px 10px 15px; + border-bottom: 1px solid #D9D9D9; + .memo-keyword-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .memo-keyword-content { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + margin-top: 10px; + height: 80px; + overflow-y: auto; + } + } + .memo-content { + padding: 20px 15px 10px 15px; + .memo-content-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .memo-content-content { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + margin-top: 10px; + height: 80px; + overflow-y: auto; + } + } + } + } + } + // 资金拨付进度 + .money-schedule { + .schedule-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .schedule-timeline { + margin-top: 48px; + .el-timeline-item__tail { + border: 1px dashed #dfe4ed; + } + .el-timeline-item__wrapper { + top: -20px; + } + .el-card__body { + background-color: #F5F8FA; + padding: 15px; + .schedule-content { + display: flex; + align-items: center; + .schedule-card-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .schedule-status { + margin-left: 20px; + padding: 5px 7px; + border-radius: 2px 2px 2px 2px; + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 12px; + color: #FFFFFF; + cursor: pointer; + } + .orange { + background: #F39801; + } + .green { + background: #24D3A9; + } + .blue { + background: #134EE6; + } + } + .schedule-time { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + margin-top: 15px; + } + } + } + } + // 项目进展 + .L-projectProgress { + width: 100%; + height: 100%; + background-color: #fff; + padding: 27px 24px 0 27px; + .projectProgress-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + margin-bottom: 47px; + } + .schedule-timeline { + .el-timeline { + padding-left: 0; + .timeline-item-green { + .el-timeline-item__tail { + border: 1px solid #4EB997; + } + } + .timeline-item-red { + .el-timeline-item__tail { + border: 1px solid #ff1818; + } + } + } + .timeline-dot { + position: absolute; + left: -5px; + width: 22px; + height: 22px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + background-color: #fff; + box-shadow: 1px 1px 3px 0px #4EB997; + + .icon-jc-dian { + color: #ff1818; + } + .icon-jc-dian-green { + color: #4EB997; + } + } + .timeline-dot-red { + box-shadow: 1px 1px 3px 0px #ff1818; + } + .el-timeline-item__wrapper { + top: -20px; + } + .el-card__body { + background-color: #F5F8FA; + padding: 15px; + .schedule-content { + display: flex; + align-items: center; + .card-content-left { + flex: 1; + .schedule-card-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #333333; + } + .card-content-one,.card-content-two { + margin-top: 10px; + span { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + &:nth-of-type(1) { + color: #737373; + width: 70px; + display: inline-block; + } + &:nth-of-type(2) { + color: #333333; + } + } + } + .card-content-three { + margin-top: 20px; + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + } + } + .card-content-right { + .iconfont { + font-size: 65px; + } + .icon-jc-shenpitongguo-copy { + color: #4EB997; + } + } + } + .schedule-time { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #737373; + margin-top: 15px; + } + } + } + } +} +// 导入新项目弹框 +.importFormItem { + .el-form-item__label { + text-align: left; + } + .el-form-item__content { + .el-select,.el-date-editor { + width: 280px; + } + .btnsFlex { + display: flex; + align-items: center; + .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; + } + } + } +} +.importExplain { + .importExplain-title { + font-family: PingFang-SC, PingFang-SC; + font-weight: bold; + font-size: 14px; + color: #666666; + } + .importExplain-content { + margin: 10px 0; + span { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 12px; + color: #666666; + } + } + .importExplain-table { + table { + border-collapse: collapse; + width: 100%; + } + + th, td { + border: 1px solid #cccccc; + width: 80px; + height: 37px; + text-align: center; + } + th { + background-color: #F6F9FD; + } + } +} +// 备忘录弹框样式 +.memoDialog { + .el-form-item__content { + .el-textarea { + textarea { + font-family: PingFang-SC, PingFang-SC; + font-weight: 500; + font-size: 14px; + color: #333333; + &::placeholder { + color: #cccccc; + } + } + } + } } \ No newline at end of file diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 948cf1f..69eb796 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -4,22 +4,25 @@ * @Author: JC9527 * @Date: 2024-03-25 09:07:08 * @LastEditors: JC9527 - * @LastEditTime: 2024-03-25 14:39:13 + * @LastEditTime: 2024-03-27 17:19:32 --> diff --git a/src/permission.js b/src/permission.js index 33d66ec..bed4a5e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -30,7 +30,6 @@ router.beforeEach((to, from, next) => { isRelogin.show = false; store.dispatch("GenerateRoutes").then((accessRoutes) => { // 根据roles权限生成可访问的路由表 - console.log(accessRoutes, "路由"); router.addRoutes(accessRoutes); // 动态添加可访问路由表 next({ ...to, replace: true }); // hack方法 确保addRoutes已完成 }); diff --git a/src/utils/object.js b/src/utils/object.js new file mode 100644 index 0000000..b94ed12 --- /dev/null +++ b/src/utils/object.js @@ -0,0 +1,13 @@ +export function getKey(object){ + let isEmpty = false + Object.keys(object).forEach(el => { + if (object[el] !== null && object[el] !== '') { + isEmpty = true + } + }) + if(isEmpty){ return true } else { return false } +} + +export function clearKey(object){ + Object.keys(object).forEach(key=>{object[key]=''}) +} diff --git a/src/views/components/Pagination/index.vue b/src/views/components/Pagination/index.vue index a5ad805..7e5887a 100644 --- a/src/views/components/Pagination/index.vue +++ b/src/views/components/Pagination/index.vue @@ -24,10 +24,10 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange" /> -
+
@@ -56,7 +56,7 @@ export default { }, layout: { type: String, - default: 'prev, pager, next' + default: 'prev, pager, next, jumper' }, background: { type: Boolean, @@ -142,7 +142,9 @@ export default { scrollTo(0, 800) } }, - handleChange(){}, + // handleChange(val){ + // this.$emit('pagination', { page: val, limit: this.pageSize }) + // }, } } diff --git a/src/views/components/myDialog/index.vue b/src/views/components/myDialog/index.vue new file mode 100644 index 0000000..a95ce42 --- /dev/null +++ b/src/views/components/myDialog/index.vue @@ -0,0 +1,88 @@ + + + diff --git a/src/views/project/index.vue b/src/views/project/index.vue index 616b8b1..84822f0 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2024-03-25 09:07:08 * @LastEditors: JC9527 - * @LastEditTime: 2024-03-25 14:18:03 + * @LastEditTime: 2024-03-28 10:20:30 --> diff --git a/src/views/project/projectInfo/components/tabFour/index.vue b/src/views/project/projectInfo/components/tabFour/index.vue new file mode 100644 index 0000000..410b592 --- /dev/null +++ b/src/views/project/projectInfo/components/tabFour/index.vue @@ -0,0 +1,275 @@ + + diff --git a/src/views/project/projectInfo/components/tabOne/index.vue b/src/views/project/projectInfo/components/tabOne/index.vue new file mode 100644 index 0000000..d2ec313 --- /dev/null +++ b/src/views/project/projectInfo/components/tabOne/index.vue @@ -0,0 +1,100 @@ + + + diff --git a/src/views/project/projectInfo/components/tabThree/index.vue b/src/views/project/projectInfo/components/tabThree/index.vue new file mode 100644 index 0000000..fc8c8e1 --- /dev/null +++ b/src/views/project/projectInfo/components/tabThree/index.vue @@ -0,0 +1,50 @@ + + diff --git a/src/views/project/projectInfo/components/tabTwo/index.vue b/src/views/project/projectInfo/components/tabTwo/index.vue new file mode 100644 index 0000000..0e7263f --- /dev/null +++ b/src/views/project/projectInfo/components/tabTwo/index.vue @@ -0,0 +1,32 @@ + + diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue index adb288d..7993f5c 100644 --- a/src/views/project/projectInfo/index.vue +++ b/src/views/project/projectInfo/index.vue @@ -1,13 +1,90 @@ diff --git a/vue.config.js b/vue.config.js index 7626e31..ce8aab7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,7 +18,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）