diff --git a/src/assets/css/element-plus.scss b/src/assets/css/element-plus.scss index 3438eae..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; } } @@ -240,7 +240,7 @@ } ::v-deep .el-date-editor .el-range-separator { - color: #fcfcfc; + color: #333; } ::v-deep .el-input.is-disabled .el-input__inner { diff --git a/src/assets/css/layout.scss b/src/assets/css/layout.scss index ff6f68d..295a4ef 100644 --- a/src/assets/css/layout.scss +++ b/src/assets/css/layout.scss @@ -263,6 +263,8 @@ right: 0px; left: 0px; background: #fff; + padding: 0 10px 10px; + box-sizing: border-box; } } } 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/AnnualInspectionTraining/components/detailForm.vue b/src/views/Training/AnnualInspectionTraining/components/detailForm.vue index f9d26db..c386c52 100644 --- a/src/views/Training/AnnualInspectionTraining/components/detailForm.vue +++ b/src/views/Training/AnnualInspectionTraining/components/detailForm.vue @@ -7,9 +7,43 @@
- - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
培训保安人员
import MyTable from "@/components/aboutTable/MyTable.vue"; import { qcckPost , qcckGet} from "@/api/qcckApi.js"; -import FormMessage from "@/components/aboutTable/FormMessage.vue"; import { ref, reactive,defineEmits,getCurrentInstance } from 'vue'; const emit = defineEmits(["refresh"]); const dialogForm = ref(false); -const FormRef = ref(); -const listQuery = ref({}); -const formList = reactive([ - [ - { label: "培训日期", prop: "pxrq", type: "input" }, - { label: "培训时间", prop: "pxsj", type: "input" }, - { label: "课程名称", prop: "kcmc", type: "input" }, - ], - [ - { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, - { label: "培训内容", prop: "pxnr", type: "input" }, - ], - { label: "分割线", prop: "diver", type: "slot" }, - [ - { label: "培训日期", prop: "pxrq", type: "input" }, - { label: "培训时间", prop: "pxsj", type: "input" }, - { label: "课程名称", prop: "kcmc", type: "input" }, - ], - [ - { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, - { label: "培训内容", prop: "pxnr", type: "input" }, - ], - { label: "分割线", prop: "diver", type: "slot" }, - [ - { label: "培训日期", prop: "pxrq", type: "input" }, - { label: "培训时间", prop: "pxsj", type: "input" }, - { label: "课程名称", prop: "kcmc", type: "input" }, - ], - [ - { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, - { label: "培训内容", prop: "pxnr", type: "input" }, - ], - -]) - +const listQuery = ref({pxkcList:[]}); const pageData = reactive({ tableData: [], keyCount: 0, @@ -84,17 +80,19 @@ const pageData = reactive({ ] }); - // 初始化数据 const init = async (type, id) => { dialogForm.value = true; - const res = await qcckGet({ url: `/mosty-base/baxx/njpx/getInfo/${id}`}) - listQuery.value = res || {} + const res = await qcckGet({},`/mosty-base/baxx/njpx/getInfo/${id}`) + console.log(res,'========='); + listQuery.value.pxkcList = res.pxkcList || [] + pageData.tableData = res.pxryList || [] }; const close = () => { dialogForm.value = false; - FormRef.value.reset() + listQuery.value.pxkcList = [] + pageData.tableData = [] };; defineExpose({init}) 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/SecurityTrainingSyllabus/components/detailForm.vue b/src/views/Training/SecurityTrainingSyllabus/components/detailForm.vue index 5804e1e..755e493 100644 --- a/src/views/Training/SecurityTrainingSyllabus/components/detailForm.vue +++ b/src/views/Training/SecurityTrainingSyllabus/components/detailForm.vue @@ -46,7 +46,7 @@ const formList = reactive([ { label: "教学目标", prop: "jxmb", type: "input" }, ], [ - { label: "学时安排", prop: "gksc", type: "number" }, + { label: "学时安排", prop: "gksc", type: "input" }, ], [ { label: "上传附件", prop: "fj", type: "upload" }, 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/viewAndUploadDialog.vue b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue index 4136888..350315c 100644 --- a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue +++ b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue @@ -73,12 +73,13 @@ const handleClose = () => { const handleSubmit = async () => { try { loading.value = true - await FormRef.value.submit() - const { pxryid = "" } = formData.value - await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`) - proxy.$message.success('上传成绩成功') - emits('refresh') - visible.value = false + await FormRef.value.submit(async () => { + const { pxryid = "" } = formData.value + await qcckPost({ ...formData.value, pxryid }, `mosty/base/baxx/pxry/lrcj`) + proxy.$message.success('上传成绩成功') + emits('refresh') + visible.value = false + }) } catch (error) { console.log(error) proxy.$message.error('上传成绩失败') diff --git a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue index a3cd8b0..e4f362e 100644 --- a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue +++ b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue @@ -27,8 +27,8 @@ >