Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/api/common/dict/data.ts

@@ -20,7 +20,7 @@ export function useDict(...args: string[]): ToRefs<any> {
   args.forEach((d: string) => {
     res.value[d] = [];
     getDicts(d).then(resp => {
-      res.value[d] = (resp.list || []).map((p: any) => ({ label: p.dictLabel, value: p.dictValue, isDefault: p.isDefault }))
+      res.value[d] = (resp.list || []).map((p: any) => ({ label: p.dictLabel, value: p.dictValue, isDefault: p.isDefault,status:p.status,remark:p.remark }))
     })
   })
   return toRefs(res.value);

src/views/iot/alarm/setting/index.vue

@@ -93,7 +93,7 @@
 													</div>
 												</div>
 												<div>
-													<label>属性上报</label>
+													<label>{{item.triggerTypeName}}</label>
 													<div class="">
 														<div>{{ item.alarmLevel.name }}</div>
 													</div>
@@ -373,8 +373,8 @@ export default defineComponent({
 }
 .pro-table-card-item .card-item-body .card-item-header {
 	display: flex;
-	width: calc(100% - 86px);
 	margin-bottom: 12px;
+	margin-top: 10px;
 }
 .pro-table-card-item .card-item-body .card-item-content {
 	display: flex;
@@ -382,9 +382,7 @@ export default defineComponent({
 	font-weight: bolder;
 	line-height: 25px;
 }
-.pro-table-card-item .card-item-body .card-item-content > div {
-	width: 30%;
-}
+
 .ellipsis {
 	display: -webkit-box;
 	overflow: hidden;

src/views/iot/noticeservices/config/setting.vue

@@ -309,7 +309,7 @@ export default defineComponent({
 .ant-card {
 	box-sizing: border-box;
 	margin: 10px;
-	width: 97%;
+	width: 98%;
 	font-size: 14px;
 	font-variant: tabular-nums;
 	border: 1px solid var(--next-border-color-light);

src/views/iot/noticeservices/config/template.vue

@@ -305,7 +305,7 @@ export default defineComponent({
 .ant-card {
 	box-sizing: border-box;
 	margin: 10px;
-	width: 97%;
+	width: 98%;
 	font-size: 14px;
 	font-variant: tabular-nums;
 	border: 1px solid var(--next-border-color-light);