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

project/activeAnalysis/AppActiveAnalysis/components/List.vue

@@ -47,6 +47,8 @@
         </div>
       </div>
     </template>
+
+
     <template slot="content">
       <ai-card title="当天数据统计">
         <template #right>

project/pidu/app/AppKeywordManagement/AppKeywordManagement.vue

@@ -1,9 +1,9 @@
 <template>
   <section class="AppKeywordManagement">
-    <template slot="title">
-      <ai-title title="关键词管理" isShowBottomBorder></ai-title>
-    </template>
     <ai-list>
+      <template slot="title">
+        <ai-title title="关键词管理" isShowBottomBorder></ai-title>
+      </template>
       <template #content>
         <ai-search-bar>
           <template #left>
@@ -45,7 +45,7 @@
         <el-form-item label="生效部门" prop="deptList">
           <ai-picker :instance="instance" v-model="form.deptList" @pick="e => onUserChange(e)" :multiple="true" dialogTitle="选择部门" action="/app/wxcp/wxdepartment/departList">
             <div class="time-select">
-              <span class="dept-name" v-if="6666 && form.deptList.length">已选择{{form.deptList.length}}个部门</span>
+              <span class="dept-name" v-if="form.deptList && form.deptList.length">已选择{{form.deptList.length}}个部门</span>
               <span class="dept-name" style="color:#999;" v-else>请选择</span>
               <i class="el-icon-arrow-down"></i>
             </div>
@@ -156,7 +156,6 @@ export default {
       this.dialog = true
     },
     add() {
-      this.form.deptList = []
       this.dialog = true
     },
     onUserChange (e) {
@@ -186,6 +185,7 @@ export default {
             if(res?.code == 0) {
               this.$message.success(this.form.id ? '关键词编辑成功' : '关键词添加成功')
               setTimeout(() =>{
+                this.form.deptList = []
                 this.dialog = false
                 this.getTableData()
                 this.flag = false

project/pidu/app/AppSensitive/components/List.vue

@@ -1,9 +1,9 @@
 <template>
   <section class="list">
-    <template slot="title">
-      <ai-title title="敏感词触发" isShowBottomBorder></ai-title>
-    </template>
     <ai-list>
+      <template slot="title">
+        <ai-title title="敏感词触发" isShowBottomBorder></ai-title>
+      </template>
       <template #content>
         <ai-search-bar>
           <template #left>

project/pidu/app/AppSessionArchive/components/Detail.vue

@@ -84,7 +84,7 @@
 
               <video style="width: 300px; object-fit: fill;" controls :src="item.sdkFileUrl" v-if="item.msgType == 'video'"></video>
 
-              <ai-file-list v-if="item.msgType == 'file'" clickDownload
+              <ai-file-list v-if="item.msgType == 'file'"
                 :fileList="item.files"
                 :fileOps="{ name: 'name', size: 'fileSizeStr' }"
               ></ai-file-list>

project/pidu/app/AppSessionArchive/components/List.vue

@@ -68,7 +68,7 @@
               v-model="search.name"
               size="small"
               v-throttle="() => {search.current = 1, getList()}"
-              placeholder="请输入成员姓名、手机号或标签名称"
+              placeholder="请输入成员姓名、手机号"
               clearable
               @clear="search.current = 1, search.name = '', getList()"
               suffix-icon="iconfont iconSearch">

project/qianxinan/Announce/AppAnnounce/components/Add.vue

@@ -15,9 +15,9 @@
                 </el-form-item>
                 <el-form-item label="发送范围" style="width: 100%;" prop="sendScope" :rules="[{ required: true, message: '请选择发送范围', trigger: 'change' }]">
                   <el-radio-group v-model="form.sendScope" @change="onScopeChange">
-                    <el-radio label="0">全部居民群</el-radio>
+                    <!-- <el-radio label="0">全部居民群</el-radio> -->
                     <el-radio label="1">按部门选择</el-radio>
-                    <el-radio label="2">按网格选择</el-radio>
+                    <!-- <el-radio label="2">按网格选择</el-radio> -->
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="选择群主" v-if="form.sendScope !== '0'" prop="wxGroupsName" style="width: 100%;" :rules="[{ required: true, message: '请选择选择群主', trigger: 'change' }]">
@@ -358,7 +358,7 @@ export default {
         wxGroups: [],
         markTag: [],
         wxGroupsName: '',
-        sendScope: '0',
+        sendScope: '1',
         sendType: 0,
         name: '',
         filterCriteria: [],

ui/packages/basic/AiFileList.vue

@@ -47,7 +47,13 @@ export default {
   methods: {
     downFile(item) {
       if (this.clickDownload) {
-        this.$download(item.url, item.name)
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = item.url
+        link.setAttribute('download', item.name)
+        document.body.appendChild(link)
+        link.click()
+        document.body.removeChild(link)
       } else window.open(`${item.url}`)
     }
   }