diff --git a/.eslintrc.js b/.eslintrc.js index 591320c..e30339f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,8 +10,6 @@ module.exports = { es6: true, }, extends: ['plugin:vue/recommended', 'eslint:recommended'], - - rules: { "vue/max-attributes-per-line": [2, { "singleline": 10, diff --git a/package.json b/package.json index 8f140ab..df5337a 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "vue-image-crop-upload": "^2.5.0", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", - "vuedraggable": "2.20.0", + "vuedraggable": "^2.24.3", "vuex": "3.1.0", "wangeditor": "^3.1.1", "xlsx": "^0.17.1" diff --git a/src/assets/images/num_bg1.png b/src/assets/images/num_bg1.png new file mode 100644 index 0000000..34fbee3 Binary files /dev/null and b/src/assets/images/num_bg1.png differ diff --git a/src/assets/images/num_bg2.png b/src/assets/images/num_bg2.png new file mode 100644 index 0000000..f332781 Binary files /dev/null and b/src/assets/images/num_bg2.png differ diff --git a/src/assets/styles/adminIndex.scss b/src/assets/styles/adminIndex.scss index 634afc6..cf8b340 100644 --- a/src/assets/styles/adminIndex.scss +++ b/src/assets/styles/adminIndex.scss @@ -37,7 +37,7 @@ img { cursor: pointer; - vertical-align: middle + vertical-align: middle; } span { @@ -108,7 +108,7 @@ .delt_btn { background-color: #ee5747 !important; } - + .start_btn { background-color: #3a8aeb !important; } @@ -121,7 +121,7 @@ background: linear-gradient(to right, #fc8c6f, #fa544e) !important; } - .top_btn{ + .top_btn { background-color: #2cca8c !important; } @@ -129,18 +129,18 @@ background-color: #a7acae !important; } } -.el-dialog{ - margin-top: 0 !important; - top: 50%; - transform: translateY(-50%); - -webkit-transform: translateY(-50%); - -moz-transform: translateY(-50%); - -ms-transform: translateY(-50%); - -o-transform: translateY(-50%); +.el-dialog { + margin-top: 0 !important; + top: 50%; + transform: translateY(-50%); + -webkit-transform: translateY(-50%); + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -o-transform: translateY(-50%); } .el-dialog__body { - max-height: 70vh !important; - overflow-y: auto; + max-height: 70vh !important; + overflow-y: auto; .el-form-item { margin-bottom: 24px; } @@ -337,5 +337,113 @@ height: 1px; } } +.el-range-editor--small { + .el-range-separator { + width: 24px; + } +} +// 选择设备 +.step_form, +.publish_layer { + .el-radio-group { + display: block; + .el-radio { + position: relative; + line-height: 40px; + .radio_tip { + position: absolute; + right: -45px; + top: 0; + display: block; + width: 42px; + height: 21px; + line-height: 21px; + font-size: 12px; + text-align: center; + color: #fff; + background: url(~@/assets/images/an-tj.png) no-repeat; + background-size: 42px 21px; + } + } + } + .select_all_tip { + width: 336px; + height: 32px; + line-height: 32px; + margin: -20px 0 0 100px; + padding: 0 14px; + font-size: 12px; + color: #999; + background: #fff; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.14); + } + .select_other { + width: 600px; + margin: -20px 0 0 100px; + padding: 18px 23px; + background: #f8f8f8; + border: 1px solid #dcdde3; + border-radius: 4px; + font-size: 14px; + .other_tip { + line-height: 34px; + span { + display: inline-block; + margin-left: 20px; + } + } + .el-button { + padding: 5px 8px; + border: none !important; + } + .delt_btn { + color: #fff; + background-color: #ee5747 !important; + } + } +} +.step_form, +.publish_layer, +.add_device_layer { + .el-tag--small { + height: 28px; + line-height: 26px; + padding: 0 24px; + margin: 18px 16px 0 0; + font-size: 14px; + // color: #3a8aeb; + ::v-deep .el-icon-close { + font-size: 16px; + } + } +} +.add_device_layer { + .el-dialog__body { + padding: 0 20px 30px 20px; + } +} -// end \ No newline at end of file +// 弹框右上角多按钮且关闭X出框 +.upload_layer { + .el-dialog__headerbtn { + right: -60px; + .el-dialog__close { + color: #fff; + font-size: 26px; + } + } + .upload_list_right { + position: absolute; + right: 24px; + top: 24px; + display: flex; + font-size: 14px; + font-weight: bold; + color: #3a8aeb; + .upload_return { + margin-left: 16px; + cursor: pointer; + } + } +} +// end diff --git a/src/views/immediateRelease/index.vue b/src/views/immediateRelease/index.vue index 8317ffa..6ad89a6 100644 --- a/src/views/immediateRelease/index.vue +++ b/src/views/immediateRelease/index.vue @@ -1,99 +1,476 @@ diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue index 1c5243e..dd0a818 100644 --- a/src/views/materialContent/materialList/index.vue +++ b/src/views/materialContent/materialList/index.vue @@ -482,28 +482,6 @@ export default { width: 128px; height: 120px; } -.upload_layer { - ::v-deep .el-dialog__headerbtn { - right: -60px; - .el-dialog__close { - color: #fff; - font-size: 26px; - } - } - .upload_list_right { - position: absolute; - right: 24px; - top: 24px; - display: flex; - font-size: 14px; - font-weight: bold; - color: #3a8aeb; - .upload_return { - margin-left: 16px; - cursor: pointer; - } - } -} .multi_handle { position: fixed; diff --git a/src/views/publishContent/publishList/index.vue b/src/views/publishContent/publishList/index.vue index 7617fd1..0a5c770 100644 --- a/src/views/publishContent/publishList/index.vue +++ b/src/views/publishContent/publishList/index.vue @@ -22,19 +22,26 @@ - + - + @@ -84,20 +96,20 @@ label="发布名称" prop="name" :rules="[ - { required: true, message: '请输入发布名称', trigger: '' } + { required: true, message: '请输入发布名称', trigger: '' }, ]" > - + -
- +
+