diff --git a/src/assets/css/element-plus.scss b/src/assets/css/element-plus.scss
index eaf1d1d..c428d04 100644
--- a/src/assets/css/element-plus.scss
+++ b/src/assets/css/element-plus.scss
@@ -13,16 +13,16 @@
}
::v-deep .el-input__inner {
- background-color: #fff;
- border: 1px solid #e9e9e9 !important;
+ // background-color: #fff;
+ // border: 1px solid #e9e9e9 !important;
&:hover {
- border: 1px solid #0065d8;
+ // border: 1px solid #0065d8;
}
&:focus {
- border: 1px solid #1c84fa;
- box-shadow: 0px 0px 8px #0a6bfc;
+ // border: 1px solid #1c84fa;
+ // box-shadow: 0px 0px 8px #0a6bfc;
}
}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8ee4c59..26a57cc 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -97,14 +97,6 @@ div:focus {
border-color: rgb(8, 85, 170);
}
-::v-deep {
- .el-input__inner, .el-input__inner:hover, .el-input__inner:focus {
- border: none !important;
- box-shadow: none;
- background-color: transparent;
- }
-}
-
.new-btn-class-bj {
color: #409eff;
margin-right: 10px;
@@ -117,4 +109,12 @@ div:focus {
}
.new-btn-class-sc:hover {
border-bottom: 1px solid #f56c6c;
+}
+
+::v-deep {
+ .el-input__inner, .el-input__inner:hover, .el-input__inner:focus {
+ border: none !important;
+ box-shadow: none;
+ background-color: transparent;
+ }
}
\ No newline at end of file
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 68e8d34..4c89708 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -17,7 +17,7 @@ export function getDict(...args) {
getSysDictByCode({
dictCode: d
}).then(result => {
- result.itemList.forEach(p => {
+ result?.itemList?.forEach(p => {
p.label = p.zdmc
p.value = p.dm
p.id = p.dm
@@ -27,7 +27,7 @@ export function getDict(...args) {
}
p.children = p.itemList
})
- res.value[d] = result.itemList
+ res.value[d] = result?.itemList
})
})
return toRefs(res.value);
@@ -66,9 +66,9 @@ export function setCascader(id, array, childDeptList = 'childDeptList', fun) {
}
/**
* 当type=1时获取出生日期,type=2时获取性别,type=3时获取年龄 all
- * @param {*} IdCard
- * @param {*} type
- * @returns
+ * @param {*} IdCard
+ * @param {*} type
+ * @returns
*/
export function IdCard(IdCard, type) {
let user = {
diff --git a/src/views/Training/SecurityQuestionBank/components/detailForm.vue b/src/views/Training/SecurityQuestionBank/components/detailForm.vue
index 7bbf148..5be5d6d 100644
--- a/src/views/Training/SecurityQuestionBank/components/detailForm.vue
+++ b/src/views/Training/SecurityQuestionBank/components/detailForm.vue
@@ -22,7 +22,7 @@ import { ref, reactive,defineEmits,getCurrentInstance } from 'vue';
const emit = defineEmits(["refresh"]);
const { proxy } = getCurrentInstance();
-const { D_BAXX_KTLX } = proxy.dict("D_BAXX_KTLX");
+const { D_BAXX_KTLX } = proxy.$dict("D_BAXX_KTLX");
const dialogForm = ref(false);
const title = ref('');
@@ -45,7 +45,7 @@ const rules = reactive({
const formList = reactive([
[
- { label: "题型", prop: "type", type: "select", options: D_BAXX_KTLX },
+ { label: "题型", prop: "type", type: "select", options: D_BAXX_KTLX, },
{ label: "题目", prop: "tm", type: "input" },
],
[
diff --git a/src/views/Training/SecurityQuestionBank/index.vue b/src/views/Training/SecurityQuestionBank/index.vue
index b11770f..aee65fa 100644
--- a/src/views/Training/SecurityQuestionBank/index.vue
+++ b/src/views/Training/SecurityQuestionBank/index.vue
@@ -35,7 +35,7 @@
}">
-
+
@@ -49,7 +49,6 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
const { proxy } = getCurrentInstance();
-const { D_BAXX_KTLX } = proxy.$dict("D_BAXX_KTLX")
const detailDiloag = ref();
const searchBox = ref(); //搜索框
const baseUrl = 'data:image/jpeg;base64,'
diff --git a/src/views/Training/SecurityTrainingVideo/components/detailForm.vue b/src/views/Training/SecurityTrainingVideo/components/detailForm.vue
index 0f0e9b5..e235ab2 100644
--- a/src/views/Training/SecurityTrainingVideo/components/detailForm.vue
+++ b/src/views/Training/SecurityTrainingVideo/components/detailForm.vue
@@ -8,8 +8,7 @@
-
-
+
diff --git a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
index a3cd8b0..1e9f8ba 100644
--- a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
+++ b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
@@ -27,8 +27,8 @@
>
- 申请证件
-
+ 申请证件
+
上传成绩
查看成绩
@@ -96,9 +96,9 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "证件号码", prop: "sfzh" },
{ label: "联系方式", prop: "lxdh" },
- { label: "线上培训时间", prop: "sfzh" },
- { label: "线下培训课程", prop: "lxdh" },
- { label: "考试成绩", prop: "lxdh" },
+ { label: "线上培训时间", prop: "" },
+ { label: "线下培训课程", prop: "" },
+ { label: "考试成绩", prop: "ksfs" },
]
});
@@ -109,7 +109,7 @@ const close = () => {
}
// 根据项目id获取培训人员
-const getList = async ({ id = "" }) => {
+const getList = async ({ id = "" }, type = '') => {
const res = await qcckPost({
...pageData.pageConfiger,
// sfcjpx: 1,
@@ -118,11 +118,12 @@ const getList = async ({ id = "" }) => {
if (res) {
pageData.tableData = res.records || [];
pageData.total = res.total;
+ if (!type) emits("refresh");
}
}
const open = (row = {}, type = 'add') => {
- getList(row)
+ getList(row, type)
disabled.value = false
dialogVisible.value = true
formData.value = { ...row }
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
index 55b5696..4b156fe 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@@ -39,7 +39,7 @@ const props = defineProps({
}
})
-const emits = defineEmits(['update:modelValue'])
+const emits = defineEmits(['update:modelValue', 'refresh'])
const dialogVisible = computed({
get() {
@@ -66,7 +66,8 @@ const formList = reactive([
{ label: "身份证反面", prop: "ryzpfm", type: "upload", limit: 1 },
],
[
- { label: "体检报告", prop: "", type: "upload", limit: 1 },
+ { label: "体检报告", prop: "tjbg", type: "upload", limit: 3 },
+ { label: "上传资料", prop: "zl", type: "upload", limit: 3, },
],
[
{ label: "无犯罪记录证明", prop: "wfzzmjl", type: "upload", limit: 1 },
@@ -76,7 +77,7 @@ const formList = reactive([
const rules = {
ryzpzm: [{ required: true, message: "请上传身份证正面", trigger: "change" }],
ryzpfm: [{ required: true, message: "请上传身份证反面", trigger: "change" }],
- // tjbj: [{ required: true, message: "请上传体检报告", trigger: "change" }],
+ tjbg: [{ required: true, message: "请上传体检报告", trigger: "change" }],
wfzzmjl: [{ required: true, message: "请上传无犯罪记录证明", trigger: "change" }],
xm: [{ required: true, message: "请输入姓名", trigger: "change" }],
zjhm: [
@@ -122,11 +123,11 @@ const rules = {
const formData = ref({})
const close = () => {
+ FormRef.value?.reset()
dialogVisible.value = false
}
const open = (row = {}, type = 'add') => {
- FormRef.value?.reset()
disabled.value = false
dialogVisible.value = true
formData.value = { ...row }
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
index c6843b3..1ff7add 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue
@@ -10,9 +10,12 @@