From e07a6032a111fbe1bd56faa3168a228451dc17c9 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 2 Aug 2024 15:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8F=90=E9=86=92=E3=80=81=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8F=90=E9=86=92=E3=80=81=E6=9C=8D=E5=8A=A1=E4=B8=9A=E5=8F=91?= =?UTF-8?q?=E5=B1=95=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BA=E3=80=81=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=A4=87=E5=BF=98=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- package.json | 2 +- src/api/jin_ji_hu/ServiceDevelopment/index.js | 13 +- src/router/index.js | 1 + src/views/ServiceAndDevelopment/index.vue | 42 +-- src/views/abnormalRemind/index.vue | 249 +++++++++++++++ src/views/components/myEditor/index.vue | 5 +- src/views/dataCloudMap/index.vue | 8 +- .../enterpriselibrary/enterInfo/index.vue | 14 +- src/views/home/index.vue | 43 +-- src/views/login_v1.vue | 294 ++++++++++++++++++ src/views/warningReminder/index.vue | 153 +++++++++ .../components/daibanrenwu/index.vue | 8 +- .../components/zhinengtixing/index.vue | 11 +- src/views/workbench/index.vue | 12 +- 15 files changed, 785 insertions(+), 74 deletions(-) create mode 100644 src/views/abnormalRemind/index.vue create mode 100644 src/views/login_v1.vue create mode 100644 src/views/warningReminder/index.vue diff --git a/.env.development b/.env.development index a45d0bd..b2cda0a 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.0.118:9040' -VUE_APP_BASE_API = 'http://39.101.188.84:9040' +VUE_APP_BASE_API = 'http://192.168.0.118:9040' +# VUE_APP_BASE_API = 'http://39.101.188.84:9040' # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api' # 路由懒加载 diff --git a/package.json b/package.json index 82c8025..e4d8b84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202408020854", + "version": "1.0.202408021508", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/jin_ji_hu/ServiceDevelopment/index.js b/src/api/jin_ji_hu/ServiceDevelopment/index.js index 905664d..ff5ed92 100644 --- a/src/api/jin_ji_hu/ServiceDevelopment/index.js +++ b/src/api/jin_ji_hu/ServiceDevelopment/index.js @@ -1,11 +1,10 @@ import request from "@/utils/request" // 查询模板指标自定义选择 -export function templateMetrics(params) { +export function templateMetrics(year) { return request({ - url: "/jjh/templateMetrics/templateMetrics", + url: "/jjh/templateMetrics/templateMetrics/" + year, method: "get", - params }) } @@ -16,4 +15,12 @@ export function templateMetricsAdd(data){ method: "post", data }) +} + +// 查询服务业发展报告 +export function getId(){ + return request({ + url: "/jjh/templateMetrics/getId", + method: "post", + }) } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index a8bb327..775f72e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,6 +44,7 @@ export const constantRoutes = [ { path: "/login", component: () => import("@/views/login"), + // component: () => import("@/views/login_v1"), // 三方测试脱敏登录页 hidden: true, }, { diff --git a/src/views/ServiceAndDevelopment/index.vue b/src/views/ServiceAndDevelopment/index.vue index 3f23398..b2d25d0 100644 --- a/src/views/ServiceAndDevelopment/index.vue +++ b/src/views/ServiceAndDevelopment/index.vue @@ -36,7 +36,7 @@ 预览 保存 - 导出 + 导出 @@ -45,7 +45,7 @@
模板指标自定义选择
年份： - +
@@ -100,7 +100,7 @@ import { saveAs } from 'file-saver' import { getToken } from '@/utils/auth' import { blobValidate } from "@/utils/ruoyi"; import errorCode from '@/utils/errorCode' -import { templateMetrics, templateMetricsAdd } from "@/api/jin_ji_hu/ServiceDevelopment/index" +import { templateMetrics, templateMetricsAdd, getId } from "@/api/jin_ji_hu/ServiceDevelopment/index" import axios from 'axios' export default { name: '', @@ -136,8 +136,6 @@ export default { content: "

一、总体实力显著增强

产业规模高速增长，综合贡献明显提升。

近年来,园区服务业保持持续增长态势,截至目前,园区服务业规上企业总计 677 家。2021年,园区实现服务业增加值 1674.4亿元，占GDP 比重达 50.3%。2022年全年，实现服务业增加值1753.18亿元，占 GDP 比重49.9%。2023年1-3月，实现服务业增加值 405.95亿元，同比增加4.2%。7大服务业核算行业(①多式联运和运输代理业、②装卸报运和仓储业、③互联网和相关服务、软件信息服务业、④租赁和商务服务业、(5居民服务、修理和其他服务业、⑥文化、体育和娱乐业、⑦科学研究和技术服务业)2022年全年营股1311.71亿元，增速达22%:2023年1-3月实现营收 348.34亿元，同比增速 35%。根据苏州市新兴服务业行业分类(含金融服务、信息服务、物流服务、科技服务、商务中介服务、设计服务、人力资源服务、检验栓测认证、低碳绿色服务、现代商贸、文化消费、旅游康养等 12个类别)，2022年国区新兴服务业营收达 1488.57 亿元，较上年增长 24%。

二、产业结构持续优化

产业结构还步优化，生产性服务占主导。经过多年发展，园区服务业产业结构逐渐多样化，生产性服务业与生活性服务业基本形成7:3的格局。2022年，生产性服务业增加值达到1199.5亿元，占服务业增加值比重达68.筑。截至目前，园区生产性服务业规上企业总计 655家(含部分工业企业)。自 2019年苏州市开展全市生产恒服务业综合译价以来，园区已连续两年考评优秀。37家国区企业入选苏州市生产性服务业领军企业，占全市51%，位全市第一，并成为苏州首个实现生产性服务业9大重点领域(信息技术服务、研发设计、金融服务、检验检测认证、知识产权服务、节能环保服务、人力资源服务、现代供应蛙管理、商务服务)全度盖的区域。推动先进制造业和现代服务业深度融合发展，2022年初，园区获评江苏省两业融合深度融合试点地区。

城市活力不断提升，生活性服务显潜能。完成环金鸡湖商圈城市活力提升规划并正式发布，引导环金鸡湖商圈核心商业体差异定位、错位发展，金鸡湖景区获评第一批省级现代服务业高质量发展集聚示范区。积极引入北京及上海周边外溢资源，推动园区载体与国内优质品牌对接，加快发展“首店经济”(首店经济是指一个区域利用特有的资源优势，吸引国内外品牌在区域首次开设门店，目前国区大力推动“中国首店”“苏州首店”落户园区)。通过开展“云购金鸡湖”等活动，持续打造金鸡湖系列 IP，宣传园区特色消费场景，在后疫情时代不断激发生活性服务业发展能。

", infoVisible:false, isDisabled:true, - // 导出遮罩层 - exportLoading: false, } }, watch:{ @@ -161,6 +159,7 @@ export default { let year = date.getFullYear(); this.nianfenvalue3 = year + '' this.getList(); + this.getEditinfo(); }, methods: { getText(str){ @@ -175,7 +174,9 @@ export default { // 插入 charu(item){ // console.log(item); - this.$refs.myEditor.interposition(item.count) + if(item.count != "-") { + this.$refs.myEditor.interposition(item.count) + } // 在选区插入文本 : editor.insertText('xxx') editor.dangerouslyInsertHtml(`

标题

文本 加粗

`) }, // 底部按钮 @@ -216,35 +217,29 @@ export default { cancelButtonText: "取消", type: "warning", }) - /** - * - * { - ...this.formInline - }, - */ .then(() => { - this.exportLoading = true; + this.loading = true; axios({ - method: 'get', - url: this.VUE_APP_BASE_API + "/jjh/templateMetrics/downloadLocal", + method: 'post', + url: this.VUE_APP_BASE_API + "/jjh/templateMetrics/downloadTemplate", + data: this.addFrom, responseType: 'blob', headers: { 'Authorization': 'Bearer ' + getToken() } }).then((res) => { - console.log(res); const isBlob = blobValidate(res.data); if (isBlob) { const blob = new Blob([res.data]) - saveAs(blob, decodeURIComponent(res.headers['download-filename'])) + saveAs(blob, ("发展模板" + new Date().getTime() + ".docx")) } else { this.printErrMsg(res.data); } }) // this.download( - // "/jjh/templateMetrics/downloadLocal", - + // "/jjh/templateMetrics/downloadTemplate", + // {...this.addFrom}, // "发展模板" + new Date().getTime() + ".xlsx" // ); - this.exportLoading = false; + this.loading = false; }) .catch((err) => { console.log(err); @@ -265,10 +260,15 @@ export default { }, // 查询模板指标自定义选择 getList(){ - templateMetrics({year:this.nianfenvalue3}).then(res=>{ + templateMetrics(this.nianfenvalue3).then(res=>{ this.tableData = res.data; }) }, + getEditinfo(){ + getId().then(res=>{ + this.addFrom = res.data + }) + }, // 选择年份变化 timeChange(time){ this.getList() diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue new file mode 100644 index 0000000..52cf8f2 --- /dev/null +++ b/src/views/abnormalRemind/index.vue @@ -0,0 +1,249 @@ + + + + diff --git a/src/views/components/myEditor/index.vue b/src/views/components/myEditor/index.vue index 799b040..c937375 100644 --- a/src/views/components/myEditor/index.vue +++ b/src/views/components/myEditor/index.vue @@ -43,6 +43,7 @@ export default { editorConfig: { placeholder: '请输入内容...', autoFocus:false, // 配置编辑器默认是否 focus ，默认为 true + backColor: "red", MENU_CONF: { uploadImage:{ // 上传图片配置 @@ -98,7 +99,7 @@ export default { this.$nextTick(()=>{ const toolbar = DomEditor.getToolbar(editor) const curToolbarConfig = toolbar.getConfig() - // console.log( curToolbarConfig.toolbarKeys ) // 当前菜单排序和分组 + console.log( curToolbarConfig.toolbarKeys ) // 当前菜单排序和分组 }) }, onChange(editor){ @@ -112,7 +113,7 @@ export default { }, // 光标处插入数据 interposition(value){ - this.editor.dangerouslyInsertHtml(`${value}`) + this.editor.dangerouslyInsertHtml(`${value}`) }, onBlur(){ this.$emit('onBlur'); diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue index ae37228..6ad2c7a 100644 --- a/src/views/dataCloudMap/index.vue +++ b/src/views/dataCloudMap/index.vue @@ -10,7 +10,7 @@ 服务业发展总览
- 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
@@ -38,7 +38,7 @@ 行业纵深情况
- 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
查看更多数据>>
@@ -91,7 +91,7 @@ 企业情况 - 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
@@ -205,7 +205,7 @@ 荣誉情况
- 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
查看更多数据>>
diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue index 22ec490..893c66d 100644 --- a/src/views/enterpriselibrary/enterInfo/index.vue +++ b/src/views/enterpriselibrary/enterInfo/index.vue @@ -128,7 +128,8 @@ export default { return { // 判断登陆用户是何身份⌈ 01 ： 企业 02 ： 政务 ⌋ userType: this.$store.state.user.userType, - tabs:[ + tabs:[], + govTabs:[ { name: "基本信息", },{ @@ -139,6 +140,15 @@ export default { name: "备忘录", }, ], + entTabs:[ + { + name: "基本信息", + },{ + name: "联络人列表", + },{ + name: "项目清单", + }, + ], active: 0, info:{}, detailedInfo:{}, @@ -204,8 +214,10 @@ export default { }, mounted(){ if(this.userType == '02') { + this.tabs = this.govTabs this.getInfo(this.$route.query.userId) } else { + this.tabs = this.entTabs this.getInfo(this.$store.state.user.enterpriseId) } this.cancalDebounce(); diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 6278604..ff085c4 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -108,7 +108,7 @@
智能提醒
- >> 更多记录 + >> 更多记录
@@ -167,7 +167,7 @@
待办任务
- >> 更多记录 + >> 更多记录
@@ -175,7 +175,7 @@
{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : "") }}
-
{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}
+
{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}
@@ -309,8 +309,14 @@ export default { }, // 企业端智能提醒 entRemind(){ - enterpriseAll().then(res=>{ - this.remindList = res.data; + enterpriseAll({current:1,size:20}).then(res=>{ + this.remindList = res.data.records; + }) + }, + // 智能提醒跳转 + enterjump(){ + this.$router.push({ + name: 'WarningReminder', }) }, // 智能提醒去查看并修改状态 @@ -335,25 +341,24 @@ export default { this.info = item; } }, + // 更多记录待办任务 + enterjumpTask(){ + this.$router.push({ + name: 'AbnormalRemind', + }) + }, // 更多记录 - MoreRecords(type,status){ - if(type == 'all') { + MoreRecords(status){ + if(status == 0 || status == 10) { this.$router.push({ name: 'Records', - params: { statusChange: "" } + params: { statusChange: "0" } }) } else { - if(status == 0 || status == 10) { - this.$router.push({ - name: 'Records', - params: { statusChange: "0" } - }) - } else { - this.$router.push({ - name: 'Records', - params: { statusChange: "1" } - }) - } + this.$router.push({ + name: 'Records', + params: { statusChange: "1" } + }) } }, // 屏幕尺寸变化 diff --git a/src/views/login_v1.vue b/src/views/login_v1.vue new file mode 100644 index 0000000..2e3ce46 --- /dev/null +++ b/src/views/login_v1.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/src/views/warningReminder/index.vue b/src/views/warningReminder/index.vue new file mode 100644 index 0000000..caeea2f --- /dev/null +++ b/src/views/warningReminder/index.vue @@ -0,0 +1,153 @@ + + + + diff --git a/src/views/workbench/components/daibanrenwu/index.vue b/src/views/workbench/components/daibanrenwu/index.vue index c6aa31d..77aa106 100644 --- a/src/views/workbench/components/daibanrenwu/index.vue +++ b/src/views/workbench/components/daibanrenwu/index.vue @@ -73,21 +73,17 @@ export default { formInline:{ alertContent:"", tyshxydm:"", - servicesType: null, }, pagination: { pageNum:1, pageSize:10, }, total:40, - servicesType:null, } }, methods:{ open(title){ this.infoVisible = true; - this.servicesType = title; - this.formInline.servicesType = title; this.pagination = { pageNum: 1, pageSize: 10 @@ -102,8 +98,7 @@ export default { this.loading = true; approvalList(this.pagination).then(res=>{ this.tableData = res.rows - console.log(this.tableData); - this.total = res.rows.length; + this.total = res.rows.total; this.loading = false; }) }, @@ -122,7 +117,6 @@ export default { this.formInline = { alertContent:"", tyshxydm:"", - servicesType: this.servicesType, }, this.getList(); }, diff --git a/src/views/workbench/components/zhinengtixing/index.vue b/src/views/workbench/components/zhinengtixing/index.vue index b2181c6..ec545ad 100644 --- a/src/views/workbench/components/zhinengtixing/index.vue +++ b/src/views/workbench/components/zhinengtixing/index.vue @@ -71,21 +71,17 @@ export default { formInline:{ alertContent:"", tyshxydm:"", - servicesType: null, }, pagination: { current:1, size:10, }, total:40, - servicesType:null, } }, methods:{ open(title){ this.infoVisible = true; - this.servicesType = title; - this.formInline.servicesType = title; this.pagination = { current: 1, size: 10 @@ -98,10 +94,10 @@ export default { }, getList(){ this.loading = true; - chiefAll().then(res=>{ + chiefAll(this.pagination).then(res=>{ this.loading = false; - this.total = res.data.length; - this.tableData = res.data + this.total = res.data.total; + this.tableData = res.data.chiefAll }) // servicesList(this.pagination).then(res=>{ // this.loading = false; @@ -124,7 +120,6 @@ export default { this.formInline = { alertContent:"", tyshxydm:"", - servicesType: this.servicesType, }, this.getList(); }, diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 24645ce..8c8234a 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -36,7 +36,7 @@ 服务业发展总览
- 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
@@ -251,7 +251,7 @@
02. 行业纵深情况
- 【统计数据截至：{{ time }}】 + 【统计数据截至：2024-01】
查看更多数据>>
@@ -339,8 +339,8 @@ export default { search:"", backlogArray:[], pagination: { - pageNum:1, - pageSize:10, + current:1, + size:20, approvalStatusStr: 0, }, // 是否显示弹出层 @@ -411,8 +411,8 @@ export default { }, // 政务端智能提醒 govRemind(){ - chiefAll().then(res=>{ - this.remindList = res.data; + chiefAll({current:1,size:20}).then(res=>{ + this.remindList = res.data.records; }) }, // 智能提醒去查看并修改状态