fix20230417

apps/models.py

@@ -618,7 +618,6 @@ class Project(BaseModel, db.Model):
     project_stage_id = db.Column(db.Integer, comment='项目阶段id：落地项目为1，招商项目为2')
     project_stage_id = db.Column(db.Integer, comment='项目阶段id：落地项目为1，招商项目为2')
     name = db.Column(db.String(255), comment='工程名')  # 一.工程名
     name = db.Column(db.String(255), comment='工程名')  # 一.工程名
     district = db.Column(db.String(255), comment='区县名称')  # 二.县区
     district = db.Column(db.String(255), comment='区县名称')  # 二.县区
-    # money = db.Column(db.String(255), comment='项目投资金额')  # 三.(2)项目投资金额
     money = db.Column(db.Float, comment='项目投资金额')  # 三.(2)项目投资金额
     money = db.Column(db.Float, comment='项目投资金额')  # 三.(2)项目投资金额
     attract_industry = db.Column(db.String(255), comment='招引业态')  # 三.(2)项目投资金额
     attract_industry = db.Column(db.String(255), comment='招引业态')  # 三.(2)项目投资金额
     type = db.Column(db.String(255), comment='工程类型')  # 三.(1)工程类型
     type = db.Column(db.String(255), comment='工程类型')  # 三.(1)工程类型

apps/view_index/view.py

@@ -159,10 +159,6 @@ def menu():
                      }
                      }
 
 
         # 2. 左上角获取经济指标数据
         # 2. 左上角获取经济指标数据
-        # year = datetime.now().year - 1
-        # jjzb_data = get_jjzb(district, year)
-        # year = datetime.now().year
-        # jjzb_data1 = get_jjzb(district, year)
         jjzb_data = get_jjzb(district, 1)
         jjzb_data = get_jjzb(district, 1)
 
 
         jjzb_data1 = get_jjzb(district, 2)
         jjzb_data1 = get_jjzb(district, 2)
@@ -185,10 +181,6 @@ def menu():
         count_szjj = company.filter_by(f_type=16).count()  # 数字经济
         count_szjj = company.filter_by(f_type=16).count()  # 数字经济
         count_whly = company.filter_by(f_type=17).count()  # 文化旅游
         count_whly = company.filter_by(f_type=17).count()  # 文化旅游
 
 
-        count_qt = count_all - count_gt - count_gjd - count_mcq - count_zbzz - \
-                   count_zz - count_mhg - count_xcl - count_lsjc - count_yy - \
-                   count_smfz - count_xdfwy - count_szjj - count_whly
-
         # 产业结构分布
         # 产业结构分布
         indu_dic = [
         indu_dic = [
             {"name": "钢铁", "value": count_gt},  # {百分比，value}
             {"name": "钢铁", "value": count_gt},  # {百分比，value}
@@ -206,8 +198,6 @@ def menu():
             {"name": "文化旅游", "value": count_whly}
             {"name": "文化旅游", "value": count_whly}
         ]
         ]
 
 
-        # TODO 4.五大千亿级产业集群
-
         data = {
         data = {
             "jjzb_dic": jjzb_data,  # 左上角经济指标数据
             "jjzb_dic": jjzb_data,  # 左上角经济指标数据
             "jjzb_dic1": jjzb_data1,  # 左上角经济指标数据
             "jjzb_dic1": jjzb_data1,  # 左上角经济指标数据