@@ -227,7 +227,6 @@ export default {
let height1 = document.getElementsByClassName('app-main')[0].clientHeight;
let height2 = document.getElementsByClassName('elHeader')[0].clientHeight;
that.tableHeight = height1 - height2 - 70;
- console.log(that.tableHeight)
that.getList();
},
@@ -256,13 +255,10 @@ export default {
// if (!this.exportForm.startDate || !this.exportForm.endDate) {
// this.$message.error('请选择完整的起止日期！');
// return;}
- console.log(this.exportForm)
getAllQi().then((response) => {
- console.log(response);
if (response.data) {
let filename = '资质情况统计表.xlsx';
let tableData = response.data;
- console.log(tableData)
const ws = XLSX.utils.json_to_sheet(tableData.results);
const wb = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
@@ -272,7 +268,7 @@ export default {
} catch (e) { if(typeof console !== 'undefined') console.log(e, wbout); }
return;
}else {
- this.$message.error(data.message || '导出失败');
+ this.$message.error(data.message || '导出失败');
}
})
// this.showExportDialog = false;
@@ -297,7 +293,6 @@ export default {
}
},
handleUpSuccess(res, file, filelist) {
- console.log(res.data.path)
this.Content.cie_path = res.data.path;
this.Content.file = res.data.id;
@@ -312,7 +307,6 @@ export default {
this.tableData.results =[];
this.tableData.count =0;
getAllQi(this.listQuery).then((response) => {
- console.log(response);
if (response.data) {
this.tableData = response.data;
@@ -370,7 +364,6 @@ export default {
getQi(scope.row.id).then((response) => {
if (response.data.count>0) {
this.changeTableData = response.data.results;
- console.log(this.changeTableData);
this.listLoading = false;
}else{
alert('无变更记录')
@@ -386,7 +379,6 @@ export default {
if (valid) {
const isEdit = this.dialogType === "edit";
if (isEdit) {
- console.log(this.Content, "edited");
updateQi(this.Content.id, this.Content).then((response) => {
if (response.data) {
this.tableData = response.data;
@@ -398,8 +390,7 @@ export default {
} else {
createQi(this.Content).then((response) => {
if (response.data) {
- console.log(response.data, "created");
- this.tableData = response.data;
+ this.tableData = response.data;
}
this.listLoading = false;
this.dialogVisible = false;
diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 694e4a3..4f9a08a 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -73,13 +73,19 @@
{{ cycleList[scope.row.task2_.cycle] }}
-
+
创建中
进行中
已关闭
+
+
+ 已完成
+ 未完成
+
+
diff --git a/server/apps/exam/serializers.py b/server/apps/exam/serializers.py
index eb8d22e..9bce0ac 100644
--- a/server/apps/exam/serializers.py
+++ b/server/apps/exam/serializers.py
@@ -78,7 +78,7 @@ class ExamCreateUpdateSerializer(ModelSerializer):
class Meta:
model = Exam
- fields = ['name', 'place', 'open_time','course_name', 'certificate',
+ fields = ['name', 'place', 'open_time','course_name', 'certificate',
'close_time', 'proctor_name', 'proctor_phone', 'chance', 'paper', 'participant_dep', 'participant_user']
@@ -86,13 +86,18 @@ class ExamListSerializer(ModelSerializer):
create_by_name = CharField(source='create_by.name', read_only=True)
paper_ = PaperSerializer(source='paper', read_only=True)
course_ = CourseSerializer(source='course_name', read_only=True)
- participant_user = UserListSerializer(many=True, read_only=True)
-
-
+ user_count = serializers.SerializerMethodField()
class Meta:
model = Exam
fields = '__all__'
+ def get_user_count(self, obj):
+ total_user_count = 0
+ for p in obj.participant_dep.all():
+ user_count = User.objects.filter(dept_id = p.id).count()
+ total_user_count += user_count
+ return total_user_count+obj.participant_user.count()
+
class ExamDetailSerializer(ModelSerializer):
create_by_name = CharField(source='create_by.name', read_only=True)
diff --git a/server/apps/information/migrations/0039_alter_auditlog_change_reason.py b/server/apps/information/migrations/0039_alter_auditlog_change_reason.py
new file mode 100644
index 0000000..3c4b9e9
--- /dev/null
+++ b/server/apps/information/migrations/0039_alter_auditlog_change_reason.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2024-05-16 07:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('information', '0038_parsepdf_status'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='auditlog',
+ name='change_reason',
+ field=models.CharField(blank=True, max_length=50, null=True, verbose_name='变更原因'),
+ ),
+ ]
diff --git a/server/apps/information/models.py b/server/apps/information/models.py
index 11f1de1..931784a 100644
--- a/server/apps/information/models.py
+++ b/server/apps/information/models.py
@@ -26,7 +26,7 @@ class AuditLog(models.Model):
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
action = models.CharField('动作', max_length=20)
instance = models.ForeignKey(Qualification, on_delete=models.CASCADE, verbose_name='实例ID')
- change_reason = models.CharField('变更原因', default='', max_length=50)
+ change_reason = models.CharField('变更原因', null=True ,blank=True ,max_length=50)
change_user = models.ForeignKey('system.user', on_delete=models.SET_NULL, verbose_name='操作人', null=True, blank=True)
change_time = models.DateField('变更时间')
val_new = models.JSONField('变更后完整数据', default=dict)
diff --git a/server/apps/information/views.py b/server/apps/information/views.py
index 44ccb71..ceaa732 100644
--- a/server/apps/information/views.py
+++ b/server/apps/information/views.py
@@ -484,11 +484,11 @@ class QualiChangeViewSet(RbacFilterSet, CreateUpdateCustomMixin, ModelViewSet):
# 重写更新的方法
- def partial_update(self, request, pk=None):
+ def update(self, request, pk=None):
#获取需要更新的实列
instance = self.get_object()
# 数据比较
- ignore_fields = ['create_by', 'create_time', 'update_date', 'id']
+ ignore_fields = ['create_by', 'create_time', 'update_date', 'id', 'change_reason']
origin_dict = QualificationSerializer(instance=instance).data
diff = []
for k, v in request.data.items():
@@ -504,6 +504,7 @@ class QualiChangeViewSet(RbacFilterSet, CreateUpdateCustomMixin, ModelViewSet):
action='update',
instance=instance,
change_time = datetime.now(),
+ change_reason = request.data.get('change_reason'),
change_user=request.user,
val_new=serializers.data,
difference=diff
diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py
index b24e194..e589130 100644
--- a/server/server/settings_dev.py
+++ b/server/server/settings_dev.py
@@ -1,14 +1,14 @@
from .settings import *
DEBUG = True
DATABASES = {
- #'default': {
- # 'ENGINE': 'django.db.backends.postgresql',
- # 'NAME': 'cma',
- # 'USER': 'postgres',
- #'PASSWORD': 'zcDsj2021',
- #'HOST': '49.232.14.174',
- #'PORT': '5432',
- #},
+ 'default': {
+ 'ENGINE': 'django.db.backends.postgresql',
+ 'NAME': 'cma',
+ 'USER': 'postgres',
+ 'PASSWORD': 'zcDsj2021',
+ 'HOST': '49.232.14.174',
+ 'PORT': '5432',
+ },
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql',
# 'NAME': 'cma',
@@ -27,15 +27,15 @@ DATABASES = {
# 'HOST': '127.0.0.1',
# 'PORT': '5432',
# }
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql',
- 'NAME': 'cma',
- 'USER': 'cma',
- 'PASSWORD': 'cma123',
- 'HOST': '127.0.0.1',
- # 'HOST': '1.203.161.102',
- 'PORT': '5432',
- }
+ # 'default': {
+ # 'ENGINE': 'django.db.backends.postgresql',
+ # 'NAME': 'cma',
+ # 'USER': 'cma',
+ # 'PASSWORD': 'cma123',
+ # 'HOST': '127.0.0.1',
+ # # 'HOST': '1.203.161.102',
+ # 'PORT': '5432',
+ # }
}