From 47a02d6339b9aa43bf55f9d614b751fb260db034 Mon Sep 17 00:00:00 2001
From: qz_cx <wangqingzheng@kylinos.cn>
Date: Tue, 10 Sep 2024 09:42:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=AD=E5=9B=A0=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=90=8E?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4id=E9=A1=BA=E5=BA=8F=E8=B7=B3=E5=8F=98?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E8=8E=B7=E5=8F=96item.env=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kytuningProject/settings.py                          |  1 +
 templates/front-project/src/components/TableHome.vue |  2 --
 templates/front-project/src/views/ProjectTable.vue   | 11 ++---------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/kytuningProject/settings.py b/kytuningProject/settings.py
index 4f0e106..7215f3b 100644
--- a/kytuningProject/settings.py
+++ b/kytuningProject/settings.py
@@ -97,6 +97,7 @@ WSGI_APPLICATION = 'djangoProject.wsgi.application'
 
 DATABASES = {
     'default': {
+        # todo 需要修改为自己的数据库及密码
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'kytuning',
         'HOST': 'localhost',
diff --git a/templates/front-project/src/components/TableHome.vue b/templates/front-project/src/components/TableHome.vue
index 0ee4163..93d679e 100644
--- a/templates/front-project/src/components/TableHome.vue
+++ b/templates/front-project/src/components/TableHome.vue
@@ -23,14 +23,12 @@
 
 <script>
 // import Header from "./TableHeader.vue";
-import Left from "./TableLeft.vue";
 import Base from "./BaseData.vue";
 import Compar from "./ComparData.vue";
 import Footer from "./TableHeader.vue";
 export default {
   components: {
     // Header,
-    Left,
     Base,
     Compar,
     Footer
diff --git a/templates/front-project/src/views/ProjectTable.vue b/templates/front-project/src/views/ProjectTable.vue
index 3b6a3a6..d0b31f5 100644
--- a/templates/front-project/src/views/ProjectTable.vue
+++ b/templates/front-project/src/views/ProjectTable.vue
@@ -172,10 +172,8 @@ export default {
     sure(form) {
       this.$refs[form].validate(valid => {
         if (valid) {
-          console.log(this.form, 1122)
           // // 发送数据
           project('put', this.form).then(response => {
-            console.log(response.data)
             if (response.data.code === 200) {
               ElMessage({message: response.data.message, type: 'success'})
               //更新页面数据，绑定key，每次key改变后就会刷新数据
@@ -192,14 +190,11 @@ export default {
       this.dialogFormVisible = true
     },
     closeInfo(form) {
-      console.log(form)
       this.$refs[form].resetFields()
       this.dialogFormVisible = false
     },
     del(row) {
-      // delData(this, '/info', row.id, getData)
       project('delete', {id: row.id}).then(response => {
-            console.log(response.data)
             if (response.data.code === 200) {
               ElMessage({message: response.data.message, type: 'success'})
               //更新页面数据，绑定key，每次key改变后就会刷新数据
@@ -255,9 +250,7 @@ export default {
     //跳转base页面
     ShowSingleData() {
       if (this.selectedType) {
-        console.log(this.base, 11)
         const env_id = Object.keys(this.base).map(key => parseInt(key));
-        console.log(env_id,222);
         if (env_id.length !== 1) {
           ElMessage.error({message:'请选择一条数据作为基准数据',duration: 1000});
           return
@@ -345,7 +338,7 @@ export default {
     getComparativeData() {
       if (this.selectedType) {
         const env_id = Object.keys(this.base).map(key => parseInt(key));
-        const baseData = this.allProjectDatas.find(item => env_id.includes(item.id))
+        const baseData = this.allProjectDatas.find(item => env_id.includes(item.env_id))
         const env_ids = Object.keys(this.compar).map(key => parseInt(key));
         const comparData = this.allProjectDatas.filter(item => env_ids.includes(item.env_id))
         const comparsionIds = env_ids.join(',')
@@ -431,7 +424,7 @@ export default {
           if (baseData.cpu2017 && !cpu2017s.includes(0)) {
             this.$router.push({
               name: 'cpu2017',
-              "params": {baseId: env_id[0], comparsionIds: comparsionIds}
+              "params": {baseId: env_id[0],comparsionIds: comparsionIds}
             });
           } else {
             ElMessage.error({message:'该数据中有cpu2017为空',duration: 1000});
-- 
Gitee


From 520f46b45344529a751b68c01172fc46eff2f9a7 Mon Sep 17 00:00:00 2001
From: qz_cx <wangqingzheng@kylinos.cn>
Date: Tue, 10 Sep 2024 10:53:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appStore/users/models.py    | 13 +------------
 kytuningProject/asgi.py     |  2 +-
 kytuningProject/settings.py | 11 ++++-------
 kytuningProject/wsgi.py     |  2 +-
 manage.py                   |  2 +-
 requirements.txt            |  3 ++-
 uwsgi.ini                   |  2 +-
 7 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/appStore/users/models.py b/appStore/users/models.py
index 4abd504..bd731f2 100644
--- a/appStore/users/models.py
+++ b/appStore/users/models.py
@@ -1,22 +1,11 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
-
-# Create your models here.
-# 能否只取一层,不行就写字段
-# class UserProfileGroup(models.Model):
-#     """用户组"""
-#     name = models.CharField(unique=True, max_length=32)
-#
-#     class Meta:
-#         db_table = 'user_profile_group'
-
-
 class UserProfile(AbstractUser):
     """
     用户模型类
     """
-    user_phone = models.CharField(unique=True,null=True, max_length=22, verbose_name='手机号')
+    user_phone = models.CharField(unique=True, null=True, max_length=22, verbose_name='手机号')
     chinese_name = models.CharField(max_length=255, unique=True)
     is_superuser = models.BooleanField(default=False, verbose_name='是否是管理员')
 
diff --git a/kytuningProject/asgi.py b/kytuningProject/asgi.py
index a452a34..5009dd9 100644
--- a/kytuningProject/asgi.py
+++ b/kytuningProject/asgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangoProject.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kytuningProject.settings')
 
 application = get_asgi_application()
diff --git a/kytuningProject/settings.py b/kytuningProject/settings.py
index 4f0e106..74a222c 100644
--- a/kytuningProject/settings.py
+++ b/kytuningProject/settings.py
@@ -52,6 +52,7 @@ INSTALLED_APPS = [
     'appStore.cpu2006.apps.Cpu2006Config',
     'appStore.cpu2017.apps.Cpu2017Config',
 ]
+AUTH_USER_MODEL = 'users.UserProfile'
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -62,12 +63,10 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
-
 ]
 
-ROOT_URLCONF = 'djangoProject.urls'
+ROOT_URLCONF = 'kytuningProject.urls'
 CORS_ORIGIN_ALLOW_ALL = True
-
 CORS_ALLOWED_ORIGINS = [
     'http://127.0.0.1:8080',  # 允许从这个地址发出跨域请求
     # ...
@@ -76,8 +75,7 @@ CORS_ALLOWED_ORIGINS = [
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR / 'templates']
-        ,
+        'DIRS': [BASE_DIR / 'templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -90,7 +88,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = 'djangoProject.wsgi.application'
+WSGI_APPLICATION = 'kytuningProject.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
@@ -151,7 +149,6 @@ STATIC_URL = 'static/'
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-
 PASSWORD_HASHERS = [
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
 ]
diff --git a/kytuningProject/wsgi.py b/kytuningProject/wsgi.py
index eca644f..b7a4163 100644
--- a/kytuningProject/wsgi.py
+++ b/kytuningProject/wsgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangoProject.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kytuningProject.settings')
 
 application = get_wsgi_application()
diff --git a/manage.py b/manage.py
index 652ec40..f63b93b 100644
--- a/manage.py
+++ b/manage.py
@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djangoProject.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kytuningProject.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
diff --git a/requirements.txt b/requirements.txt
index 6710b03..3419d88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ djangorestframework-jwt==1.11.0
 numpy==1.21.6
 django-filter==23.2
 uWSGI==2.0.19.1
-openpyxl==3.1.2
\ No newline at end of file
+openpyxl==3.1.2
+schedule==0.3.2
\ No newline at end of file
diff --git a/uwsgi.ini b/uwsgi.ini
index adc1b4e..7aa5937 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -2,7 +2,7 @@
 # chdir这个是项目路径
 chdir           = /root/kytuning-server
 #djangoProject 这个需要和wsgi中的djangoProject.settings保持一致和setting中的WSGI_APPLICATION = 'djangoProject.wsgi.application'相同
-module          = djangoProject.wsgi:application
+module          = kytuningProject.wsgi:application
 master          = true
 processes       = 4
 threads         = 2
-- 
Gitee