Skip to content

Commit 31a333d

Browse files
weishakejiweishakeji
committed
优化：机构管理中，默认机构与根机构不允许禁用、删除
1 parent 9592c57 commit 31a333d

File tree

10 files changed

+83
-18
lines changed

10 files changed

+83
-18
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@ packages/
6262
/Sourcecode/Song.WebSite/App_Data/gxmk.db-wal
6363
/Sourcecode/Song.WebSite/App_Data/gxmk.db
6464
/Sourcecode/Song.WebSite/App_Data/gxmk.db-shm
65+
/Sourcecode/Song.WebSite/App_Data/gxmk - backup.db

‎DbScripts/upgrade_v2/2024-09-10.sql

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
3+
/* 学习卡设置项的主题长度变更为200，原来是500，为了方便索引 */
4+
5+
--SQLserver脚本
6+
alter table "LearningCardSet" ALTER COLUMN Lcs_Theme [nvarchar](200) NULL
7+
go
8+
9+
--PostgreSQL脚本
10+
alter table "Student_Course" add "Stc_ResultScore" real NULL;
11+
update "Student_Course" set "Stc_ResultScore"=0;
12+
alter table "Student_Course" ALTER COLUMN "Stc_ResultScore" set NOT NULL;

‎Sourcecode/Song.WebSite/App_Data/weisha.db

196 KB
Binary file not shown.

‎Sourcecode/Song.WebSite/Templates/Manage/Default/Organs/List.html

+42-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<body>
1111
<div id="vapp" v-cloak>
1212
<div class="toolsbar">
13-
<btngroup show="新增,修改,删除" ref='btngroup' @delete="deleteData" path="OrganModify" width="600" height="500"
13+
<btngroup show="新增,修改" ref='btngroup' @delete="deleteData" path="OrganModify" width="600" height="500"
1414
:selects='selects' idkey='Org_ID' table="datatables"></btngroup>
1515
<query_panel :model="form" :loading="loading" @search="handleCurrentChange(1)">
1616
<el-form-item label="等级">
@@ -40,6 +40,7 @@
4040
<span>{{(form.index - 1) * form.size + scope.$index + 1}}</span>
4141
</template>
4242
</el-table-column>
43+
<el-table-column label="名称" align="center">
4344
<el-table-column label="机构名称" min-width="200">
4445
<template slot-scope="scope">
4546
<el-tooltip v-if='scope.row.Org_IsRoot' effect="light" content="根机构" placement="left-start">
@@ -49,18 +50,42 @@
4950
<span class="def" icon="&#xa006" style="font-size: 16px;"></span>
5051
</el-tooltip>
5152

