Merge remote-tracking branch 'origin/dev' into dev

packages/device/AppBroadcast/components/Detail.vue

@@ -11,7 +11,8 @@
           <template #content>
             <ai-wrapper
               label-width="120px">
-              <ai-info-item label="播发级别">{{ $dict.getLabel('dlbMessageUrgency',info.messageLevel) }} - {{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</ai-info-item>
+              <ai-info-item label="播发级别" v-if="info.taskType == 0">{{ $dict.getLabel('dlbMessageUrgency',info.messageLevel) }}</ai-info-item>
+              <ai-info-item label="播发级别" v-if="info.taskType == 1">{{ $dict.getLabel('dlbMessageUrgency',info.messageLevel) }} - {{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</ai-info-item>
               <ai-info-item label="播放方式">{{ info.taskType==1? '定时播放': '立即播放'}}</ai-info-item>
               <ai-info-item label="创建人" :value="info.createUserName"></ai-info-item>
               <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
@@ -44,6 +45,7 @@
       <ai-card title="播发素材" v-show="currIndex == 2">
         <template #content>
           <div class="audios">
+            <!-- <div>{{item.}}</div> -->
             <ai-audio :src="item.url" v-for="item in info.materials" :key="item.id" skin="flat" style="margin-bottom: 8px;"/>
           </div>
         </template>

packages/device/AppBroadcast/components/List.vue

@@ -33,7 +33,7 @@
               <!-- <el-button type="text" @click="onAdd(row.id)">复制</el-button> -->
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
               <el-button type="text" @click="reset(row.id)"
-                         v-if="row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2">撤回
+                         v-if="row.taskType == 1">撤回
               </el-button>
             </template>
           </el-table-column>
@@ -79,7 +79,7 @@ export default {
           return h('span', null, (row.taskType == 1? '定时播放':'立即播放'))},
         },
         {prop: 'startTime', label: '开始时间', align: 'center', width: 180},
-        // {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"},
+        {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"},
         {prop: 'areaName', label: '地区', align: 'center'},
         {prop: 'createUserName', label: '创建人', align: 'center'},
         {slot: 'options'},

packages/device/AppEquipmentManage/components/taskList.vue

@@ -14,7 +14,7 @@
                   :current.sync="page.current" :size.sync="page.size" @getList="getList"
                   @selection-change="(v) => (ids = v.map((e) => e.id))">
           <el-table-column slot="options" label="操作" align="center" width="280" fixed="right">
-            <template slot-scope="{ row }" v-if="row.taskType == 1 && (row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2 )">
+            <template slot-scope="{ row }" v-if="row.taskType == 1">
               <el-button type="text" @click="reset(row.id)">撤回任务</el-button>
             </template>
           </el-table-column>

packages/device/AppMediaManage/components/Play.vue

@@ -58,9 +58,9 @@
                               :picker-options="{ start: formData.startTime, minTime: formData.startTime}"
                               value-format="HH:mm:ss"></el-time-picker>
             </el-form-item>
-            <el-form-item label="播放设备" v-if="areaId.length" prop="serialNo" style="width: 100%;">
-              <ai-table-select nodeName="name" :instance="instance" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
-                              @select="v=> formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
+            <el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;">
+              <ai-table-select nodeName="name" :instance="instance" extra="serialNo" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
+                              @select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
             </el-form-item>
           </el-form>
         </template>
@@ -171,6 +171,7 @@ export default {
       serialNoList: [],
       areaId: '',
       areaName: '',
+      userAreaId: '',
     }
   },
   computed: {
@@ -183,15 +184,25 @@ export default {
       var myDate = new Date();
       return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
     },
-    areaRoot() {
-      return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("")
-    }
-
+    // areaRoot() {
+    //   return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("")
+    // }
   },
+
+  // watch: {
+  //   userAreaId: {
+  //     handler: function(v) {
+  //       this.areaRootId = [v?.substr(0,6),'000000'].join("")
+  //     },
+  //     deep: true
+  //   }
+  // },
+
   created() {
     this.dict.load('dlbMessageUrgency', 'dlbBroadTaskType', 'dlbDyclingType')
     Promise.all([this.getEquipmentList(), this.getMediaList()]).then(() => {
       this.formData.mediaId = this.params.id
+      this.userAreaId = this.user.info.areaId
     })
   },
   methods: {
@@ -218,7 +229,7 @@ export default {
       })
     },
     // 地区选择
-    handleAreaSelect() {
+    handleAreaSelect(v) {
       this.areaName = v?.[0]?.label
     },
 

packages/work/AppHelpedResident/hrAdd.vue

@@ -37,7 +37,7 @@
                   <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
                 </el-form-item> -->
                 <el-form-item label="家庭人口数" prop="familyCount">
-                  <el-input v-model="form.familyCount" placeholder="请输入家庭人口数" :disabled="isEdit" type="number"/>
+                  <el-input v-model="form.familyCount" placeholder="请输入家庭人口数" type="number"/>
                 </el-form-item>
                 <el-form-item label="民族">
                   <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>