diff --git a/src/assets/css/homeScreen.scss b/src/assets/css/homeScreen.scss index 633af72..f3181eb 100644 --- a/src/assets/css/homeScreen.scss +++ b/src/assets/css/homeScreen.scss @@ -79,7 +79,7 @@ .topBtn { display: flex; position: absolute; - top: 15%; + top: 22px; .topBtn-item { width: 190px; height: 38px; @@ -99,7 +99,7 @@ } .topBtn-left { - left: 35px; + left: 30px; font-size: 12px; .text { font-family: "YSBTH"; diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue index 7baf28b..d438bad 100644 --- a/src/components/aboutTable/FormMessage.vue +++ b/src/components/aboutTable/FormMessage.vue @@ -7,7 +7,7 @@ - + diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue index 93e921c..ed1a363 100644 --- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue +++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/components/editAddForm.vue @@ -41,14 +41,16 @@ const formData = reactive([ { label: "标签代码", prop: "bqDm", type: "input" }, { label: "标签等级", prop: "bqDj", type: "select", options: [] }, { label: "标签颜色", prop: "bqYs", type: "select", options: [] }, - { label: "标签分值", prop: "bqFz", type: "inputNumber" }, + { label: "标签分值", prop: "bqFz", type: "number" ,max:100}, { label: "标签说明", prop: "bqSm", type: "textarea",width: '100%' }, ]); const rules = reactive({ bqMc: [{ required: true, message: "请输入标签名称", trigger: "blur" }], bqDm: [{ required: true, message: "请输入标签代码", trigger: "blur" }], - bqDlMc: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }], + bqDj: [{ required: true, message: "请选择标签等级", trigger: ['blur','change'] }], + bqYs: [{ required: true, message: "请选择标签颜色", trigger: ['blur','change'] }], + bqFz: [{ required: true, message: "请输入标签分值", trigger: ['blur','change'] }], }); watchEffect(()=>{ diff --git a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue index 6892840..22760d9 100644 --- a/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/BehaviorLabels/index.vue @@ -28,12 +28,6 @@ :controlsWidth="pageData.controlsWidth" @chooseData="chooseData" > - - @@ -77,7 +71,7 @@ const searchBox = ref(); //搜索框 const type = ref('标签大类') const searchConfiger = ref([ - { label: "标签名称",prop:'bqMc',placeholder: "请输入学校名称", showType: "input"}, + { label: "标签名称",prop:'bqMc',placeholder: "请输入标签名称", showType: "input"}, { label: "标签等级",prop:'bqDj' ,placeholder: "请选择标签等级", showType: "select",options:D_GS_BQ_DJ }, { label: "标签颜色",prop:'bqYs' ,placeholder: "请选择标签颜色", showType: "select",options:D_GS_SSYJ }, ]); @@ -99,8 +93,6 @@ const pageData = reactive({ tableColumn: [ { label: "标签名称", prop: "bqMc" }, { label: "标签代码", prop: "bqDm" }, - { label: "标签类型", prop: "bqLx",showSolt:true }, - { label: "标签类别", prop: "bqLb",showSolt:true }, { label: "标签等级", prop: "bqDj",showSolt:true}, { label: "标签颜色", prop: "bqYs",showSolt:true}, ] @@ -119,8 +111,8 @@ const chooseListType = (val) => { pageData.tableColumn = pageData.tableColumn.filter((it) => it.prop != "bqDlMc"); break; case '标签细类': - let obj = { label: "标签大类名称", prop: "bqDlMc" }; - pageData.tableColumn.splice(3, 0, obj); + let obj = { label: "标签大类", prop: "bqDlMc" }; + pageData.tableColumn.unshift(obj); break; } pageData.keyCount++; diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue index 8d14e05..ba34a91 100644 --- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue +++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/components/editAddForm.vue @@ -41,14 +41,16 @@ const formData = reactive([ { label: "标签代码", prop: "bqDm", type: "input" }, { label: "标签等级", prop: "bqDj", type: "select", options: [] }, { label: "标签颜色", prop: "bqYs", type: "select", options: [] }, - { label: "标签分值", prop: "bqFz", type: "inputNumber" }, + { label: "标签分值", prop: "bqFz", type: "number" ,max:100}, { label: "标签说明", prop: "bqSm", type: "textarea",width: '100%' }, ]); const rules = reactive({ bqMc: [{ required: true, message: "请输入标签名称", trigger: "blur" }], bqDm: [{ required: true, message: "请输入标签代码", trigger: "blur" }], - bqDlMc: [{ required: true, message: "请输入标签大类", trigger: ['blur','change'] }], + bqDj: [{ required: true, message: "请选择标签等级", trigger: ['blur','change'] }], + bqYs: [{ required: true, message: "请选择标签颜色", trigger: ['blur','change'] }], + bqFz: [{ required: true, message: "请输入标签分值", trigger: ['blur','change'] }], }); watchEffect(()=>{ diff --git a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue index 407bd09..3f12107 100644 --- a/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/IdentityManage/index.vue @@ -28,12 +28,6 @@ :controlsWidth="pageData.controlsWidth" @chooseData="chooseData" > - - @@ -76,7 +70,7 @@ const searchBox = ref(); //搜索框 const type = ref('标签大类') const searchConfiger = ref([ - { label: "标签名称",prop:'bqMc',placeholder: "请输入学校名称", showType: "input"}, + { label: "标签名称",prop:'bqMc',placeholder: "请输入标签名称", showType: "input"}, { label: "标签等级",prop:'bqDj' ,placeholder: "请选择标签等级", showType: "select",options:D_GS_BQ_DJ }, { label: "标签颜色",prop:'bqYs' ,placeholder: "请选择标签颜色", showType: "select",options:D_GS_SSYJ }, ]); @@ -98,8 +92,6 @@ const pageData = reactive({ tableColumn: [ { label: "标签名称", prop: "bqMc" }, { label: "标签代码", prop: "bqDm" }, - { label: "标签类型", prop: "bqLx",showSolt:true }, - { label: "标签类别", prop: "bqLb",showSolt:true }, { label: "标签等级", prop: "bqDj",showSolt:true}, { label: "标签颜色", prop: "bqYs",showSolt:true}, ] @@ -118,8 +110,8 @@ const chooseListType = (val) => { pageData.tableColumn = pageData.tableColumn.filter((it) => it.prop != "bqDlMc"); break; case '标签细类': - let obj = { label: "标签大类名称", prop: "bqDlMc" }; - pageData.tableColumn.splice(3, 0, obj); + let obj = { label: "标签大类", prop: "bqDlMc" }; + pageData.tableColumn.unshift(obj); break; } pageData.keyCount++; diff --git a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue index fdda434..3acd139 100644 --- a/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue +++ b/src/views/backOfficeSystem/fourColorManage/tagManage/index.vue @@ -2,7 +2,7 @@
- + 新增 @@ -39,7 +39,6 @@