52-
<span v-html='showsearch(scope.row.Org_Name,form.search)'></span>
53+
<span v-html='showsearch(scope.row.Org_Name,form.search)' class="large"></span>
5354
</template>
5455
</el-table-column>
5556
<el-table-column label="平台名称" min-width="180">
5657
<template slot-scope="scope">
57-
<el-tooltip v-if='scope.row.Org_ID==current.Org_ID' effect="light" content="当前机构"
58-
placement="left-start">
59-
<span class="root" icon="&#xa020" style="font-size: 16px;"></span>
60-
</el-tooltip>
6158
<span v-html='scope.row.Org_PlatformName'></span>
6259
</template>
6360
</el-table-column>
61+
</el-table-column>
62+
<el-table-column label="类型" align="center">
63+
<el-table-column label="当前机构" width="80" align="center">
64+
<template slot-scope="scope">
65+
<el-tooltip v-if='scope.row.Org_ID==current.Org_ID' effect="light" content="当前机构"
66+
placement="left-start">
67+
<span class="root" icon="&#xa020">当前机构</span>
68+
</el-tooltip>
69+
</template>
70+
</el-table-column>
71+
<el-table-column label="默认机构" width="80" align="center">
72+
<template slot-scope="scope">
73+
<el-tooltip v-if='scope.row.Org_IsDefault' effect="light" content="默认机构"
74+
placement="left-start">
75+
<span class="def" icon="&#xa006">默认机构</span>
76+
</el-tooltip>
77+
</template>
78+
</el-table-column>
79+
80+
<el-table-column label="根机构" width="80" align="center">
81+
<template slot-scope="scope">
82+
<el-tooltip v-if='scope.row.Org_IsRoot' effect="light" content="根机构" placement="left-start">
83+
<span class="root" icon="&#xa003">根机构</span>
84+
</el-tooltip>
85+
</template>
86+
</el-table-column>
87+
</el-table-column>
88+
6489
<el-table-column label="二级域名" width="80" align="center">
6590
<template slot-scope="scope">
6691
<el-link :href="domainLink(scope.row.Org_TwoDomain)" target="_blank"
@@ -72,30 +97,37 @@
7297
<span v-html='scope.row.Olv_Name'></span>
7398
</template>
7499
</el-table-column>
100+
101+
<el-table-column label="状态" align="center">
102+
75103
<el-table-column label="审核" width="80" align="center">
76104
<template slot-scope="scope">
77105
<span class="el-icon-loading" v-show="loadingid==scope.row.Org_ID"></span>
78106
<el-switch v-model="scope.row.Org_IsPass" @change="changeUse(scope.row,'Org_IsPass')"
79-
v-show="loadingid!=scope.row.Org_ID" :disabled='scope.row.Org_IsRoot'>
107+
v-show="loadingid!=scope.row.Org_ID"
108+
:disabled='scope.row.Org_IsPass && (scope.row.Org_IsRoot || scope.row.Org_IsDefault)'>
80109
</el-switch>
81110
</template>
82111
</el-table-column>
83112
<el-table-column label="启用" width="80" align="center">
84113
<template slot-scope="scope">
85114
<span class="el-icon-loading" v-show="loadingid==scope.row.Org_ID"></span>
86115
<el-switch v-model="scope.row.Org_IsUse" @change="changeUse(scope.row,'Org_IsUse')"
87-
v-show="loadingid!=scope.row.Org_ID" :disabled='scope.row.Org_IsRoot'>
116+
v-show="loadingid!=scope.row.Org_ID"
117+
:disabled='scope.row.Org_IsUse && (scope.row.Org_IsRoot || scope.row.Org_IsDefault)'>
88118
</el-switch>
89119
</template>
90120
</el-table-column>
91121
<el-table-column label="显示" width="80" align="center">
92122
<template slot-scope="scope">
93123
<span class="el-icon-loading" v-show="loadingid==scope.row.Org_ID"></span>
94124
<el-switch v-model="scope.row.Org_IsShow" @change="changeUse(scope.row,'Org_IsShow')"
95-
v-show="loadingid!=scope.row.Org_ID" :disabled='scope.row.Org_IsRoot'>
125+
v-show="loadingid!=scope.row.Org_ID"
126+
:disabled='scope.row.Org_IsShow && (scope.row.Org_IsRoot || scope.row.Org_IsDefault)'>
96127
</el-switch>
97128
</template>
98129
</el-table-column>
130+
</el-table-column>
99131
<el-table-column label="操作" width="80" align="center">
100132
<template slot-scope="scope">
101133
<el-dropdown>
@@ -122,6 +154,7 @@
122154
修改
123155
</el-dropdown-item>
124156
<el-dropdown-item type="danger" icon="el-icon-delete" style="color:#F56C6C"
157+
v-if='!scope.row.Org_IsRoot && !scope.row.Org_IsDefault'
125158
@click.native='$refs.btngroup.delete(scope.row.Org_ID,{})'>
126159
删除
127160
</el-dropdown-item>

‎Sourcecode/Song.WebSite/Templates/Manage/Default/Organs/OrganModify.html

