Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

packages/device/AppMediaManage/components/Play.vue

@@ -46,7 +46,7 @@
             </el-form-item>
             <el-form-item label="开始日期" prop="startDate" v-if="formData.taskType != 0">
               <el-date-picker v-model="formData.startDate" type="date" placeholder="选择日期" size="small"
-                              value-format="yyyy-MM-dd"></el-date-picker>
+                              value-format="yyyy-MM-dd" :picker-options="{disabledDate}"/>
             </el-form-item>
             <el-form-item label="开始时间" prop="startTime" v-if="formData.taskType != 0">
               <el-time-picker v-model="formData.startTime" placeholder="开始时间" size="small"
@@ -59,7 +59,8 @@
                               value-format="HH:mm:ss"></el-time-picker>
             </el-form-item>
             <el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;">
-              <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
+              <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name"
+                               :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
                                @select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
             </el-form-item>
           </el-form>
@@ -188,8 +189,8 @@ export default {
 
   watch: {
     userAreaId: {
-      handler: function(v) {
+      handler: function (v) {
-        this.areaRootId = [v?.substr(0,6),'000000'].join("")
+        this.areaRootId = [v?.substr(0, 6), '000000'].join("")
       },
       deep: true
     }
@@ -204,7 +205,8 @@ export default {
   },
   methods: {
     // 选择设备
-    getSelect() {},
+    getSelect() {
+    },
     getMediaList() {
       return this.instance.post(`/app/appdlbresource/list?current=1&size=10000`).then((res) => {
         if (res?.data) {
@@ -232,7 +234,7 @@ export default {
 
     // 播放
     confirm() {
-      if(!this.areaId) {
+      if (!this.areaId) {
         this.$message.error('请选择所要播放设备的行政区划！')
       }
       this.$refs['ruleForm'].validate((valid) => {
@@ -286,6 +288,9 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
+    disabledDate(time) {
+      return new Date(time).getTime() - new Date().getTime() < -24 * 60 * 60 * 1000
+    }
   },
 }
 </script>
@@ -294,6 +299,7 @@ export default {
 .Play {
   .equipment {
     position: relative;
+
     .select {
       position: absolute;
       right: 0;
@@ -315,11 +321,13 @@ export default {
     display: flex;
     width: 100%;
     height: 100%;
+
     .item {
       flex: 1;
       display: inline-block;
       height: auto;
       border: 1px solid #DDD;
+
       .title {
         display: flex;
         justify-content: space-between;
@@ -328,10 +336,12 @@ export default {
         height: 50px;
         align-items: center;
         border-bottom: 1px solid #DDD;
+
         .checkBox {
           align-self: center;
         }
       }
+
       .content {
         padding: 10px;
         box-sizing: border-box;

project/fengdu/app/AppIntegralStatistics/AppIntegralStatistics.vue

@@ -18,7 +18,7 @@
             <el-tooltip
               placement="right"
               style="width: 16px;"
-              content="截止目前所有网格员剩余可用积分余额的总和">
+              content="截止目前所有居民剩余可用积分余额的总和">
               <i class="el-icon-warning-outline"></i>
             </el-tooltip>
           </h2>

ui/packages/basic/AiTableSelect.vue

@@ -62,11 +62,12 @@
   </section>
 </template>
 
-<script>
+<script>/**
-/**
  * 智能列表选择器
  * @displayName AiTableSelect
  */
+import {ID} from "../../lib/js/utils";
+
 export default {
   name: "AiTableSelect",
   model: {
@@ -143,7 +144,7 @@ export default {
   methods: {
     getExtra(row) {
       let {extra} = this
-      return extra ? row[extra] : this.idCardNoUtil.hideId(row.idNumber)
+      return extra ? row[extra] : ID.hideId(row.idNumber)
     },
     initValue() {
       let unwatch = this.$watch('value', (v) => {
@@ -195,8 +196,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.AiTableSelect {
-:deep(.AiTableSelect) {
   .el-row {
     width: 100%;
 
@@ -222,12 +222,6 @@ export default {
     padding-right: 0;
   }
 
-  .newPagination {
-    height: 32px;
-    padding: 0 !important;
-    margin-top: 8px;
-  }
-
   .ai-table__cell {
     .el-button--text {
       padding: 0 8px;
@@ -235,22 +229,30 @@ export default {
     }
   }
 
-}
+  :deep(.ai-table) {
-
+    .ai-table__header {
-:deep(.ai-table__header) {
       & > .cell {
         display: flex !important;
         align-items: center !important;
         justify-content: space-between !important;
       }
-}
+    }
 
-:deep(.ai-table .el-table__header tr th:first-child .cell) {
+    .el-table__header tr th:first-child .cell, .el-table__body tr td:first-child .cell {
       padding-left: 20px !important;
-}
+    }
+  }
 
-:deep(.ai-table .el-table__body tr td:first-child .cell ) {
+  :deep(.newPagination) {
-  padding-left: 20px !important;
+    padding: 0 !important;
-}
 
+    .el-pagination__rightwrapper {
+      flex: 1;
+
+      .el-pagination__sizes {
+        margin-right: 0;
+      }
+    }
+  }
+}
 </style>