diff --git a/.env.development b/.env.development index 1ffa280..710cf5d 100644 --- a/.env.development +++ b/.env.development @@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.110:9040' +# VUE_APP_BASE_API = 'http://192.168.0.110:9040' # 测试环境数据库 -# VUE_APP_BASE_API = 'http://39.101.188.84:9040' +VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 # VUE_APP_BASE_API = 'http://39.101.188.84:9031' # 正式环境数据库 diff --git a/package.json b/package.json index 2313986..2c1b8aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408300856", + "version": "1.0.202408301742", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/assets/images/workbenchPro.png b/src/assets/images/workbenchPro.png new file mode 100644 index 0000000..eb83f53 Binary files /dev/null and b/src/assets/images/workbenchPro.png differ diff --git a/src/assets/styles/publicPro.scss b/src/assets/styles/publicPro.scss index a5d432e..b5f654f 100644 --- a/src/assets/styles/publicPro.scss +++ b/src/assets/styles/publicPro.scss @@ -4,13 +4,14 @@ width: 100%; header { - background: url("../images/workbench.png"); - background-size: cover; + background: url("../images/workbenchPro.png"); + // background-size: cover; // background-size: contain; /* 按图片比例缩放到容器内完全显示 */ - background-repeat: no-repeat; + // background-repeat: no-repeat; /* 防止重复 */ - background-position: 0px -50px; + // background-position: 0px -50px; /* 背景图相对于容器的左上角偏移 20px 水平和 30px 垂直 */ + background-size: 100% 100%; padding: 20px 0; display: flex; align-items: center; @@ -441,31 +442,31 @@ color: #666666; margin-bottom: 5px; } - .echart_boxs_btn { - display: flex; - align-items: center; - justify-content: space-between; - padding: 0 25px; - span { - padding: 3px 10px; - border: 1px solid #ccc; - background-color: #fff; - border-radius: 3px; - display: flex; - align-items: center; - justify-content: center; - font-family: ArialB; - font-weight: normal; - font-size: 14px; - color: #999999; - cursor: pointer; - } - .changeFuwuyeYear_span { - background: #0086FF; - color: #FEFEFE; - border: 1px solid #0086FF; - } - } + // .echart_boxs_btn { + // display: flex; + // align-items: center; + // justify-content: space-between; + // padding: 0 25px; + // span { + // padding: 3px 10px; + // border: 1px solid #ccc; + // background-color: #fff; + // border-radius: 3px; + // display: flex; + // align-items: center; + // justify-content: center; + // font-family: ArialB; + // font-weight: normal; + // font-size: 14px; + // color: #999999; + // cursor: pointer; + // } + // .changeFuwuyeYear_span { + // background: #0086FF; + // color: #FEFEFE; + // border: 1px solid #0086FF; + // } + // } } .echart_boxs_middle { width: 100%; @@ -828,6 +829,31 @@ .years-select { margin-right: 10px; } + .echart_boxs_btn { + display: flex; + align-items: center; + padding: 0 25px; + .changeFuwuyeYear_span { + padding: 3px 10px; + border: 1px solid #ccc; + background-color: #fff; + border-radius: 3px; + display: flex; + align-items: center; + justify-content: center; + font-family: ArialB; + font-weight: normal; + font-size: 14px; + color: #999999; + cursor: pointer; + margin-right: 10px; + } + .changeFuwuyeYear_span_change { + background: #0086FF; + color: #FEFEFE; + border: 1px solid #0086FF; + } + } } } diff --git a/src/views/workbenchPro/components/BJinsannianzijin/index.vue b/src/views/workbenchPro/components/BJinsannianzijin/index.vue index 783301a..4100f97 100644 --- a/src/views/workbenchPro/components/BJinsannianzijin/index.vue +++ b/src/views/workbenchPro/components/BJinsannianzijin/index.vue @@ -3,9 +3,9 @@
【服务业专项资金】
-
+
@@ -25,9 +25,9 @@
【总部专项资金】
-
+
diff --git a/src/views/workbenchPro/index.vue b/src/views/workbenchPro/index.vue index a9412bb..bea488e 100644 --- a/src/views/workbenchPro/index.vue +++ b/src/views/workbenchPro/index.vue @@ -40,6 +40,11 @@
近三年资金拨付情况 +
+
+ {{ item.year }} +
+
@@ -316,6 +321,8 @@ export default { BJinsannianzijin }, data() { + let date = new Date(); + const currentYear = date.getFullYear(); return { // 判断登陆用户是何身份⌈ 01 : 企业 02 : 政务 ⌋ userType: this.$store.state.user.userType, @@ -337,6 +344,16 @@ export default { value:"查荣誉" }, ], + fuwuyeYear:[ + { + year: currentYear - 1, + },{ + year: currentYear - 2, + },{ + year: currentYear - 3, + }, + ], + changeFuwuyeYear: 0, checked: 0, loading:false, loadingProject:false,