+10-4
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,17 @@
6666
</span>
6767
</el-form-item>
6868
<el-form-item label="状态" prop="Org_IsUse">
69-
<el-switch v-model="entity.Org_IsUse" :active-text="entity.Org_IsUse ? '启用' : '禁用'">
69+
<el-switch v-model="entity.Org_IsUse"
70+
:disabled='entity.Org_IsUse && (entity.Org_IsRoot || entity.Org_IsDefault)'
71+
:active-text="entity.Org_IsUse ? '启用' : '禁用'">
7072
</el-switch>
71-
<el-switch v-model="entity.Org_IsShow" :active-text="entity.Org_IsShow ? '显示' : '隐藏'">
73+
<el-switch v-model="entity.Org_IsShow"
74+
:disabled='entity.Org_IsShow && (entity.Org_IsRoot || entity.Org_IsDefault)'
75+
:active-text="entity.Org_IsShow ? '显示' : '隐藏'">
7276
</el-switch>
73-
<el-switch v-model="entity.Org_IsPass" :active-text="entity.Org_IsPass ? '通过' : '未审核'">
77+
<el-switch v-model="entity.Org_IsPass"
78+
:disabled='entity.Org_IsPass && (entity.Org_IsRoot || entity.Org_IsDefault)'
79+
:active-text="entity.Org_IsPass ? '通过' : '未审核'">
7480
</el-switch>
7581
</el-form-item>
7682
</div>
@@ -100,7 +106,7 @@
100106
<icon slot="prefix">&#xe6a2</icon>
101107
</el-input>
102108
</el-form-item>
103-
</el-row>
109+
</el-row>
104110
<el-row>
105111
<el-col :span="12">
106112
<el-form-item label="经度" prop="Org_Longitude" label-width="60px">

‎Sourcecode/Song.WebSite/Templates/Manage/Default/Organs/Scripts/List.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
//获取结果
3030
th.levels = level.data.result;
3131
th.current = current.data.result;
32+
if (th.current == null) th.current = {};
3233
th.handleCurrentChange(1);
3334
th.domain = domain.data.result;
3435
}).catch(function (err) {
@@ -65,7 +66,9 @@
6566
th.form.size = Math.floor(area / 41);
6667
$api.get("Organization/Pager", th.form).then(function (d) {
6768
if (d.data.success) {
68-
th.organs = d.data.result;
69+
let organs = d.data.result;
70+
//for (var i = 0; i < organs.length; i++)organs[i].Org_IsShow = false;
71+
th.organs = organs;
6972
th.totalpages = Number(d.data.totalpages);
7073
th.total = d.data.total;
7174
} else {

‎Sourcecode/Song.WebSite/Templates/Manage/Default/Organs/Styles/List.css

+3
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
}
55
.root{
66
color: #F56C6C;
7+
}
8+
.def::before,.root::before{
9+
font-size: 18px;
710
}

‎Sourcecode/Song.WebSite/Templates/Web/Default/Exam/Scripts/Index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ $ready(function () {
161161
return url
162162
}
163163
},
164-
template: `<card>
164+
template: `<card shadow="hover">
165165
<card-title>{{index+1}}.《{{exam.Exam_Name}}》
166166
<a type="button" :examid="exam.Exam_ID" :href="goexaming(exam)">
167167
参加考试<icon>&#xe6c6</icon>
@@ -240,7 +240,7 @@ $ready(function () {
240240
});
241241
}
242242
},
243-
template: `<card class="theme">
243+
template: `<card class="theme" shadow="hover">
244244
<card-title>{{index+1}}.《{{theme.Exam_Title}}》 </card-title>
245245
<card-context>
246246
<div class="item">参考人员：{{group}} </div>
@@ -355,7 +355,7 @@ $ready(function () {
355355
$pagebox.create(obj).open();
356356
}
357357
},
358-
template: `<card>
358+
template: `<card shadow="hover">
359359
<card-title style="cursor: pointer" @click="gourl">{{index+1}}.《{{exam.Exam_Name}}》
360360
<score :class="scoreStyle(result.Exr_ScoreFinal)">{{result.Exr_ScoreFinal}} 分</score>
361361
</card-title>

‎Sourcecode/Song.WebSite/Utilities/ElementUi/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
https://element.eleme.cn/
2-
当前版本：2.15.12
2+
当前版本：2.15.14

‎Sourcecode/Song.WebSite/Utilities/Styles/Public.css

+7
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,14 @@ a[download] {
6767
a[download]:hover {
6868
text-decoration: underline;
6969
}
70+
/*字体大小*/
71+
.large {
72+
font-size: 16px;
73+
}
7074

75+
.medium {
76+
font-size: 14px;
77+
}
7178
/*卡片*/
7279

7380
card {

0 commit comments

Comments
 (0)