Skip to content

M
mancheng
Commit 9a482a16 by 赵宇
Options

fix

parent 27cf791b
Showing with 28 additions and 52 deletions
apps/__init__.py
......@@ -87,13 +87,13 @@ def creat_app(config_name):
app.url_map.converters['re'] = RegexConverter
# 注册蓝图，推迟导入，防止循环嵌套
from apps.index import api_attract # 招商驾驶舱
from apps.view_index import api_attract # 招商驾驶舱
# from apps.user_pc import api_user
from apps.atlas import api_atlas
from apps.radar import api_radar
from apps.attract_map import api_map
# from apps.view_360 import api_portraits
from apps.choose_address import api_address
from apps.view_atlas import api_atlas
from apps.view_radar import api_radar
from apps.view_map import api_map
from apps.view_360company import api_portraits
from apps.view_choose import api_address
# from apps.manage import api_power
# from apps.inves_manage import api_manage
# from apps.view_mobile import api_mobile
......@@ -103,8 +103,8 @@ def creat_app(config_name):
app.register_blueprint(api_atlas, url_prefix='/api/atlas') # 产业招商图谱
app.register_blueprint(api_map, url_prefix='/api/map') # 产业招商地图
app.register_blueprint(api_attract, url_prefix='/api/attract_map/industry') # 招商驾驶舱
# app.register_blueprint(api_portraits, url_prefix="/api/portraits/industry")
app.register_blueprint(api_attract, url_prefix='/api/attract/industry') # 招商驾驶舱
app.register_blueprint(api_portraits, url_prefix="/api/360company")
app.register_blueprint(api_address, url_prefix="/api/address")
# app.register_blueprint(api_power, url_prefix="/api/power")
# app.register_blueprint(api_manage, url_prefix="/api/manage")
......
apps/atlas/__init__.py deleted 100644 → 0
from flask import Blueprint
# 创建蓝图对象
api_atlas = Blueprint("api_atlas", __name__)
from . import view
\ No newline at end of file
apps/inves_manage/view.py
......@@ -1402,7 +1402,7 @@ def down_manage_item():
df.loc[i] = [item.company_name, item.name, item.industry, item.invest, item.stage, item.section,
item.link, status_list[int(status)], item.invest_introduce, item.question]
# df.to_excel(old_path + filename, index=None)
# df.to_excel(old_path + filename, view_index=None)
writer = pd.ExcelWriter(old_path + filename, engine='xlsxwriter')
# Convert the dataframe to an XlsxWriter Excel object.
......
apps/models.py
......@@ -89,7 +89,7 @@ class Enterprise(db.Model):
c_type = db.Column(db.Integer, index=True, doc='行业类id', comment='行业类id') # 行业类id
f_name = db.Column(db.String(255), doc='父行业类名', comment='父行业类名') # 父行业类名
f_type = db.Column(db.Integer, index=True, doc='父行业类id', comment='父行业类id') # 父行业类id
# __table_args__ = (Index('index(zone,status)', 'resource_zone', 'resource_status'), {'comment': '压测资源表'}) # 添加索引和表注释
# __table_args__ = (Index('view_index(zone,status)', 'resource_zone', 'resource_status'), {'comment': '压测资源表'}) # 添加索引和表注释
__table_args__ = ({'comment': '全国企业表'}) # 添加表注释
......@@ -640,7 +640,7 @@ class Induzone(db.Model):
# charge = db.Column(db.String(255)) # 机构负责人
# charge_phone = db.Column(db.String(255)) # 负责人电话
# function = db.Column(db.Text) # 部门职能
# name = db.Column(db.String(255), nullable=False, index=True) # 政府机构单位名称
# name = db.Column(db.String(255), nullable=False, view_index=True) # 政府机构单位名称
# # followed 我的下级，管制谁，followers 我的上级，谁管制我
# followed = db.relationship('Government', secondary=followers, primaryjoin=(followers.c.follower_id == id),
# secondaryjoin=(followers.c.followed_id == id),
......@@ -955,8 +955,16 @@ class CompanyIndustryPoint(db.Model):
f_type = db.Column(db.Integer, doc='类型，对应产业导航nid', comment='类型，对应产业导航nid') # 类型，对应产业导航nid
# 360企业画像--下拉框内容数据表（企业类型，资质，上市状态，融资轮次）
class Property(db.Model):
__tablename_ = "property"
__table_args__ = ({'comment': '360企业画像--下拉框内容数据表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
name = db.Column(db.String(32), doc='字段名', comment='字段名') # 字段名
nid = db.Column(db.Integer, doc='字段id', comment='字段id') # 字段id
sid = db.Column(db.Integer, doc='字段类型id', comment='字段类型id') # 字段类型id 1企业类型，2企业资质，3上市状态，4融资轮次
statu = db.Column(db.Integer, doc='状态:1启动，2禁用', comment='状态:1启动，2禁用') # 状态 1启动，2禁用
......@@ -1034,15 +1042,7 @@ class CompanyIndustryPoint(db.Model):
#
#
#
# # 企业属性导航ty（企业类型，资质，上市状态，融资轮次）
# class Propertyty(db.Model):
# __tablename_ = "propertyty"
#
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# name = db.Column(db.String(32)) # 字段名
# nid = db.Column(db.Integer) # 字段id
# sid = db.Column(db.Integer) # 字段类型id 1企业类型，2企业资质，3上市状态，4融资轮次
# statu = db.Column(db.Integer) # 状态 1启动，2禁用
#
#
# # 企业属性导航全部（企业类型，资质，上市状态，融资轮次）
......@@ -1058,7 +1058,7 @@ class CompanyIndustryPoint(db.Model):
#
# # 招商资源管理字典（行业选择，项目阶段）
# class Attract(db.Model):
# __tablename_ = "attract_map"
# __tablename_ = "view_map"
#
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# name = db.Column(db.String(32)) # 字段名
......@@ -1170,7 +1170,7 @@ class CompanyIndustryPoint(db.Model):
# user = db.Column(db.Integer) # 园区创建人id
# uperson = db.Column(db.String(255)) # 园区上报人
# up_unit = db.Column(db.String(255)) # 园区上报机构
# status = db.Column(db.Enum("审核通过", "审核驳回", "正在审核", "未上报"), default="未上报", index=True) # 园区上报状态
# status = db.Column(db.Enum("审核通过", "审核驳回", "正在审核", "未上报"), default="未上报", view_index=True) # 园区上报状态
#
# name = db.Column(db.String(255)) # 园区姓名
# level = db.Column(db.String(255)) # 园区级别
......
apps/radar/__init__.py deleted 100644 → 0
from flask import Blueprint
# 创建蓝图对象
api_radar = Blueprint("api_radar", __name__)
from . import view
'''招商雷达'''
apps/utils/neo4j_conn.py
......@@ -2,8 +2,8 @@ from py2neo import Graph
def conn_neo4j():
# graph = Graph("http://localhost:7474", username="neo4j", password="123456") # 本地neo4j
graph = Graph("http://localhost:7476", username="neo4j", password="123456") # 上传到50服务器前需更改
graph = Graph("http://localhost:7474", username="neo4j", password="123456") # 本地neo4j
# graph = Graph("http://localhost:7476", username="neo4j", password="123456") # 上传到50服务器前需更改
# graph = Graph("http://39.100.39.50:7476/", username="neo4j", password="123456") # 测试50服务器上的neo4j时使用
return graph
......
apps/view_360/__init__.py deleted 100644 → 0
from flask import Blueprint
# 创建蓝图对象
api_portraits = Blueprint("api_portraits", __name__)
from . import view
'''360企业画像'''
apps/view_mobile/__init__.py
from flask import Blueprint
api_mobile = Blueprint("api_mobile",__name__)
api_mobile = Blueprint("api_mobile", __name__)
from . import view_atlas
from . import view_user
......
apps/view_mobile/view_atlas.py
......@@ -110,7 +110,7 @@ def enterprise():
# 全国企业列表
@api_mobile.route('/attract_map/enterprise', methods=['POST'])
@api_mobile.route('/view_map/enterprise', methods=['POST'])
# @login_required
def att_enterprise():
'''
......@@ -475,7 +475,7 @@ def garden():
# 雷达监测页企业数量趋势统计
@api_mobile.route('/radar/tendency', methods=['POST'])
@api_mobile.route('/view_radar/tendency', methods=['POST'])
@login_required
def tendency():
'''雷达监测页企业数量统计'''
......
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