diff --git a/appStore/api/router.py b/appStore/api/router.py index 6c3393f416c7005da12f56c1fb86f946cd6d9836..cffd6813085ffa1368ce5e78cd45471236e39a69 100644 --- a/appStore/api/router.py +++ b/appStore/api/router.py @@ -41,6 +41,6 @@ urlpatterns = [ url(r'', include(router.urls)), url('^get_filter_name/', ProjectViewSet.as_view({'get': 'get_filter_name'}), name='get_filter_name'), url('^merge_data/', ProjectViewSet.as_view({'post': 'merge_data'}), name='merge_data'), - url('^stream_data/', StreamViewSet.as_view({'get': 'get_stream_data'}), name='stream_data'), + url('^download_excel/', ProjectViewSet.as_view({'get': 'download_excel'}), name='download_excel'), url('^change_password/', UserProfileViewSet.as_view({'put': 'change_password'}), name='change_password'), ] diff --git a/appStore/env/views.py b/appStore/env/views.py index 45c8c43f37f837e85a95a7eccb14538939bbb243..5c6fef2eb206d814ea647a540e09162d1cbf5bbc 100644 --- a/appStore/env/views.py +++ b/appStore/env/views.py @@ -63,8 +63,8 @@ class EnvViewSet(CusModelViewSet): for value in eval(data_['hwinfo_nicinfo']): nicinfo = [{'column1': 'hwinfo', 'column2': 'nicinfo', 'column3': 'logicalname','column4': value['logicalname']}, - {'column1': 'hwinfo', 'column2': 'nicinfo', 'column3': 'product', 'column4': value['product']}, - {'column1': 'hwinfo', 'column2': 'nicinfo', 'column3': 'speed', 'column4': value['speed']},] + {'column1': 'hwinfo', 'column2': 'nicinfo', 'column3': 'product', 'column4': value['product']}, + {'column1': 'hwinfo', 'column2': 'nicinfo', 'column3': 'speed', 'column4': value['speed']},] disk_and_nicinfo_datas.extend(nicinfo) # 处理多组nic数据 @@ -79,60 +79,60 @@ class EnvViewSet(CusModelViewSet): ] nic_datas.extend(nic) datas = [{'column1': '项目名称','column2': '','column3': '','column4': Project.objects.filter(env_id=data_['id']).first().project_name}, - {'column1': 'hwinfo','column2': 'machineinfo','column3': 'manufacturer','column4': data_['hwinfo_machineinfo_manufacturer']}, - {'column1': 'hwinfo', 'column2': 'machineinfo', 'column3': 'product','column4': data_['hwinfo_machineinfo_product']}, - {'column1': 'hwinfo','column2': 'machineinfo','column3': 'serialnumber','column4': data_['hwinfo_machineinfo_serialnumber']}, - {'column1': 'hwinfo', 'column2': 'bios', 'column3': 'vendor', 'column4': data_['hwinfo_bios_vendor']}, - {'column1': 'hwinfo', 'column2': 'bios', 'column3': 'version', 'column4': data_['hwinfo_bios_version']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Vendor ID', 'column4': data_['hwinfo_cpu_Vendor_ID']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU family', 'column4': data_['hwinfo_cpu_CPU_family']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'model_name', 'column4': data_['hwinfo_cpu_model_name']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU MHz', 'column4': data_['hwinfo_cpu_CPU_MHz']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU(s)', 'column4': data_['hwinfo_cpu_CPUs']}, - {'column1': 'hwinfo','column2': 'cpu','column3': 'Thread(s) per core','column4': data_['hwinfo_cpu_Threads_per_core']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU Arch', 'column4': data_['hwinfo_cpu_CPU_Arch']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU op-mode', 'column4': data_['hwinfo_cpu_CPU_op_mode']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Byte Order', 'column4': data_['hwinfo_cpu_Byte_Order']}, - {'column1': 'hwinfo','column2': 'cpu','column3': 'On-line CPU(s) list','column4': data_['hwinfo_cpu_On_line_CPUs_list']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Virtualization', 'column4': data_['hwinfo_cpu_Virtualization']}, - {'column1': 'hwinfo','column2': 'cpu','column3': 'Virtualization type','column4': data_['hwinfo_cpu_Virtualization_type']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L1d cache:', 'column4': data_['hwinfo_cpu_L1d_cache']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L1i cache', 'column4': data_['hwinfo_cpu_L1i_cache']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L2 cache', 'column4': data_['hwinfo_cpu_L2_cache']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L3 cache', 'column4': data_['hwinfo_cpu_L3_cache']}, - {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Flags', 'column4': data_['hwinfo_memory_Flags']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'vendor', 'column4': data_['hwinfo_memory_vendor']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_type', 'column4': data_['hwinfo_memory_mem_type']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'total_size', 'column4': data_['hwinfo_memory_total_size']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_used', 'column4': data_['hwinfo_memory_mem_used']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_count', 'column4': data_['hwinfo_memory_mem_count']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_free', 'column4': data_['hwinfo_memory_mem_free']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_freq', 'column4': data_['hwinfo_memory_mem_freq']}, - {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'swap', 'column4': data_['hwinfo_memory_swap']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'curr UTC time', 'column4': data_['swinfo_os_curr_UTC_time']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'os_id', 'column4': data_['swinfo_os_os_id']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'os_arch', 'column4': data_['swinfo_os_os_arch']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'osversion', 'column4': data_['swinfo_os_osversion']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'kernel', 'column4': data_['swinfo_os_kernel']}, - {'column1': 'swinfo', 'column2': 'os', 'column3': 'grub', 'column4': data_['swinfo_os_grub']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'sysconf', 'column4': data_['swinfo_runtime_sysconf']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'sysctl', 'column4': data_['swinfo_runtime_sysctl']}, - {'column1': 'swinfo','column2': 'runtime','column3': 'systemctlinfo','column4': data_['swinfo_runtime_systemctlinfo']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'driverinfo', 'column4': data_['swinfo_runtime_driverinfo']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'rpmlist', 'column4': data_['swinfo_runtime_rpmlist']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'ipclist', 'column4': data_['swinfo_runtime_ipclist']}, - {'column1': 'swinfo','column2': 'runtime','column3': 'selinux_status','column4': data_['swinfo_runtime_selinux_status']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'power_status','column4': data_['swinfo_runtime_power_status']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'cpu_sched', 'column4': data_['swinfo_runtime_cpu_sched']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'loadavg', 'column4': data_['swinfo_runtime_loadavg']}, - {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'uptime', 'column4': data_['swinfo_runtime_uptime']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'gccversion','column4': data_['swinfo_software_ver_gccversion']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'glibcversion','column4': data_['swinfo_software_ver_glibcversion']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'javaversion','column4': data_['swinfo_software_ver_javaversion']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'g++version','column4': data_['swinfo_software_ver_g_version']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'gfortranversion','column4': data_['swinfo_software_ver_gfortranversion']}, - {'column1': 'swinfo','column2': 'software_ver','column3': 'pythonversion','column4': data_['swinfo_software_ver_pythonversion']}, - ] + {'column1': 'hwinfo','column2': 'machineinfo','column3': 'manufacturer','column4': data_['hwinfo_machineinfo_manufacturer']}, + {'column1': 'hwinfo', 'column2': 'machineinfo', 'column3': 'product','column4': data_['hwinfo_machineinfo_product']}, + {'column1': 'hwinfo','column2': 'machineinfo','column3': 'serialnumber','column4': data_['hwinfo_machineinfo_serialnumber']}, + {'column1': 'hwinfo', 'column2': 'bios', 'column3': 'vendor', 'column4': data_['hwinfo_bios_vendor']}, + {'column1': 'hwinfo', 'column2': 'bios', 'column3': 'version', 'column4': data_['hwinfo_bios_version']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Vendor ID', 'column4': data_['hwinfo_cpu_Vendor_ID']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU family', 'column4': data_['hwinfo_cpu_CPU_family']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'model_name', 'column4': data_['hwinfo_cpu_model_name']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU MHz', 'column4': data_['hwinfo_cpu_CPU_MHz']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU(s)', 'column4': data_['hwinfo_cpu_CPUs']}, + {'column1': 'hwinfo','column2': 'cpu','column3': 'Thread(s) per core','column4': data_['hwinfo_cpu_Threads_per_core']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU Arch', 'column4': data_['hwinfo_cpu_CPU_Arch']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'CPU op-mode', 'column4': data_['hwinfo_cpu_CPU_op_mode']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Byte Order', 'column4': data_['hwinfo_cpu_Byte_Order']}, + {'column1': 'hwinfo','column2': 'cpu','column3': 'On-line CPU(s) list','column4': data_['hwinfo_cpu_On_line_CPUs_list']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Virtualization', 'column4': data_['hwinfo_cpu_Virtualization']}, + {'column1': 'hwinfo','column2': 'cpu','column3': 'Virtualization type','column4': data_['hwinfo_cpu_Virtualization_type']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L1d cache:', 'column4': data_['hwinfo_cpu_L1d_cache']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L1i cache', 'column4': data_['hwinfo_cpu_L1i_cache']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L2 cache', 'column4': data_['hwinfo_cpu_L2_cache']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'L3 cache', 'column4': data_['hwinfo_cpu_L3_cache']}, + {'column1': 'hwinfo', 'column2': 'cpu', 'column3': 'Flags', 'column4': data_['hwinfo_memory_Flags']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'vendor', 'column4': data_['hwinfo_memory_vendor']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_type', 'column4': data_['hwinfo_memory_mem_type']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'total_size', 'column4': data_['hwinfo_memory_total_size']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_used', 'column4': data_['hwinfo_memory_mem_used']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_count', 'column4': data_['hwinfo_memory_mem_count']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_free', 'column4': data_['hwinfo_memory_mem_free']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'mem_freq', 'column4': data_['hwinfo_memory_mem_freq']}, + {'column1': 'hwinfo', 'column2': 'memory', 'column3': 'swap', 'column4': data_['hwinfo_memory_swap']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'curr UTC time', 'column4': data_['swinfo_os_curr_UTC_time']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'os_id', 'column4': data_['swinfo_os_os_id']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'os_arch', 'column4': data_['swinfo_os_os_arch']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'osversion', 'column4': data_['swinfo_os_osversion']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'kernel', 'column4': data_['swinfo_os_kernel']}, + {'column1': 'swinfo', 'column2': 'os', 'column3': 'grub', 'column4': data_['swinfo_os_grub']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'sysconf', 'column4': data_['swinfo_runtime_sysconf']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'sysctl', 'column4': data_['swinfo_runtime_sysctl']}, + {'column1': 'swinfo','column2': 'runtime','column3': 'systemctlinfo','column4': data_['swinfo_runtime_systemctlinfo']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'driverinfo', 'column4': data_['swinfo_runtime_driverinfo']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'rpmlist', 'column4': data_['swinfo_runtime_rpmlist']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'ipclist', 'column4': data_['swinfo_runtime_ipclist']}, + {'column1': 'swinfo','column2': 'runtime','column3': 'selinux_status','column4': data_['swinfo_runtime_selinux_status']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'power_status','column4': data_['swinfo_runtime_power_status']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'cpu_sched', 'column4': data_['swinfo_runtime_cpu_sched']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'loadavg', 'column4': data_['swinfo_runtime_loadavg']}, + {'column1': 'swinfo', 'column2': 'runtime', 'column3': 'uptime', 'column4': data_['swinfo_runtime_uptime']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'gccversion','column4': data_['swinfo_software_ver_gccversion']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'glibcversion','column4': data_['swinfo_software_ver_glibcversion']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'javaversion','column4': data_['swinfo_software_ver_javaversion']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'g++version','column4': data_['swinfo_software_ver_g_version']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'gfortranversion','column4': data_['swinfo_software_ver_gfortranversion']}, + {'column1': 'swinfo','column2': 'software_ver','column3': 'pythonversion','column4': data_['swinfo_software_ver_pythonversion']}, + ] datas[31:31] = disk_and_nicinfo_datas datas.extend(nic_datas) start_number = 5 @@ -303,10 +303,10 @@ class EnvViewSet(CusModelViewSet): serializer_env = self.get_serializer(data=data_env) request.data['env_id'] = '1' if serializer_env.is_valid(): - self.perform_create(serializer_env) - request.data['env_id'] = serializer_env.data['id'] # wqz # request.data['env_id'] = 1 + self.perform_create(serializer_env) + request.data['env_id'] = serializer_env.data['id'] if serializer_env.errors: return json_response(serializer_env.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_env)) if not request.data['env_id']: diff --git a/appStore/project/views.py b/appStore/project/views.py index 72714524806425cae8b96447e7b32caf0530e2d7..24a71f2abed46722f4111999af227484a6944680 100644 --- a/appStore/project/views.py +++ b/appStore/project/views.py @@ -10,10 +10,9 @@ import os import json import logging -log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 - +from django.http import HttpResponse, Http404, FileResponse from rest_framework import status - +from rest_framework.test import APIRequestFactory from appStore.cpu2006.models import Cpu2006 from appStore.cpu2017.models import Cpu2017 from appStore.env.models import Env @@ -27,8 +26,12 @@ from appStore.stream.models import Stream from appStore.unixbench.models import Unixbench from appStore.users.models import UserProfile from appStore.utils.common import json_response, get_error_message -from appStore.utils.customer_view import CusModelViewSet, CusUpdateModelViewSet +from appStore.utils.customer_view import CusModelViewSet +from appStore.utils.common import stream_excel +from djangoProject import settings + +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class ProjectViewSet(CusModelViewSet): """ @@ -358,7 +361,10 @@ class ProjectViewSet(CusModelViewSet): def create(self, request, *args, **kwargs): data_project = {} data_project['env_id'] = request.__dict__['data_project']['env_id'] - data_project['message'] = str(request.__dict__['project_message']) + if request.__dict__['project_message']: + data_project['message'] = str(request.__dict__['project_message']) + else: + data_project['message'] = None data_project['project_name'] = request.__dict__['data_project']['project_name'] data_project['user_name'] = UserProfile.objects.filter( username = request.__dict__['data_project']['user_name']).first().chinese_name @@ -447,3 +453,93 @@ class ProjectViewSet(CusModelViewSet): else: return json_response({}, status.HTTP_205_RESET_CONTENT, '此用户不允许删除该数据') + def simulate_request(self, view_class, request_params): + """ + 模拟请求 + :param view_class: + :param request_params: + :return: + """ + # 创建一个工厂对象 + factory = APIRequestFactory() + # 创建一个视图的实例 + view = view_class() + # 设置视图的属性 + view.request = factory.get('/path/to/view/', request_params) + view.format_kwarg = None + view.args = () + view.kwargs = {} + # 调用视图的方法，得到响应对象 + response = view.list(view.request, *view.args, **view.kwargs) + + # 返回响应内容 + return response.content + + def download_excel(self, request, *args, **kwargs): + """ + 下载excel表格 + """ + # 再去获取全部的数据 + env_id = request.GET.get('env_id') + comparsionIds = request.GET.get('comparsionIds') + + """env数据""" + # 因为listhan函数中有self.get_serializer(serializer_, many=True)，如果用到的话会报错。所以不能像create方法那样使用 + from appStore.env.views import EnvViewSet + env_data = self.simulate_request(EnvViewSet, {'env_id': env_id, 'comparsionIds': ""}) + env_data = json.loads(env_data) + + + """stream数据""" + from appStore.stream.views import StreamViewSet + stream_data = self.simulate_request(StreamViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + stream_data = json.loads(stream_data) + print(stream_data) + stream_excel(stream_data) + + # 打开文件 + file_path = os.path.join(settings.BASE_DIR, 'mydata.xlsx') + print(file_path) + if os.path.exists(file_path): + print(11111) + return FileResponse(open(file_path, 'rb'), as_attachment=True) + return Http404 + + + """lmbench数据""" + from appStore.lmbench.views import LmbenchViewSet + lmbench_data = self.simulate_request(LmbenchViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + lmbench_data = json.loads(lmbench_data) + + """unixbench数据""" + from appStore.unixbench.views import UnixbenchViewSet + unixbench_data = self.simulate_request(UnixbenchViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + unixbench_data = json.loads(unixbench_data) + + """fio数据""" + from appStore.fio.views import FioViewSet + fio_data = self.simulate_request(FioViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + fio_data = json.loads(fio_data) + + """iozone数据""" + from appStore.iozone.views import IozoneViewSet + iozone_data = self.simulate_request(IozoneViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + iozone_data = json.loads(iozone_data) + + """jvm2008数据""" + from appStore.jvm2008.views import Jvm2008ViewSet + jvm2008_data = self.simulate_request(Jvm2008ViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + + """speccpu2006数据""" + from appStore.cpu2006.views import Cpu2006ViewSet + cpu2006_data = self.simulate_request(Cpu2006ViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + cpu2006_data = json.loads(cpu2006_data) + + """speccpu2017数据""" + from appStore.cpu2017.views import Cpu2017ViewSet + cpu2017_data = self.simulate_request(Cpu2017ViewSet, {'env_id': env_id, 'comparsionIds': comparsionIds}) + cpu2017_data = json.loads(cpu2017_data) + + + return json_response({}, status.HTTP_200_OK, '表格数据获取完成') + diff --git a/appStore/stream/views.py b/appStore/stream/views.py index 3e77ab3d01b943303638731357603b1e5890ff3d..5b33cb3f7ae819b1089a1651185de985c3e02d6a 100644 --- a/appStore/stream/views.py +++ b/appStore/stream/views.py @@ -32,8 +32,6 @@ class StreamViewSet(CusModelViewSet): else: # 基准数据和对比数据的全部数据 datas[0]['column' + str(column_index)] = 'Stream#' + str(title_index) - print(serializer.first().env_id ) - print(Project.objects.filter(env_id=serializer.first().env_id).first().project_name) datas[1]['column' + str(column_index)] = Project.objects.filter(env_id=serializer.first().env_id).first().project_name datas[2]['column' + str(column_index)] = serializer.first().execute_cmd datas[3]['column' + str(column_index)] = serializer.first().modify_parameters diff --git a/templates/front-project/src/api/api.js b/templates/front-project/src/api/api.js index 2351dffc87ade6528f92589e790b848a6d5a5d7d..247363461571d1811e6afd2a1ca566e8774b15b0 100644 --- a/templates/front-project/src/api/api.js +++ b/templates/front-project/src/api/api.js @@ -134,64 +134,13 @@ export function cpu2017(params) { }) } - - -// 学生列表删除接口 -export function studentDel(id) { - return service({ - method: 'delete', - url: `/students/${id}` - }) -} - -// 信息列表新增接口 -// export function info(data) { -// data = qs.stringify(data) -// return service({ -// method: 'post', -// url: '/info', -// data -// }) -// } - -/* -// 信息列表新增和修改接口 -export function info(type, data) { - data = qs.stringify(data) - let obj = { method: type, url: '/info', data } - return service(obj) -} -*/ - - -// 信息列表查询接口 -export function getInfo() { - return service({ - method: 'get', - url: '/info' - }) -} - -// 信息列表删除接口 -export function infoDel(id) { - return service({ - method: 'delete', - url: `/info/${id}` - }) -} - -// 数据概览接口 -export function dataview() { +// 下载excel表格接口 +export function download_excel(params) { return service({ method: 'get', - url: '/dataview' + url: '/download_excel/', + responseType: 'blob', + params }) } -// 旅游地图接口 -export function travel() { - return service({ - method: 'get', - url: '/travel' - }) -} \ No newline at end of file diff --git a/templates/front-project/src/components/TableHeader.vue b/templates/front-project/src/components/TableHeader.vue index 7400f46b30fe1156d5dec943de14386f7a8e031e..8faddcb1f5d49827ac78e90c6f4570273b756c7c 100644 --- a/templates/front-project/src/components/TableHeader.vue +++ b/templates/front-project/src/components/TableHeader.vue @@ -31,7 +31,10 @@