From 66e5d9d7093887973bd07790441e24522be1911e Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Wed, 9 Mar 2022 06:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/an-tj.png                   | Bin 0 -> 1220 bytes
 .../materialContent/materialList/index.vue    |   4 +-
 .../publishContent/urgentMessage/index.vue    | 102 +++++++++++++++++-
 3 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 src/assets/images/an-tj.png

diff --git a/src/assets/images/an-tj.png b/src/assets/images/an-tj.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6afc496945563c8fb34a149469a6f8e49daa1f3
GIT binary patch
literal 1220
zcmeAS@N?(olHy`uVBq!ia0vp^T0kty!3HD^-q$DtDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49seoArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMXl$WiZmDNz
zYH49)qN8ABU}&aqV5x6tqHADiWngJ#V5k5EN<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo
z<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe#mX=fTvCgZi!uvJGV}8kKqe+8
z<(HP&Dgj*z@j`9^+}ONgXfOc-Our(rK;KZ$0OTc@LSJ9}N^^7Js*6j4QW5UOYH)E#
zWkITbP-=00X;CsT;?k5sRuxz|7o{ea<QIkH=jXseF(4zqB)>Q#zd*s+85C;f3L4>=
zc`5nj#hPF}zP?tTdBr7(dC94sF1AWQQ}i-3Q>+Y~&CQIRoXjjuO-v09U7a1>Ox;|K
zTwPs^U5!nQoef}mUGkGlb5rw5V0u#!dd+d_1to{v0-((<sYRJ(sVQzn`MC;UZ(C*J
zc8dv4^PqZDaJ$76r(S)aWAs6hixk-~Az%suG2uxU$bl#R)I4B{F9Ig*yN5qbVqjo2
z@pN$vskn7z`u?m#0V2oxAF*EieqzGLyD?YJ`l?QtX0>zrH%}Rsa&ca%5B}!cZ!L{B
zPWxahqPX;BxgO_{g3X*ezc=eYe{yH`9C`E8o=?j^xrqp$nXdBhXiT-sKc?~tw^v-f
zyfxz3nYf+%6~fmAe&VaFcjdYGxZ{p+_gQ|;kidqhih`~v|7%NLE_*oF@p7|g)lv2*
z?+@Lcw`svunH|jR1^uUlzw<46zA%{O)gik(OFkXtsrzD5@OgomP57LGnMu<u6W;2)
z;K`d%m!*;;w1u_YGrm-L`~9Q~f-lz#HgDr)$TeP(%CO?-f<p`efvUzLGnuN4SihVW
zxv-RT!Tdx2e_WIO!nA)<nzKio&Bwl@Rr0TRs-A5Wo=|u3!J1~i56uy8&2A?7GH=j6
mGygkBb<)nzf5v~g4H(w4?wGxk?ZPflx#H>S=d#Wzp$PyNu(2cn

literal 0
HcmV?d00001

diff --git a/src/views/materialContent/materialList/index.vue b/src/views/materialContent/materialList/index.vue
index 02e9a1f..d72a64a 100644
--- a/src/views/materialContent/materialList/index.vue
+++ b/src/views/materialContent/materialList/index.vue
@@ -207,7 +207,7 @@ export default {
   name: 'MaterialList',
   components: {},
   cruds() {
-    return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser } })
+    return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   props: {
@@ -292,7 +292,7 @@ export default {
       }
     }
   },
-  mounted: function () {
+  mounted: function() {
     this.start()
   },
   methods: {
diff --git a/src/views/publishContent/urgentMessage/index.vue b/src/views/publishContent/urgentMessage/index.vue
index 30d7fe6..1d1564d 100644
--- a/src/views/publishContent/urgentMessage/index.vue
+++ b/src/views/publishContent/urgentMessage/index.vue
@@ -120,10 +120,35 @@
             ]"
           >
             <el-radio-group v-model="form.deviceSelect">
-              <el-radio label="所有设备" value="all" />
-              <el-radio label="部分设备" value="other" />
+              <el-radio label="all" value="all">所有设备</el-radio>
+              <el-radio label="other" value="other">部分设备<i class="radio_tip">添加</i></el-radio>
             </el-radio-group>
           </el-form-item>
+          <div v-if="form.deviceSelect === 'all'" class="select_all_tip">所有设备都将被发送</div>
+          <div v-if="form.deviceSelect === 'other'" class="select_other">
+            <el-row>
+              <el-col :span="10" class="other_tip">以下设备都将被发送<span>总计2个设备</span></el-col>
+              <el-col :span="4">
+                <el-button
+                  type="primary"
+                  round
+                  class="edit_btn"
+                >编辑</el-button>
+                <el-button round class="delt_btn">清空</el-button>
+              </el-col>
+            </el-row>
+            <el-tag
+              v-for="tag in dynamicTags"
+              :key="tag"
+              closable
+              :disable-transitions="true"
+              :hit="false"
+              color="#cbe3ff"
+              @close="handleClose(tag)"
+            >
+              {{ tag }}
+            </el-tag>
+          </div>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button :loading="crud.status.cu === 2" type="primary" round @click="crud.submitCU">保存</el-button>
@@ -176,7 +201,8 @@ export default {
           enabled: false,
           date: '2021-2-2 16:00'
         }
-      ]
+      ],
+      dynamicTags: ['GCXR1', 'GCXR2', 'GCXR3']
     }
   },
   methods: {
@@ -194,6 +220,9 @@ export default {
         this.clearBtnDisabled = true
       }
       console.log(val)
+    },
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1)
     }
   }
 }
@@ -206,4 +235,71 @@ export default {
     color: #3a8aeb;
   }
 }
+::v-deep .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,.14);
+}
+.select_other{
+  width: 600px;
+  margin: -20px 0 0 100px;
+  padding: 18px 23px;
+  background: #f8f8f8;
+  border: 1px solid #dcdde3;
+  border-radius: 4px;
+  .other_tip{
+    line-height: 24px;
+    span{
+      display: inline-block;
+      margin-left: 20px;
+    }
+  }
+  .el-button {
+    padding: 5px 8px;
+    border: none !important;
+  }
+  .delt_btn {
+    color: #fff;
+    background-color: #ee5747 !important;
+  }
+  .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;
+    }
+  }
+}
+
 </style>