diff --git a/package.json b/package.json index 523f38f..bb08b34 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408070944", + "version": "1.0.202408091105", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 8c47230..0aa7e2c 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -1915,17 +1915,17 @@ height: 815px; .col-left-box { margin-right: 10px; - // display: grid; - // grid-template-columns: 1fr; - // row-gap: 10px; - // height: 100%; - display: flex; - flex-direction: column; - .appropriate-analyse-box { + .change-August-eight-th-style-row { + height: 50%; margin-bottom: 10px; + display: flex; } - .appropriate-analyse-box, .promote-analyse-box { + .change-August-eight-th-style { + margin-right: 10px; + } + .appropriate-analyse-box, .promote-analyse-box,.bottombox-right-box { height: calc(50% - 5px); + // width: 100%; // flex: 1; background-color: #F5F8FA; // height: 100%; @@ -1949,6 +1949,53 @@ color: #383838; } } + // 产业品牌打造宣传 + .brandPublicity-box { + padding: 20px 0; + height: 100%; + .promoteProject-box-wai-box { + height: calc(100% - 20px); + overflow-y: auto; + display: grid; + grid-template-columns: 1fr; + row-gap: 15px; + } + .promoteProject-box-div { + background: #FFFFFF; + padding: 18px 14px; + .promoteProject-top { + .span-one { + font-family: AlibabaPuHuiTiM; + font-size: 16px; + color: #1890FF; + font-style: normal; + text-decoration-line: underline; + text-transform: none; + } + } + .promoteProject-bottom { + margin-top: 16px; + display: flex; + justify-content: space-between; + .promoteProject-bottom-left { + font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + .span-two { + font-family: AlibabaPuHuiTiM; + } + } + .promoteProject-bottom-right { + font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + .span-three { + font-family: ArialB; + } + } + } + } + } .capital-appropriate-analyse-box { height: 400px; #echartsFour { @@ -2038,6 +2085,9 @@ } } } + .appropriate-analyse-box,.bottombox-right-box { + height: calc(100% - 5px); + } } .col-right-box { background-color: #F5F8FA; @@ -2165,89 +2215,11 @@ } } } - .main-row-three-bottombox { - display: flex; - height: 370px; - margin-top: 10px; - .bottombox-left-box { - margin-right: 10px; - } - .bottombox-left-box,.bottombox-right-box { - background-color: #F5F8FA; - height: 100%; - padding: 20px 20px 10px; - border-radius: 10px; - display: flex; - flex-direction: column; - .box-header { - display: flex; - align-items: center; - .garden { - width: 10px; - height: 10px; - border-radius: 50%; - background-color: #0086FF; - margin-right: 10px; - } - .box-header-title { - font-family: AlibabaPuHuiTiB; - font-size: 16px; - color: #383838; - } - } - .featureProject-box,.brandPublicity-box { - // flex: 1; - padding: 20px 0; - height: calc(100% - 20px); - overflow-y: auto; - // height: calc(100% - 95px); - .promoteProject-box-wai-box { - // height: calc(100% - 105px); - // overflow-y: auto; - display: grid; - grid-template-columns: 1fr; - row-gap: 15px; - } - .promoteProject-box-div { - background: #FFFFFF; - padding: 14px; - position: relative; - .promoteProject-top { - .span-one { - font-family: AlibabaPuHuiTiM; - font-size: 16px; - color: #1890FF; - font-style: normal; - text-decoration-line: underline; - text-transform: none; - } - } - .promoteProject-bottom { - margin-top: 16px; - display: flex; - justify-content: space-between; - width: 85%; - .promoteProject-bottom-left { - font-family: AlibabaPuHuiTiR; - font-size: 14px; - color: #666666; - .span-two { - font-family: AlibabaPuHuiTiM; - } - } - .promoteProject-bottom-right { - font-family: AlibabaPuHuiTiR; - font-size: 14px; - color: #666666; - .span-three { - font-family: ArialB; - } - } - } - } - } - } - } + // .main-row-three-bottombox { + // display: flex; + // height: 370px; + // margin-top: 10px; + // } } } } @@ -2259,6 +2231,88 @@ box-sizing: border-box; } } +// 政务端工作台的 重点及特色项目/产业品牌打造宣传 样式 +.bottombox-left-box { + margin-right: 10px; +} +.bottombox-left-box { + background-color: #F5F8FA; + height: 100%; + padding: 20px 20px 10px; + border-radius: 10px; + display: flex; + flex-direction: column; + .box-header { + display: flex; + align-items: center; + .garden { + width: 10px; + height: 10px; + border-radius: 50%; + background-color: #0086FF; + margin-right: 10px; + } + .box-header-title { + font-family: AlibabaPuHuiTiB; + font-size: 16px; + color: #383838; + } + } + .featureProject-box { + // flex: 1; + padding: 20px 0; + height: 100%; + + // height: calc(100% - 95px); + .promoteProject-box-wai-box { + height: calc(100% - 20px); + overflow-y: auto; + // height: calc(100% - 105px); + // overflow-y: auto; + display: grid; + grid-template-columns: 1fr; + row-gap: 15px; + } + .promoteProject-box-div { + background: #FFFFFF; + padding: 14px; + position: relative; + .promoteProject-top { + .span-one { + font-family: AlibabaPuHuiTiM; + font-size: 16px; + color: #1890FF; + font-style: normal; + text-decoration-line: underline; + text-transform: none; + } + } + .promoteProject-bottom { + margin-top: 16px; + display: flex; + justify-content: space-between; + width: 85%; + .promoteProject-bottom-left { + font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + .span-two { + font-family: AlibabaPuHuiTiM; + } + } + .promoteProject-bottom-right { + font-family: AlibabaPuHuiTiR; + font-size: 14px; + color: #666666; + .span-three { + font-family: ArialB; + } + } + } + } + } +} + // 企业端工作台 .home-box { height: 100%; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 023c099..89ba29e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -177,7 +177,7 @@ const user = { }).catch(error => { reject(error) }) - } else if(state.userType == "01") { + } else if(state.token && state.clientToken) { return new Promise((resolve, reject) => { enterpriseLogout({clienttoken: state.clientToken}).then(()=>{ commit('SET_CLIENTTOKEN', '') diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue index 6ad2c7a..40503f5 100644 --- a/src/views/dataCloudMap/index.vue +++ b/src/views/dataCloudMap/index.vue @@ -98,7 +98,8 @@
- {{ item.servicesType == 1 ? '生产性服务业' : item.servicesType == 2 ? '生活性服务业' : item.servicesType == 3 ? '新兴服务业' : item.servicesType == 4 ? '限上批零住餐' : '' }} + + {{ item.servicesType == 1 ? '生产性服务业' : item.servicesType == 2 ? '生活性服务业' : item.servicesType == 3 ? '规上服务业' : item.servicesType == 4 ? '限上批零住餐' : '' }}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 86c3217..897614c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -101,7 +101,7 @@ - +
@@ -160,7 +160,7 @@
- +
diff --git a/src/views/login.vue b/src/views/login.vue index 7745c15..33d8e37 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -11,7 +11,8 @@ - + + - + - + 记住密码 - + 政务通统一身份认证登录 - + + + 企业统一身份认证登录
- +
@@ -206,6 +206,15 @@
+ +
+ + 重点及特色项目 +
+
+ +
+
@@ -218,15 +227,28 @@ -
-
- - 资金拨付情况分析 -
-
- -
-
+ + +
+
+ + 资金拨付情况分析 +
+
+ +
+
+
+ +
+ + 产业品牌打造宣传 +
+
+ +
+
+
@@ -262,7 +284,7 @@
- +
@@ -295,8 +317,11 @@
{{ info.alertContent }}
+ + +