diff --git a/src/assets/img/shuju/command/ico2/IS_CJ.png b/src/assets/img/shuju/command/ico2/IS_CJ.png new file mode 100644 index 000000000..eb96632f8 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_CJ.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png b/src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png new file mode 100644 index 000000000..3c310a8f4 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_ENSURE_HOUSE.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_PARTY.png b/src/assets/img/shuju/command/ico2/IS_PARTY.png new file mode 100644 index 000000000..1b0e243b2 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_PARTY.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_SD.png b/src/assets/img/shuju/command/ico2/IS_SD.png new file mode 100644 index 000000000..fcd0e3f3d Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_SD.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_SN.png b/src/assets/img/shuju/command/ico2/IS_SN.png new file mode 100644 index 000000000..f2d1d594c Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_SN.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_SPECIAL.png b/src/assets/img/shuju/command/ico2/IS_SPECIAL.png new file mode 100644 index 000000000..73c3f4db0 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_SPECIAL.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_SZ.png b/src/assets/img/shuju/command/ico2/IS_SZ.png new file mode 100644 index 000000000..6287becff Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_SZ.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png b/src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png new file mode 100644 index 000000000..8e7d24f4c Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_UNITED_FRONT.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_VETERANS.png b/src/assets/img/shuju/command/ico2/IS_VETERANS.png new file mode 100644 index 000000000..f53940e09 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_VETERANS.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png b/src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png new file mode 100644 index 000000000..de10f0747 Binary files /dev/null and b/src/assets/img/shuju/command/ico2/IS_VOLUNTEER.png differ diff --git a/src/assets/img/shuju/command/ico2/IS_YLFN.png b/src/assets/img/shuju/command/ico2/IS_YLFN.png index 353440c5c..7d41b74b6 100644 Binary files a/src/assets/img/shuju/command/ico2/IS_YLFN.png and b/src/assets/img/shuju/command/ico2/IS_YLFN.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_CJ.png b/src/assets/img/shuju/command/ico3/IS_CJ.png new file mode 100644 index 000000000..7aa5b97e4 Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_CJ.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png b/src/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png new file mode 100644 index 000000000..6abb6f35a Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_ENSURE_HOUSE.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_PARTY.png b/src/assets/img/shuju/command/ico3/IS_PARTY.png new file mode 100644 index 000000000..6e87b8d8a Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_PARTY.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_SD.png b/src/assets/img/shuju/command/ico3/IS_SD.png new file mode 100644 index 000000000..fcfee935e Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_SD.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_SN.png b/src/assets/img/shuju/command/ico3/IS_SN.png new file mode 100644 index 000000000..5426ce849 Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_SN.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_SPECIAL.png b/src/assets/img/shuju/command/ico3/IS_SPECIAL.png new file mode 100644 index 000000000..623c0a2bd Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_SPECIAL.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_SZ.png b/src/assets/img/shuju/command/ico3/IS_SZ.png new file mode 100644 index 000000000..b8f3901af Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_SZ.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png b/src/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png new file mode 100644 index 000000000..25cac2fc8 Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_UNITED_FRONT.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_VETERANS.png b/src/assets/img/shuju/command/ico3/IS_VETERANS.png new file mode 100644 index 000000000..1c453120a Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_VETERANS.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_VOLUNTEER.png b/src/assets/img/shuju/command/ico3/IS_VOLUNTEER.png new file mode 100644 index 000000000..1282f9596 Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_VOLUNTEER.png differ diff --git a/src/assets/img/shuju/command/ico3/IS_YLFN.png b/src/assets/img/shuju/command/ico3/IS_YLFN.png new file mode 100644 index 000000000..99df5c3c4 Binary files /dev/null and b/src/assets/img/shuju/command/ico3/IS_YLFN.png differ diff --git a/src/assets/scss/shuju-card.scss b/src/assets/scss/shuju-card.scss index 548f0bfbd..d62fe3e5d 100644 --- a/src/assets/scss/shuju-card.scss +++ b/src/assets/scss/shuju-card.scss @@ -80,9 +80,7 @@ min-height: 200px; background-image: url(../img/shuju/card/bg.png); background-repeat: repeat; - overflow-y: auto; height: 100%; - margin-right: -8px; @include scrollBar; } } diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue index d86706660..284b23f6a 100644 --- a/src/views/modules/visual/command/cpts/popup.vue +++ b/src/views/modules/visual/command/cpts/popup.vue @@ -261,7 +261,12 @@ -