diff --git a/src/assets/css/element-plus.scss b/src/assets/css/element-plus.scss
index 3438eae..eaf1d1d 100644
--- a/src/assets/css/element-plus.scss
+++ b/src/assets/css/element-plus.scss
@@ -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/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/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" },