Skip to content

G
GaoQuIncubator
Commit cd6c01a7 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

master代码同步、dp字体样式调整

parents fd8d4144 406ede5b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 1092 deletions
src/api/system/overview.js
View file @ cd6c01a7
...@@ -5,13 +5,13 @@ export function getData4panel4(data) { // 导师信息 ...@@ -5,13 +5,13 @@ export function getData4panel4(data) { // 导师信息
return request({ return request({
url: 'api/mentor', url: 'api/mentor',
method: 'get', method: 'get',
params:data, params: data,
}) })
} }
export function getData4panel0(data) { // 孵化器概况信息 export function getData4panel0(data) { // 孵化器概况信息
return request({ return request({
url: 'api/incubator/profile?incubatorId='+data.incubatorId, url: 'api/incubator/profile?incubatorId=' + data.incubatorId,
method: 'get', method: 'get',
}) })
} }
...@@ -20,10 +20,43 @@ export function getDialogData4panel0(data) { // 孵化器概况信息 ...@@ -20,10 +20,43 @@ export function getDialogData4panel0(data) { // 孵化器概况信息
return request({ return request({
url: 'api/incubatorRevenue', url: 'api/incubatorRevenue',
method: 'get', method: 'get',
params:data, params: data,
}) })
} }
export function getData4enterprise(data) {
return request({
url: 'api/company/companyName/list',
method: 'get',
params: data
})
}
export function getData4enterpriseDetail(data) {
return request({
url: 'api/company/web/details',
method: 'get',
params: data
})
}
export function getDialogData4panel1_2(data) {
return request({
url: 'api/companyAnnualInfo',
method: 'get',
params: data
})
}
export function getDialogData4panel1_3(data) {
return request({
url: 'api/companyProduct',
method: 'get',
params: data
})
}
export function getData4tech(data) { export function getData4tech(data) {
return request({ return request({
...@@ -64,5 +97,7 @@ export function editUser(data) { ...@@ -64,5 +97,7 @@ export function editUser(data) {
} }
export default { getData4panel0, getDialogData4panel0, getData4panel4, getData4tech, add, edit, del } export default { getData4panel0, getDialogData4panel0, getData4panel4, getData4enterprise,
getData4enterpriseDetail, getDialogData4panel1_2, getDialogData4panel1_3,
getData4tech, add, edit, del }
src/assets/js/common.js
View file @ cd6c01a7
var Tools = function(){ var Tools = function(){
var isHighTech = function(){
return ~~localStorage.getItem('groupIdByloginType')===2
};
// 日期时间工具 // 日期时间工具
var Dates = function(){ var Dates = function(){
/* /*
...@@ -453,6 +455,7 @@ var Tools = function(){ ...@@ -453,6 +455,7 @@ var Tools = function(){
Dates:Dates(), arrayJsonToJson, Dates:Dates(), arrayJsonToJson,
asyncLoop, checkbox, fileElTobase64, asyncLoop, checkbox, fileElTobase64,
createOnSelect, cuPrint, downloadFile, createOnSelect, cuPrint, downloadFile,
isHighTech,
} }
}; };
......
src/assets/js/httpApi.js
View file @ cd6c01a7
...@@ -488,7 +488,7 @@ var reqApis = function(){ ...@@ -488,7 +488,7 @@ var reqApis = function(){
name: '孵化器管理', name: '孵化器管理',
Dict: { Dict: {
baseInfo: { baseInfo: {
// "incubatorId": {name:"孵化器名称", must:true, 'type':'select', val:'id', key:'name',}, "incubatorId": {name:"孵化器名称", must:true, 'type':'select', val:'id', key:'name', showYN: Tools.isHighTech()},
"year": { "year": {
name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy' name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy'
}, },
...@@ -539,11 +539,11 @@ var reqApis = function(){ ...@@ -539,11 +539,11 @@ var reqApis = function(){
rightBtn: [ rightBtn: [
], ],
search: [ search: [
// { {
// 'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () { 'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', showYN: Tools.isHighTech(), 'clear': function () {
// this.loadData() this.loadData()
// } }
// }, },
{ {
'type': 'date', 'datetype':'year','defaultTime': ['2024'], 'name': '年度', 'word': 'year', 'mode': 0, 'width':'140px', 'type': 'date', 'datetype':'year','defaultTime': ['2024'], 'name': '年度', 'word': 'year', 'mode': 0, 'width':'140px',
'change': function(a, b){ 'change': function(a, b){
...@@ -566,7 +566,7 @@ var reqApis = function(){ ...@@ -566,7 +566,7 @@ var reqApis = function(){
Dict: { Dict: {
baseInfo: { baseInfo: {
"companyName": {name:"企业名称", must:true }, "companyName": {name:"企业名称", must:true },
// "incubatorId": {name:"所属孵化器", must:true, table:0, 'type':'select', key:'name', }, "incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
"technicalField": {name:"所属技术领域", must:true, 'type':'select', key:'name', }, "technicalField": {name:"所属技术领域", must:true, 'type':'select', key:'name', },
"entryDate": { "entryDate": {
...@@ -664,18 +664,18 @@ var reqApis = function(){ ...@@ -664,18 +664,18 @@ var reqApis = function(){
"softwareCopyrightNumber": { 'type': '', 'name': '软件著作权数（件）', table:0, }, "softwareCopyrightNumber": { 'type': '', 'name': '软件著作权数（件）', table:0, },
"isTechSme": { 'type': 'select', 'name': '是否科技型中小企业', table:0, }, "isTechSme": { 'type': 'select', 'name': '是否科技型中小企业', table:0, },
"techSmeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "techSmeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
"isHighGrowthInnovative": { 'type': 'select', 'name': '是否创新性中小企业', table:0, },
"highGrowthInnovativeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,},
"isHighTech": { 'type': 'select', 'name': '是否高新技术企业', table:0, }, "isHighTech": { 'type': 'select', 'name': '是否高新技术企业', table:0, },
"highTechDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "highTechDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
"isAdvancedTechService": { 'type': 'select', 'name': '是否技术先进型服务企业', table:0, }, "isSpecializedSpecialEnterprises": { 'type': 'select', 'name': '是否专精特新企业', table:0, },
"advancedTechServiceDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "specializedSpecialEnterprisesDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
"isGazelle": { 'type': 'select', 'name': '是否瞪羚企业', table:0, }, "isGazelle": { 'type': 'select', 'name': '是否瞪羚企业', table:0, },
"gazelleDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "gazelleDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
"isLittleGiant": { 'type': 'select', 'name': '是否小巨人企业', table:0, }, "isLittleGiant": { 'type': 'select', 'name': '是否小巨人企业', table:0, },
"littleGiantDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "littleGiantDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
"isSpecializedSpecialEnterprises": { 'type': 'select', 'name': '是否专精特新企业', table:0, }, "isHighGrowthInnovative": { 'type': 'select', 'name': '是否创新性中小企业', table:0, },
"specializedSpecialEnterprisesDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, }, "highGrowthInnovativeDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7,},
"isAdvancedTechService": { 'type': 'select', 'name': '是否技术先进型服务企业', table:0, },
"advancedTechServiceDate": { 'type': 'date', 'name': '最新评选日期', table:0, mode:7, },
...@@ -775,7 +775,7 @@ var reqApis = function(){ ...@@ -775,7 +775,7 @@ var reqApis = function(){
} }
}, },
{ {
type: 'primary', icon: 'el-icon-folder-add', name: '导入企业基础信息', 'callback':function(){ type: 'primary', icon: 'el-icon-folder-add', name: '导入企业基础信息', showYN: !Tools.isHighTech(), 'callback':function(){
var m = this; var m = this;
m.uploadView = qf.UI.popWindow({ m.uploadView = qf.UI.popWindow({
cover:true, cover:true,
...@@ -855,7 +855,7 @@ var reqApis = function(){ ...@@ -855,7 +855,7 @@ var reqApis = function(){
} }
}, },
{ {
type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', 'callback':function(){ type: 'primary', icon: 'el-icon-folder-add', name: '导入企业经营信息', showYN: !Tools.isHighTech(), 'callback':function(){
var m = this; var m = this;
m.uploadView = qf.UI.popWindow({ m.uploadView = qf.UI.popWindow({
cover:true, cover:true,
...@@ -954,6 +954,11 @@ var reqApis = function(){ ...@@ -954,6 +954,11 @@ var reqApis = function(){
this.loadData() this.loadData()
} }
}, },
{
'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', showYN: Tools.isHighTech(), 'clear': function () {
this.loadData()
}
},
{ 'type': 'select', 'name': '在孵状态', 'word': 'incubationStatus', 'mode': 1, 'width': '140px' }, { 'type': 'select', 'name': '在孵状态', 'word': 'incubationStatus', 'mode': 1, 'width': '140px' },
{ 'type': 'select', 'name': '企业类型', 'word': 'companyType', 'mode': 1, 'width': '140px' }, { 'type': 'select', 'name': '企业类型', 'word': 'companyType', 'mode': 1, 'width': '140px' },
{ 'type': 'select', 'name': '企业级别', 'word': 'companyLevel', 'mode': 1, 'width': '140px' }, { 'type': 'select', 'name': '企业级别', 'word': 'companyLevel', 'mode': 1, 'width': '140px' },
...@@ -1155,6 +1160,7 @@ var reqApis = function(){ ...@@ -1155,6 +1160,7 @@ var reqApis = function(){
Dict: { Dict: {
baseInfo: { baseInfo: {
"mentorName": {name:"导师姓名", must:true}, "mentorName": {name:"导师姓名", must:true},
"incubatorId": {name:"所属孵化器", must:true, 'type':'select', key:'name', showYN: Tools.isHighTech()},
"education": {name:"学历", must:true }, "education": {name:"学历", must:true },
"graduationSchool": {name:"毕业学校", }, "graduationSchool": {name:"毕业学校", },
"contactPhone": {name:"联系电话", }, "contactPhone": {name:"联系电话", },
...@@ -1184,10 +1190,17 @@ var reqApis = function(){ ...@@ -1184,10 +1190,17 @@ var reqApis = function(){
}, },
selectList: { selectList: {
incubatorId: function () { incubatorId: function () {
return reqPublic('/api/incubator/list', 'get', {}).then(function (res) { var slist = this.selectList;
return res.body || []; return reqPublic('api/company/dic', 'get', {}).then(function (res) {
var body = res.body || {};
for (var key in body) {
var val = body[key];
slist[key] = val
}; return body.incubatorId;
}); });
}, },
}, },
}, },
config: { config: {
...@@ -1223,6 +1236,11 @@ var reqApis = function(){ ...@@ -1223,6 +1236,11 @@ var reqApis = function(){
this.loadData() this.loadData()
} }
}, },
{
'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', showYN: Tools.isHighTech(), 'clear': function () {
this.loadData()
}
},
{ 'type': 'daterange', 'defaultTime': ['00:00:00', '23:59:59'], 'name': '日期范围', 'word': 'daterange', 'mode': 0, 'width': '300px', format: 'yyyy-MM-dd' }, { 'type': 'daterange', 'defaultTime': ['00:00:00', '23:59:59'], 'name': '日期范围', 'word': 'daterange', 'mode': 0, 'width': '300px', format: 'yyyy-MM-dd' },
{ {
'type': 'button', 'label': '查询', 'width': '140px', 'icon': 'el-icon-search', 'click': function (e) { 'type': 'button', 'label': '查询', 'width': '140px', 'icon': 'el-icon-search', 'click': function (e) {
......
src/components/TableFilter/index2.vue
View file @ cd6c01a7
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container" v-if="form.config.search && form.config.search[0]"> <div class="head-container" v-if="form.config.search && form.config.search[0]">
<!-- 搜索 --> <!-- 搜索 -->
<template v-for="(item, index) in form.config.search"> <template v-for="(item, index) in form.config.search" v-if="item.showYN !==false">
<label v-if="item.name && item.showLabel" class="el-form-item-label">{{item.name}}</label> <label v-if="item.name && item.showLabel" class="el-form-item-label">{{item.name}}</label>
<template v-if="item.type==='string'"> <template v-if="item.type==='string'">
<el-input v-model="form.query[item.word]" clearable :placeholder="item.name" :style="'width:'+item.width" @clear="item.clear && item.clear.call(_self.$parent)"/> <el-input v-model="form.query[item.word]" clearable :placeholder="item.name" :style="'width:'+item.width" @clear="item.clear && item.clear.call(_self.$parent)"/>
......
src/components/cuForm/index2.vue
View file @ cd6c01a7
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<template> <template>
<el-dialog id="printJS-form" class="qyzz-dialog" append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" :width="form.config.formWidth || '50%'"> <el-dialog id="printJS-form" class="qyzz-dialog" append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" :width="form.config.formWidth || '50%'">
<el-form :model="form.item" :rules="rules" :ref="ref" :inline="true" size="small" :label-width="(form.config.labelWidth || 80) + 'px'"> <el-form :model="form.item" :rules="rules" :ref="ref" :inline="true" size="small" :label-width="(form.config.labelWidth || 80) + 'px'">
<el-form-item v-for="(item, key) in Dict.baseInfo" :prop="item.rule || key" :label="item.name" v-if="item.form !== 0" :style="item.style" :class="{'isHide': item.mode===7, [key]: item.mode===7}" :ref="key"> <el-form-item v-for="(item, key) in Dict.baseInfo" :prop="item.rule || key" :label="item.name" v-if="item.form !== 0 && item.showYN !==false" :style="item.style" :class="{'isHide': item.mode===7, [key]: item.mode===7}" :ref="key">
<template v-if="item.type === 'img'"> <template v-if="item.type === 'img'">
<div class="img-upload"> <div class="img-upload">
<label class="upload-area" for="imgUpload"> <label class="upload-area" for="imgUpload">
......
src/components/cuTable/index2.vue
View file @ cd6c01a7
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="content cu-table"> <div class="content cu-table">
<!-- :style="'width:'+ (item.fixed ? '400px' : 'auto') +" --> <!-- :style="'width:'+ (item.fixed ? '400px' : 'auto') +" -->
<el-table :data="table.dataList" v-loading="table.loading" border style="width: 100%;" :row-class-name="tableRowClassName"> <el-table :data="table.dataList" v-loading="table.loading" border style="width: 100%;" :row-class-name="tableRowClassName">
<template v-for="(item, key) in Dict.baseInfo" v-if="item.table !== 0"> <template v-for="(item, key) in Dict.baseInfo" v-if="item.table !== 0 && item.showYN !==false" >
<el-table-column v-if="item.type === 'select'" :prop="key" :label="item.name" :fixed="fixed" :width="item.width||'200px'"> <el-table-column v-if="item.type === 'select'" :prop="key" :label="item.name" :fixed="fixed" :width="item.width||'200px'">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="sitem in Dict.selectList[key]"> <template v-for="sitem in Dict.selectList[key]">
......
src/views/Screen/index.vue
View file @ cd6c01a7
...@@ -107,9 +107,29 @@ import { Highchart } from "@/assets/js/chartTemplates.js"; ...@@ -107,9 +107,29 @@ import { Highchart } from "@/assets/js/chartTemplates.js";
import cuAmap from "@/components/AMap"; import cuAmap from "@/components/AMap";
import request from "@/utils/request"; import request from "@/utils/request";
// function isTechUser(){
// return localStorage.getItem('groupIdByloginType')*1===2 // 是否为科技局用户 // let resizeTimeout;
// window.addEventListener('resize', function() {
// clearTimeout(resizeTimeout);
// resizeTimeout = setTimeout(function() {
// location.reload();
// // 执行响应逻辑
// }, 200); // 200毫秒后执行
// });
// function getPxByRem(remValue){// 传入要转换的 rem 值
// // 获取 html 元素
// const htmlElement = document.documentElement;
// // 获取 html 元素的 font-size
// const fontSize = parseFloat(getComputedStyle(htmlElement).fontSize);
// // 将 rem 转换为 px
// let pxValue = remValue * fontSize;
// return pxValue
// } // }
export default { export default {
data() { data() {
return { return {
...@@ -224,7 +244,7 @@ export default { ...@@ -224,7 +244,7 @@ export default {
}, },
showInfoWindow(marker, item) { showInfoWindow(marker, item) {
const content = `<div class="popupBgImage" style=""> const content = `<div class="popupBgImage" style="">
<h4>详细信息</h4><i id="closeInfoWindowBtn"></i> <h4>详细信息</h4><i id="closeInfoWindowBtn" style="cursor:pointer;"></i>
<dl> <dl>
<dd class="textEllipsis"><font>孵化器名称：</font><span :title="${ <dd class="textEllipsis"><font>孵化器名称：</font><span :title="${
item.incubatorName item.incubatorName
...@@ -286,11 +306,11 @@ export default { ...@@ -286,11 +306,11 @@ export default {
labels: { labels: {
x: -5, x: -5,
style: { style: {
fontSize: "0.17rem", fontSize: "0.14rem",
}, },
formatter: function () { formatter: function () {
return this.value.length > 5 return this.value.length > 5
? this.value.substring(0, 5) + "..." ? this.value.substring(0, 7)
: this.value; : this.value;
}, },
}, },
...@@ -324,6 +344,7 @@ export default { ...@@ -324,6 +344,7 @@ export default {
overflow: "justify", overflow: "justify",
style: { style: {
fontSize: "0.18rem", // 设置 Y 轴标签的字体大小 fontSize: "0.18rem", // 设置 Y 轴标签的字体大小
color: '#00F0FF',
}, },
}, },
}, },
...@@ -568,82 +589,82 @@ export default { ...@@ -568,82 +589,82 @@ export default {
method: "get", method: "get",
}).then((res) => { }).then((res) => {
let list = res.body || []; let list = res.body || [];
list = { // list = {
names: [ // names: [
{ // {
name: "上缴税费", // name: "上缴税费",
key: "num", // key: "num",
}, // },
], // ],
list: [ // list: [
{ // {
date: "2021年", // date: "2021年111",
values: { // values: {
num: 100, // num: 100,
}, // },
}, // },
{ // {
date: "2023年", // date: "2023年",
values: { // values: {
num: 41, // num: 41,
}, // },
}, // },
{ // {
date: "2024年", // date: "2024年",
values: { // values: {
num: 533, // num: 533,
}, // },
}, // },
{ // {
date: "2025年", // date: "2025年",
values: { // values: {
num: 303, // num: 303,
}, // },
}, // },
{ // {
date: "2026年", // date: "2026年",
values: { // values: {
num: 306, // num: 306,
}, // },
}, // },
{ // {
date: "2027年", // date: "2027年",
values: { // values: {
num: 309, // num: 309,
}, // },
}, // },
{ // {
date: "2028年", // date: "2028年",
values: { // values: {
num: 312, // num: 312,
}, // },
}, // },
{ // {
date: "2029年", // date: "2029年",
values: { // values: {
num: 315, // num: 315,
}, // },
}, // },
{ // {
date: "2030年", // date: "2030年",
values: { // values: {
num: 318, // num: 318,
}, // },
}, // },
{ // {
date: "2031年", // date: "2031年",
values: { // values: {
num: 321, // num: 321,
}, // },
}, // },
{ // {
date: "2032年", // date: "2032年",
values: { // values: {
num: 324, // num: 324,
}, // },
}, // },
], // ],
}; // };
var chartData = Highchart.seriesDataFormat(list, { var chartData = Highchart.seriesDataFormat(list, {
datekey: "date", datekey: "date",
dataReverse: true, dataReverse: true,
...@@ -677,7 +698,7 @@ export default { ...@@ -677,7 +698,7 @@ export default {
// tickLength: 0, // 不显示刻度线 // tickLength: 0, // 不显示刻度线
gridLineWidth: 0, // 也可以设置不显示网格线 gridLineWidth: 0, // 也可以设置不显示网格线
title: { title: {
text: "(万元)", text: "万元",
margin: 0, margin: 0,
style: { style: {
color: "#eee", color: "#eee",
...@@ -1367,8 +1388,8 @@ export default { ...@@ -1367,8 +1388,8 @@ export default {
font { font {
font-size: 0.45rem; font-size: 0.45rem;
font-family: diget year; font-family: diget year;
margin-top: 0.15rem; // margin-top: 0.15rem;
line-height: 0.23rem; line-height: 0.33rem;
background-image: -webkit-linear-gradient( background-image: -webkit-linear-gradient(
top, top,
#fff, #fff,
...@@ -1376,7 +1397,7 @@ export default { ...@@ -1376,7 +1397,7 @@ export default {
#ffea98 #ffea98
); );
-webkit-background-clip: text; -webkit-background-clip: text;
// -webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
} }
} }
li:nth-child(1) { li:nth-child(1) {
...@@ -1723,7 +1744,7 @@ export default { ...@@ -1723,7 +1744,7 @@ export default {
white-space: nowrap; /* 不换行 */ white-space: nowrap; /* 不换行 */
overflow: hidden; /* 超出隐藏 */ overflow: hidden; /* 超出隐藏 */
text-overflow: ellipsis; /* 添加省略号 */ text-overflow: ellipsis; /* 添加省略号 */
width: 320px; /* 设置宽度 */ width: 3.2rem; /* 设置宽度 */
} }
button { button {
width: 1.5rem; width: 1.5rem;
......
src/views/business/basicInfo/index.vue
View file @ cd6c01a7
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<el-button type="text" style="font-size: 18px;">公司数：{{ table.total }}</el-button> <el-button type="text" style="font-size: 18px;">公司数：{{ table.total }}</el-button>
<el-button <el-button
v-for="(item, key) in form.config.otherBtn" v-for="(item, key) in form.config.otherBtn"
v-show="item.name==='添加企业' || showYN"
size="mini" size="mini"
:type="item.type" :type="item.type"
:icon="item.icon" :icon="item.icon"
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
<!-- <el-button type="primary" size="mini" icon="el-icon-upload" @click="dialogVisible=true">导入企业基础信息</el-button> <!-- <el-button type="primary" size="mini" icon="el-icon-upload" @click="dialogVisible=true">导入企业基础信息</el-button>
<el-button type="primary" size="mini" icon="el-icon-upload">导入企业经营信息</el-button> --> <el-button type="primary" size="mini" icon="el-icon-upload">导入企业经营信息</el-button> -->
</div> </div>
<div> <div v-if="showYN">
<el-button <el-button
v-for="(item, key) in form.config.rightBtn" v-for="(item, key) in form.config.rightBtn"
size="mini" size="mini"
...@@ -179,7 +180,7 @@ import { Tools } from "@/assets/js/common.js"; ...@@ -179,7 +180,7 @@ import { Tools } from "@/assets/js/common.js";
import DateRangePicker from "@/components/DateRangePicker"; import DateRangePicker from "@/components/DateRangePicker";
import TableFilter from "@/components/TableFilter/index2"; import TableFilter from "@/components/TableFilter/index2";
import cuForm from "@/components/cuForm/index2"; import cuForm from "@/components/cuForm/index2";
import cuTable from "@/components/cuTable"; import cuTable from "@/components/cuTable/index2";
export default { export default {
name: "Dashboard", name: "Dashboard",
...@@ -191,6 +192,7 @@ export default { ...@@ -191,6 +192,7 @@ export default {
}, },
data() { data() {
return { return {
showYN: !Tools.isHighTech(),
dialogVisible: false, dialogVisible: false,
uploadError: '', uploadError: '',
hasBasicInfo: false, hasBasicInfo: false,
......
src/views/business/common/index.vue
View file @ cd6c01a7
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
import { reqApi, Config } from '@/assets/js/httpApi.js'; import { reqApi, Config } from '@/assets/js/httpApi.js';
import { Tools } from '@/assets/js/common.js'; import { Tools } from '@/assets/js/common.js';
import DateRangePicker from '@/components/DateRangePicker'; import DateRangePicker from '@/components/DateRangePicker';
import TableFilter from '@/components/TableFilter'; import TableFilter from '@/components/TableFilter/index2';
import cuForm from '@/components/cuForm'; import cuForm from '@/components/cuForm/index2';
import cuTable from '@/components/cuTable'; import cuTable from '@/components/cuTable/index2';
export default { export default {
name: 'Dashboard', name: 'Dashboard',
......
src/views/business/income/index.vue
View file @ cd6c01a7
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
import { reqApi, Config } from '@/assets/js/httpApi.js'; import { reqApi, Config } from '@/assets/js/httpApi.js';
import { Tools } from '@/assets/js/common.js'; import { Tools } from '@/assets/js/common.js';
import DateRangePicker from '@/components/DateRangePicker'; import DateRangePicker from '@/components/DateRangePicker';
import TableFilter from '@/components/TableFilter'; import TableFilter from '@/components/TableFilter/index2';
import cuForm from '@/components/cuForm'; import cuForm from '@/components/cuForm/index2';
import cuTable from '@/components/cuTable'; import cuTable from '@/components/cuTable/index2';
export default { export default {
name: 'Dashboard', name: 'Dashboard',
......
src/views/system/home/enterprise.vue
View file @ cd6c01a7
...@@ -135,56 +135,17 @@ var baseAPI = ...@@ -135,56 +135,17 @@ var baseAPI =
? process.env.VUE_APP_LOCAL_API + "/" ? process.env.VUE_APP_LOCAL_API + "/"
: (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + "/"; : (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + "/";
import crudHome from "@/api/system/home"; import crudHome from "@/api/system/home";
import IconSelect from "@/components/IconSelect";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { LOAD_CHILDREN_OPTIONS } from "@riophae/vue-treeselect";
import CRUD, { presenter, header, form, crud } from "@crud/crud";
import rrOperation from "@crud/RR.operation";
import crudOperation from "@crud/CRUD.operation";
import udOperation from "@crud/UD.operation";
import DateRangePicker from "@/components/DateRangePicker";
import dic from "@/api/system/dict"; import dic from "@/api/system/dict";
import cuAmap from "@/components/AMap"; import cuAmap from "@/components/AMap";
// crud交由presenter持有
const defaultForm = {
id: null,
title: null,
menuSort: 999,
path: null,
component: null,
componentName: null,
iframe: false,
roles: [],
pid: 0,
icon: null,
cache: false,
hidden: false,
type: 0,
permission: null,
};
export default { export default {
name: "Menu", name: "Home",
components: { components: {
cuAmap, cuAmap,
Treeselect,
IconSelect,
crudOperation,
rrOperation,
udOperation,
DateRangePicker,
},
cruds() {
return CRUD({
title: "菜单",
url: "api/menus",
crudMethod: { ...crudHome },
});
}, },
mixins: [presenter(), header(), form(defaultForm), crud()],
data() { data() {
return { return {
baseAPI: baseAPI, baseAPI: baseAPI,
...@@ -192,6 +153,7 @@ export default { ...@@ -192,6 +153,7 @@ export default {
fileList: [], fileList: [],
cmap: null, cmap: null,
Dict: { selectList: [] }, Dict: { selectList: [] },
companyLevelList: [],
formInline: { formInline: {
address: "", address: "",
contactPerson: "", contactPerson: "",
...@@ -206,17 +168,6 @@ export default { ...@@ -206,17 +168,6 @@ export default {
operatingAgency: "", operatingAgency: "",
totalArea: "", totalArea: "",
}, },
menus: [],
permission: {
add: ["admin", "menu:add"],
edit: ["admin", "menu:edit"],
del: ["admin", "menu:del"],
},
rules: {
title: [{ required: true, message: "请输入标题", trigger: "blur" }],
path: [{ required: true, message: "请输入地址", trigger: "blur" }],
},
}; };
}, },
computed: { computed: {
...@@ -226,10 +177,6 @@ export default { ...@@ -226,10 +177,6 @@ export default {
}, },
mounted() { mounted() {
// this.getData(); // this.getData();
dic.getCompanyDicts().then((res) => {
console.log(res);
this.companyLevelList = res.body.incubatorLevel || [];
});
}, },
methods: { methods: {
handleSuccess(response, file) { handleSuccess(response, file) {
...@@ -291,30 +238,17 @@ export default { ...@@ -291,30 +238,17 @@ export default {
title: "", title: "",
draggable: true, draggable: true,
dragend: function (e) { dragend: function (e) {
// var lnglat = e.lnglat; VUE.getAddrPlus(e, cmap);
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// self.$forceUpdate();
// });
VUE.getAddrPlus(e, cmap)
}, },
}); });
} }
VUE.getData(function () {}); VUE.getData();
}, },
click: function (e, cmap) { click: function (e, cmap) {
// 经纬度坐标 // 经纬度坐标
VUE.getAddrPlus(e, cmap); VUE.getAddrPlus(e, cmap);
// var lnglat = e.lnglat;
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// });
cmap.marker && cmap.removeMarker(); cmap.marker && cmap.removeMarker();
// 添加标记 // 添加标记
...@@ -323,12 +257,6 @@ export default { ...@@ -323,12 +257,6 @@ export default {
title: "", title: "",
draggable: true, draggable: true,
dragend: function (e) { dragend: function (e) {
// var lnglat = e.lnglat;
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// });
VUE.getAddrPlus(e, cmap, form); VUE.getAddrPlus(e, cmap, form);
}, },
}); });
...@@ -349,7 +277,7 @@ export default { ...@@ -349,7 +277,7 @@ export default {
}); });
console.log(); console.log();
// 根据经纬度进行逆地理编码查询 // 根据经纬度进行逆地理编码查询
geocoder.getAddress([longitude, latitude], (status, result) => { geocoder.getAddress([longitude, latitude], (status, result) => {
if (status === "complete" && result.info === "OK") { if (status === "complete" && result.info === "OK") {
if (result.regeocode && result.regeocode.formattedAddress) { if (result.regeocode && result.regeocode.formattedAddress) {
let address = result.regeocode.formattedAddress; let address = result.regeocode.formattedAddress;
...@@ -372,27 +300,30 @@ export default { ...@@ -372,27 +300,30 @@ export default {
crudHome.edit(this.formInline).then((res) => { crudHome.edit(this.formInline).then((res) => {
if (res && res.code === 200) { if (res && res.code === 200) {
this.$message.success("保存成功"); // res.msg this.$message.success("保存成功"); // res.msg
this.getData() this.getData();
} }
}); });
}, },
getData(fn) { getData() {
crudHome.getData().then((res) => { crudHome.getData().then((res) => {
this.formInline = res.body; dic.getCompanyDicts().then((res1) => {
this.formInline.incubatorImage = res.body.incubatorImage; this.companyLevelList = res1.body.incubatorLevel || [];
const lat = this.formInline.latitude;
const lng = this.formInline.longitude; this.formInline = res.body;
// this.$refs.amap.init(amapOptions()); this.formInline.incubatorImage = res.body.incubatorImage;
const center = [lng, lat]; const lat = this.formInline.latitude;
// setTimeout(() => { const lng = this.formInline.longitude;
// 定位中心地址 // this.$refs.amap.init(amapOptions());
this.$refs.amap.setCenter(center); const center = [lng, lat];
console.log("map", this.cmap); // setTimeout(() => {
// 定位marker设置 // 定位中心地址
this.cmap.marker.setPosition(new AMap.LngLat(lng, lat)); this.$refs.amap.setCenter(center);
// }, 3000); console.log("map", this.cmap);
console.log(); // 定位marker设置
fn && fn(); this.cmap.marker.setPosition(new AMap.LngLat(lng, lat));
// }, 3000);
console.log();
});
}); });
}, },
// 选中图标 // 选中图标
......
src/views/system/home/overview.vue
View file @ cd6c01a7
This diff is collapsed.
src/views/system/home/tech.vue
View file @ cd6c01a7
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<div class="title" style="padding-bottom: 8px;">孵化器</div> <div class="title" style="padding-bottom: 8px;">孵化器</div>
<div class="content" style="font-size: 16px;margin-bottom: 4px;">{{data.incubatorAllCount}}家</div> <div class="content" style="font-size: 16px;margin-bottom: 4px;">{{data.incubatorAllCount}}家</div>
<div style="color: gray; font-size: 14px;"> <div style="color: gray; font-size: 14px;">
<span>国家级: {{data.incubatorAllCount}}家</span> <span>国家级: {{data.provinceCount}}家</span>
<span>省级: {{data.incubatorAllCount}}家</span> <span>省级: {{data.countryCount}}家</span>
</div> </div>
</li> </li>
<li> <li>
......
src/views/system/user/center.vue
View file @ cd6c01a7
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
align="right" align="right"
> >
<template slot="header"> <template slot="header">
<div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div> <div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 26px" /></div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime }}</span> <span>{{ scope.row.createTime }}</span>
......
src/views/system/user/index.vue
View file @ cd6c01a7
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<el-option <el-option
v-for="item in roles" v-for="item in roles"
:key="item.name" :key="item.name"
:disabled="level !== 1 && item.level <= level" :disabled="item.level < level"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment