智能雷达

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/playlet.iml" filepath="$PROJECT_DIR$/.idea/playlet.iml" />
+    </modules>
+  </component>
+</project>

.idea/playlet.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

project/package.json

@@ -21,8 +21,6 @@
     "js-sha1": "^0.6.0",
     "jspdf": "^2.3.1",
     "md5": "^2.3.0",
-    "node-sass": "^4.12.0",
-    "sass-loader": "^7.1.0",
     "switch-address": "^1.0.4",
     "umy-ui": "^1.1.6",
     "vue": "^2.5.2",
@@ -57,6 +55,7 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "node-notifier": "^5.1.2",
+    "node-sass": "^4.7.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
@@ -64,6 +63,7 @@
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
+    "sass-loader": "^7.3.1",
     "script-loader": "^0.7.2",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",

project/src/assets/config/interface_api.js

@@ -191,7 +191,7 @@ var api = {
   radar_radarEdit:'/api/radar/radarUpdate',
   radar_radarSort:'/api/radar/radarSortUpdate',
   radar_radarDele:'/api/radar/radarDelete',
-  radar_uploadFileToOss:'/api/material/uploadFileToOss',
+  radar_uploadFile:'/api/material/uploadFileToOss',
   radar_dataView:'/api/radar/dataStatisticsTotal',
   radar_dataView_list:'/api/radar/dataStatisticsList',
 

project/src/components/smartRadar/createRadar.vue

@@ -7,7 +7,7 @@
      </div>
    </div>
 
-    <div v-if="!loading" class="bg-ffffff createMassMsg" style="padding: 10px 30px 10px;">
+    <div v-if="!edit_detial_Flag" v-loading="loading" class="bg-ffffff createMassMsg" style="padding: 10px 30px 10px;">
       <div class="regulations">
         <label><em>*</em>名称</label>
         <el-input placeholder="请输入雷达名称" style="width:500px" v-model.trim="radarName"
@@ -16,19 +16,22 @@
                   clearable size="small"></el-input>
       </div>
       <div class="regulations" style="align-items: center">
-        <label>选择分组</label>
-        <el-select v-model="group_val" size="small" clearable placeholder="请选择" style="width: 500px">
+        <label><em style="opacity: 0">*</em>选择分组</label>
+        <el-select v-model="group_id" size="small" clearable placeholder="请选择" style="width: 500px">
           <el-option
-            v-for="item in groupArrs"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
+            v-for="(item,index) in groupArrs"
+            :key="index"
+            :label="item.group_name"
+            :value="item.group_id">
           </el-option>
         </el-select>
       </div>
-      <fileType></fileType>
-
-
+      <fileType v-if="fileShow" ref="fileTypeRef"
+                :comeBackParms="{
+                  url_list_echo:url_list_echo,
+                  type:type
+                }"
+                @getType="(val)=>{type = val}"></fileType>
       <div class="regulations">
         <label><em>*</em>雷达标题</label>
         <el-input placeholder="请输入雷达标题" style="width:500px" v-model.trim="radartitle"
@@ -38,7 +41,7 @@
       </div>
       <div class="regulations">
         <label><em>*</em>雷达描述</label>
-        <el-input type="textarea" placeholder="请输入雷达标题" style="width:500px" v-model.trim="radardesc"
+        <el-input type="textarea" placeholder="请输入雷达描述" style="width:500px" v-model.trim="radardesc"
                   :rows="4"
                   maxlength="200"
                   show-word-limit
@@ -50,7 +53,9 @@
           <el-upload key="imgUpload"
                      class="imgUploader"
                      :action="URL.BASEURL + URL.material_upload"
+                     name="material_file"
                       :file-list="coverFileList"
+                     :data="extraData"
                      accept=".jpg,.jpeg,.png"
                      list-type="picture-card"
                      :limit="1"
@@ -64,7 +69,10 @@
               <div class="el-icon-circle-plus f16"></div>
               <div class="el-upload__text f14">添加图片</div>
             </div>
-            <div class="el-upload__tip" slot="tip">建议尺寸： 200px*200px,大小不超过1MB</div>
+            <div class="el-upload__tip" slot="tip">
+              建议尺寸： 200px*200px,大小不超过1MB
+              <div v-if="coverErrFlag" class="errCss">* 错误：{{coverErrInfo}}</div>
+            </div>
           </el-upload>
           <el-dialog append-to-body :visible.sync="imgCoverVisible">
             <img width="100%" :src="imgCoverUrl" alt="">
@@ -75,15 +83,18 @@
         <label class="fWeight600">智能跟进</label>
         <div>
           <el-checkbox-group v-model="smartVal">
-            <el-checkbox label="行为通知(当客户点击雷达时,发送雷达的员工将会收到消息提醒)"></el-checkbox>
-            <el-checkbox label="动态通知(当客户点击雷达时,会将客户的打开行为记录在客户动态里)"></el-checkbox>
-            <el-checkbox label="客户标签(给点击雷达的客户打上选中的标签)"></el-checkbox>
+            <el-checkbox label="behavior_notification">行为通知(当客户点击雷达时,发送雷达的员工将会收到消息提醒)</el-checkbox>
+            <el-checkbox label="dynamic_notification">动态通知(当客户点击雷达时,会将客户的打开行为记录在客户动态里)</el-checkbox>
+            <el-checkbox label="customer_label">客户标签(给点击雷达的客户打上选中的标签)</el-checkbox>
           </el-checkbox-group>
+          <enterprise-tag v-if="smartVal.indexOf('customer_label') > -1" title="" width="300px"
+                          :afferent_obj='afferent_tag_obj'
+                          :reset='resetFlag' @tagDefine="tagDefine"></enterprise-tag>
         </div>
       </div>
 
       <div style="margin-top: 20px">
-        <el-button type="primary" @click="newCode_click">创建雷达</el-button>
+        <el-button type="primary" @click="newCode_click">保存</el-button>
       </div>
     </div>
   </div>
@@ -91,24 +102,22 @@
 
 <script>
 import fileType from './fileType.vue'
+import enterpriseTag from '@/components/assembly/screen/enterpriseTagFC.vue'
 export default {
   name: "createRadar",
   components:{
-    fileType
+    fileType,
+    enterpriseTag
   },
   data(){
     return{
       loading:false,
+      edit_detial_Flag:false,
       radarName:'',
       radartitle:'',
       radardesc:'',
-      group_val:0,
-      groupArrs:[
-        {
-          label:'分组一',
-          value:0
-        }
-      ],
+      group_id:'',
+      groupArrs:[],
       user_id_list: [],
 
       resetFlag: false,
@@ -116,6 +125,23 @@ export default {
       coverFileList:[],
       imgCoverVisible: false,
       imgCoverUrl: false,
+      cover_id:'',
+      coverErrInfo:'',
+      coverErrFlag:false,
+      type:1,
+      extraData:{
+        admin_id: this.$cookie.getCookie('admin_id'),
+        ttl: this.$cookie.getCookie('ttl'),
+        sign: this.$cookie.getCookie('sign'),
+        corpid: this.$localSelfStore.getLocal('defaultCorp') && this.$localSelfStore.getLocal('defaultCorp') != 'undefined' ? JSON.parse(this.$localSelfStore.getLocal('defaultCorp')).corpid : '',
+        type: 1,//素材类型。1图片 2语音 3视频
+      },
+      afferent_tag_obj: {
+        tag_id_list: []
+      },
+      tag_info:[],
+      url_list_echo:[],
+      fileShow:false,
 
     }
   },
@@ -123,9 +149,40 @@ export default {
 
   },
   created(){
-
+    this.init_groupList()
+    if (this.$route.query.id) {//详情
+      this.detail()
+    }else{
+      this.edit_detial_Flag=false
+      this.fileShow=true
+    }
   },
   methods:{
+    tagDefine (data) {//标签选择回调
+      if (data.tag_id_list && data.tag_id_list.length != 0) {
+        this.tag_info = data.tag_id_list
+      } else {
+        this.tag_info = []
+      }
+    },
+    init_groupList(){//分组列表
+      this.$axios.get(this.URL.BASEURL + this.URL.radar_groupList, {
+        params:{
+          page: 1,
+          page_size: 500,
+        }
+      }).then((res) => {
+        var res = res.data
+      if (res && res.errno == 0) {
+        this.groupArrs = res.rst.data
+      } else if (res.errno != 4002) {
+        this.$message({
+          message: res.err,
+          type: "warning"
+        })
+      }
+    })
+    },
     handleSee(file){
       this.imgCoverVisible = true
       this.imgCoverUrl = file.url;
@@ -134,10 +191,21 @@ export default {
       this.$loading(this.$loadingConfig);
     },
     handleRemove(){
-
+      this.cover_id = ''
+      this.coverErrFlag=false
     },
-    uploadSuccess(){
+    uploadSuccess(res){
       this.$loading(this.$loadingConfig).close()
+      if(res&&res.errno == 0){
+        this.cover_id = res.rst.material_id
+      }else{
+        this.$message({
+          type: 'error',
+          message: res.err
+        });
+        this.coverErrFlag = true
+        this.coverErrInfo = res.err
+      }
     },
     uploadFail(){
       this.$message({
@@ -153,36 +221,37 @@ export default {
     },
     detail () {//详情
       this.loading = true
-      this.$axios.get(this.URL.BASEURL + this.URL.welcomeMsg_detail, {
+      this.$axios.get(this.URL.BASEURL + this.URL.radar_radarDetail, {
         params: {
-          rule_id: this.$route.query.id
+          radar_id: this.$route.query.id
         }
       }).then((res) => {
-        var res = res.data
         this.loading = false
+        var res = res.data
         if (res && res.errno == 0) {
-          this.dataInfo = res.rst;
-          this.is_for_all = res.rst.is_for_all;
-          this.user_id_list = res.rst.users ? res.rst.users.split(',') : [];
-          this.name = res.rst.name;
-          let msg_list = res.rst.msg_list;
-          msg_list.forEach((item) => {
-            item.content = item.content ? item.content.replace('%NICKNAME%', '「客户昵称」') : '';
-            item.attachments = item.attachments && item.attachments != '' ? JSON.parse(item.attachments) : [];
-            item.weeks = item.weeks ? item.weeks.split(',') : []
-          })
-          let main_msg_data = msg_list.filter((v) => {//特定有一个主欢迎语内容
-            return v.is_day_parting == 0
-          })
-          this.main_msg_data = main_msg_data && main_msg_data.length > 0 ? main_msg_data[0] : {};
-
-          this.timeIntervalList = msg_list.filter((v) => {//分时段欢迎语内容
-            return v.is_day_parting == 1
+          let dataInfo = res.rst
+          this.radarName = dataInfo.name
+          this.group_id = dataInfo.group_id
+          this.radartitle = dataInfo.title
+          this.radardesc = dataInfo.description
+          this.type = dataInfo.type
+          this.cover_id = dataInfo.cover_id
+          this.coverFileList.push({
+            url:dataInfo.cover_url
           })
+          this.url_list_echo = dataInfo.url_list
+          this.tag_info = dataInfo.tag_list
+          this.afferent_tag_obj.tag_id_list = dataInfo.tag_list
 
-          if (msg_list.length > 1) {
-            this.is_day_parting = true
+          this.smartVal = []
+          if(dataInfo.behavior_notification==1){
+            this.smartVal.push('behavior_notification')
+          }else if(dataInfo.customer_label==1){
+            this.smartVal.push('customer_label')
+          }else if(dataInfo.dynamic_notification==1){
+            this.smartVal.push('dynamic_notification')
           }
+          this.fileShow=true
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -193,126 +262,70 @@ export default {
         this.loading = false
       });
     },
-    tipsClick(){
-      if(this.user_id_list&&this.user_id_list.length==0){
-        this.$message({
-          type: 'error',
-          message: '请先选择使用客服!'
-        });
-      }
-    },
-    newCode_click(){//新建活码
+    newCode_click(){//保存（新建编辑）
       if(this.radarName == ''){
         this.$message({
           type: 'error',
-          message: '渠道名称不能为空!'
+          message: '雷达名称不能为空!'
         });
         return
       }
-      if(this.user_id_list&&this.user_id_list.length==0){
-        this.$message({
-          type: 'error',
-          message: '使用客服不能为空!'
-        });
+      var fileRef = this.$refs.fileTypeRef
+      fileRef.judgeType()
+      if(fileRef.returnFlag){
         return
       }
-      if(this.customerNote_val==''){
+      if(this.radartitle == ''){
         this.$message({
           type: 'error',
-          message: '客户备注不能为空!'
+          message: '雷达标题不能为空!'
         });
         return
       }
-      if (this.main_msg_data.content == '' && (!this.main_msg_data.attachments || this.main_msg_data.attachments == '' || this.main_msg_data.attachments.length == 0)) {
+      if(this.radardesc == ''){
         this.$message({
-          message: '请输入【主】欢迎语内容！',
-          type: "warning"
-        })
+          type: 'error',
+          message: '雷达描述不能为空!'
+        });
         return
       }
-      if (this.main_msg_data.content != '' && this.$getStrBytes(this.main_msg_data.content) > 4000) {
+      if(this.cover_id == ''){
         this.$message({
-          message: '请检查【主】欢迎语内容，最多4000个字节，已超出！',
-          type: "error"
-        })
+          type: 'error',
+          message: '雷达封面不能为空!'
+        });
         return
       }
-
-      let msg_data = []
-      if (this.is_day_parting) {//开启分段欢迎语
-        for (let i = 0; i < this.timeIntervalList.length; i++) {
-          let item = this.timeIntervalList[i];
-          if (item.content == '' && (!item.attachments || item.attachments == '' || item.attachments.length == 0)) {
-            this.$message({
-              message: `请输入【时段${i + 1}】欢迎语内容！`,
-              type: "warning"
-            })
-            return
-          }
-          if (item.content != '' && this.$getStrBytes(item.content) > 4000) {
-            this.$message({
-              message: `请检查【时段${i + 1}】欢迎语内容，最多4000个字节，已超出！`,
-              type: "error"
-            })
-            return
-          }
-          if (!item.weeks || item.weeks.length == 0) {
-            this.$message({
-              message: `请选择【时段${i + 1}】发送日期！`,
-              type: "warning"
-            })
-            return
-          }
-          if (!item.start_time || item.start_time == '') {
-            this.$message({
-              message: `请输入【时段${i + 1}】发送开始时间！`,
-              type: "warning"
-            })
-            return
-          }
-          if (!item.end_time || item.end_time == '') {
-            this.$message({
-              message: `请输入【时段${i + 1}】发送结束时间！`,
-              type: "warning"
-            })
-            return
-          }
-          if (this.$date_compatible(('2020-04-01 ' + item.start_time)).getTime() > this.$date_compatible(('2020-04-01 ' + item.end_time)).getTime()) {
-            this.$message({
-              message: `请正确输入【时段${i + 1}】发送时间！`,
-              type: "warning"
-            })
-            return
-          }
+      if(this.smartVal.indexOf('customer_label') > -1){
+        if(this.tag_info&&this.tag_info.length==0){
+          this.$message({
+            type: 'error',
+            message: '智能跟进-客户标签 选中后，标签不能为空'
+          });
+          return
         }
-        msg_data = msg_data.concat(this.timeIntervalList)
-      } else {//关闭分段欢迎语
-        let delete_arr = JSON.parse(JSON.stringify(this.timeIntervalList));
-        delete_arr = delete_arr.filter((v) => {
-          return v.msg_id
-        })
-        delete_arr.forEach((item) => {
-          item.operate = 'del'
-        })
-        this.deleteTimeIntervalList = this.deleteTimeIntervalList.concat(delete_arr)
       }
-      msg_data = msg_data.concat(this.deleteTimeIntervalList);//删除的分时段内容
-
-      msg_data.push(this.main_msg_data)
-      msg_data.forEach((item) => {
-        item.weeks = item.weeks.join(',');
-        item.content = item.content.replace('「客户昵称」', '%NICKNAME%')
-        item.attachments = item.attachments == '' || item.attachments.length == 0 ? '' : JSON.stringify(item.attachments)
-      })
 
       this.$loading(this.$loadingConfig)
-
-      this.$axios.post(this.URL.BASEURL + this.URL.welcomeMsg_set, {
-        rule_id: this.$route.query.id ? this.$route.query.id : '',
-        radarName: this.radarName,
-        is_for_all: this.is_for_all,
-        users: this.is_for_all == 0 ? this.user_id_list.join(',') : '',
-        msg_data: msg_data
+      let api=''
+      if(this.$route.query.id){//编辑
+        api=this.URL.radar_radarEdit
+      }else{
+        api=this.URL.radar_addRadar
+      }
+      this.$axios.post(this.URL.BASEURL + api, {
+        radar_id: this.$route.query.id ? this.$route.query.id : '',
+        group_id:this.group_id,
+        name: this.radarName,
+        type:this.type,
+        url_list:fileRef.ur_list,
+        title:this.radartitle,
+        description:this.radardesc,
+        cover_id:this.cover_id,
+        behavior_notification:this.smartVal.indexOf('behavior_notification') > -1 ? 1 : 0,
+        dynamic_notification:this.smartVal.indexOf('dynamic_notification') > -1 ? 1 : 0,
+        customer_label:this.smartVal.indexOf('customer_label') > -1 ? 1 : 0,
+        tag_list:this.tag_info
       }).then((res) => {
         var res = res.data
         this.$loading(this.$loadingConfig).close()
@@ -328,45 +341,7 @@ export default {
         this.$loading(this.$loadingConfig).close()
       });
     },
-    tagDefine (data) {//标签选择回调
-      if (data.tag_id_list && data.tag_id_list.length != 0) {
-        this.tag_info = data.tag_id_list
-      } else {
-        this.tag_info = []
-      }
-    },
-    getAttachment (val) {
-      this.main_msg_data.attachments = val;
-    },
-    switchChange () {//分时段开关打开
-      if (this.is_day_parting && this.timeIntervalList.length == 0) {
-        this.timeIntervalList.push(this.init_welcom_con)
-      }
-    },
-    getWelcomEdit (val, index) {//分时段编辑
-      this.$set(this.timeIntervalList, index, val)
-    },
-    deleteWelcomCon (index) {//删除分时段
-      if (this.$route.query.id && this.timeIntervalList[index].msg_id) {//删除的分时段内容
-        let obj = JSON.parse(JSON.stringify(this.timeIntervalList[index]))
-        obj.operate = 'del';
-        this.deleteTimeIntervalList.push(obj)
-      }
-      this.timeIntervalList.splice(index, 1)
-    },
-    addWelcom () {//添加分时段
-      this.timeIntervalList.push(this.init_welcom_con)
-    },
-    switchLimit(){
-      if(this.user_id_list&&this.user_id_list.length==0){
-        this.$message({
-          type: 'error',
-          message: '使用客服不能为空!'
-        });
-        return
-      }
 
-    }
   }
 }
 </script>
@@ -426,4 +401,8 @@ export default {
   cursor: pointer;
   display: inline-block;
 }
+  .errCss{
+    margin:10px 0;
+    color:red;
+  }
 </style>

project/src/components/smartRadar/dataAnalyse.vue

@@ -16,24 +16,11 @@
     </div>
 
     <div class="topTagBox">
-      <div class="span_title">打开链接的客户</div>
-      <div class="flex-align-center">
-        <self-input :hasLabel="false" label_name="搜索客户" @inputChange='(val)=>{kehu_val = val;initFlag=!initFlag}'></self-input>
-        <div style="width: 20px"></div>
-        <self-input :hasLabel="false" label_name="选择渠道" @inputChange='(val)=>{kehu_val = val;initFlag=!initFlag}'></self-input>
-        <div style="width: 20px"></div>
-        <date-picker title="" :quickFlag="false" :afferent_time="default_time"
-                     :clearFlag='false' :reset="resetFlag" @changeTime="changeTime"></date-picker>
-        <div style="width: 20px"></div>
-        <self-input :hasLabel="false" label_name="所属成员" @inputChange='(val)=>{kehu_val = val;initFlag=!initFlag}'></self-input>
-        <div style="width: 20px"></div>
-        <el-button type="primary" size="small" >重置</el-button>
-      </div>
+
       <publicTable
         :propsData="{
           desCol:desCol,
-          source:'dataAnalyse',
-          initFlag:initFlag
+          source:'dataAnalyse'
         }"
       ></publicTable>
     </div>
@@ -41,15 +28,11 @@
 </template>
 
 <script>
-import datePicker from '@/components/assembly/screen/datePicker.vue'
-import selfInput from '@/components/assembly/screen/input.vue'
 import publicTable from './publicTable.vue'
 export default {
   name: "dataAnalyse",
   components:{
-    publicTable,
-    selfInput,
-    datePicker
+    publicTable
   },
   data(){
     return{
@@ -76,17 +59,12 @@ export default {
           bigKey:'today_pv_count',
         }
       ],
-      default_time: [this.$getDay(-30, false), this.$getDay(0, false)],
-      resetFlag: false,
-      kehu_val:'',
-      initFlag:false,
-      time:[],
       desCol:[
-        { prop: "name", label: "客户" },
-        { prop: "assign_count", label: "所属成员" },
-        { prop: "name", label: "最近点击时间" },
-        { prop: "waiting_add_count", label: "最近点击渠道" },
-        { prop: "passed_count", label: "客户访问总次数"}
+        { prop: "customer_name", label: "客户" },
+        { prop: "user_name", label: "所属成员" },
+        { prop: "last_click_time", label: "最近点击时间" },
+        { prop: "last_click_channel", label: "最近点击渠道" },
+        { prop: "pv_count", label: "客户访问总次数"}
       ]
     }
   },
@@ -94,7 +72,6 @@ export default {
     this.init_preview()
   },
   methods:{
-
     init_preview(){//数据概览
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.radar_dataView, {
@@ -118,15 +95,6 @@ export default {
         this.loading = false
       });
     },
-    changeTime (time) {//筛选时间变化
-      if (!time || time && time.length == 0) {
-        this.time = []
-      } else {
-        this.time = time
-      }
-      this.initFlag=!this.initFlag
-
-    },
   }
 }
 </script>
@@ -155,10 +123,5 @@ export default {
 .topTagBox{
   margin-top: 10px;
   font-size: 14px;
-  .span_title{
-    font-weight: 600;
-    color: #000;
-    margin: 10px 0 ;
-  }
 }
 </style>

project/src/components/smartRadar/fileType.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
 <!--链接-->
-    <template v-if="fileType_Val==1">
+    <div v-show="fileType_Val==1">
       <div class="regulations">
         <label><em>*</em>跳转链接</label>
         <el-input placeholder="请输入跳转链接" style="width:500px" v-model.trim="jumplink_val"
@@ -18,19 +18,22 @@
                   show-word-limit
                   clearable size="small"></el-input>
       </div>
-    </template>
+    </div>
     <!--PDF-->
-    <template v-if="fileType_Val==2">
+    <div v-show="fileType_Val==2">
       <div class="regulations">
         <label></label>
-        <el-upload
-          :action="URL.BASEURL + URL.material_upload"
+        <el-upload key="pdfUpload"
+          :action="URL.BASEURL + URL.radar_uploadFile"
+          :data="extraData_pdf"
           accept=".pdf,.PDF"
           :limit="1"
           :before-upload="()=>{$loading($loadingConfig)}"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove"
-          :on-success="uploadSuccess"
+          :on-preview="(file)=>{handlePreview(file,'pdf')}"
+                   :on-remove="(file,fileList)=>{handleRemove(file,fileList,'pdf')}"
+          :on-success="(response, file, fileList) => {
+                  return uploadSuccess(response, file, fileList, 'pdf');
+          }"
           :on-error='uploadFail'
           :on-exceed="handleExceed"
           :file-list="pdfList">
@@ -38,26 +41,30 @@
           <div slot="tip" class="el-upload__tip">
             <div>只能上传pdf文件，且不超过20MB</div>
             <div class="tMar5">文件将自动转为成网页链接，员工发送给客户后可记录客户打开数据</div>
+            <div v-if="coverErrFlag" class="errCss">* 错误：{{coverErrInfo}}</div>
           </div>
         </el-upload>
       </div>
-    </template>
+    </div>
     <!--图片-->
-    <template v-if="fileType_Val==3">
+    <div v-show="fileType_Val==3">
       <div class="regulations radar_cover_box">
         <label></label>
         <el-upload key="imgUpload"
                    class="imgUploader"
                    multiple
-                   :action="URL.BASEURL + URL.material_upload"
+                   :action="URL.BASEURL + URL.radar_uploadFile"
+                   :data="extraData_img"
                    :file-list="typeImgList"
-                   accept=".jpg,.jpeg,.png"
+                   accept=".jpg,.png"
                    list-type="picture-card"
                    :limit="9"
                    :before-upload="()=>{$loading($loadingConfig)}"
-                   :on-preview="handlePreview"
-                   :on-remove="handleRemove"
-                   :on-success="uploadSuccess"
+                   :on-preview="(file)=>{handlePreview(file,'img')}"
+                   :on-remove="(file,fileList)=>{handleRemove(file,fileList,'img')}"
+                   :on-success="(response, file, fileList) => {
+                      return uploadSuccess(response, file, fileList, 'img');
+                    }"
                    :on-error='uploadFail'
                    :on-exceed="handleExceed">
           <div>
@@ -67,25 +74,26 @@
           <div class="el-upload__tip" slot="tip">
             <div> 图片大小不超过1MB，最多上传9张</div>
             <div class="tMar5">文件将自动转为成网页链接，员工发送给客户后可记录客户打开数据</div>
+            <div v-if="coverErrFlag" class="errCss">* 错误：{{coverErrInfo}}</div>
            </div>
         </el-upload>
-        <el-dialog append-to-body :visible.sync="imgTypeVisible">
-          <img width="100%" :src="imgTypeUrl" alt="">
-        </el-dialog>
       </div>
-    </template>
+    </div>
     <!--视频-->
-    <template v-if="fileType_Val==4">
+    <div v-show="fileType_Val==4">
       <div class="regulations">
         <label></label>
-        <el-upload
-          :action="URL.BASEURL + URL.material_upload"
-          accept=".mp4,.mov"
+        <el-upload key="mp4Upload"
+          :action="URL.BASEURL + URL.radar_uploadFile"
+                   :data="extraData_mp4"
+          accept=".mp4,.MP4"
           :limit="1"
           :before-upload="()=>{$loading($loadingConfig)}"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove"
-          :on-success="uploadSuccess"
+                   :on-preview="(file)=>{handlePreview(file,'mp4')}"
+          :on-remove="(file,fileList)=>{handleRemove(file,fileList,'mp4')}"
+           :on-success="(response, file, fileList) => {
+              return uploadSuccess(response, file, fileList, 'mp4');
+            }"
           :on-error='uploadFail'
           :on-exceed="handleExceed"
           :file-list="mp4List">
@@ -93,43 +101,219 @@
           <div slot="tip" class="el-upload__tip">
             <div>只能上传.mp4,.mov文件，且不超过100MB</div>
             <div class="tMar5">文件将自动转为成网页链接，员工发送给客户后可记录客户打开数据</div>
+            <div v-if="coverErrFlag" class="errCss">* 错误：{{coverErrInfo}}</div>
           </div>
         </el-upload>
+
       </div>
-    </template>
+    </div>
+
+    <!--放大看-->
+    <el-dialog append-to-body :visible.sync="dialogVisible">
+      <iframe :src="pdfUrl" frameborder="0" style="width: 100%;height: 300px;" v-if="fileType_Val==2"></iframe>
+      <img width="100%" :src="imgTypeUrl" alt="" v-show="fileType_Val==3">
+      <video :src="mp4Url" v-show="fileType_Val==4"  controls="controls" style="width: 100%;height: 300px;"></video>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 export default {
   name: "fileType",
+  props:['comeBackParms'],
   data(){
     return{
       fileType_Val:1,
       jumplink_val:'',
       pdfList:[],
+      pdfVal:[],
       typeImgList:[],
+      imgVals:[],
       mp4List:[],
-      imgTypeVisible:false,
-      imgTypeUrl:false
+      mp4Val:[],
+      dialogVisible:false,
+      imgTypeUrl:false,
+      extraData_img:{
+        admin_id: this.$cookie.getCookie('admin_id'),
+        ttl: this.$cookie.getCookie('ttl'),
+        sign: this.$cookie.getCookie('sign'),
+        corpid: this.$localSelfStore.getLocal('defaultCorp') && this.$localSelfStore.getLocal('defaultCorp') != 'undefined' ? JSON.parse(this.$localSelfStore.getLocal('defaultCorp')).corpid : '',
+        type:1
+      },
+      extraData_pdf:{
+        admin_id: this.$cookie.getCookie('admin_id'),
+        ttl: this.$cookie.getCookie('ttl'),
+        sign: this.$cookie.getCookie('sign'),
+        corpid: this.$localSelfStore.getLocal('defaultCorp') && this.$localSelfStore.getLocal('defaultCorp') != 'undefined' ? JSON.parse(this.$localSelfStore.getLocal('defaultCorp')).corpid : '',
+        type:4
+      },
+      extraData_mp4:{
+        admin_id: this.$cookie.getCookie('admin_id'),
+        ttl: this.$cookie.getCookie('ttl'),
+        sign: this.$cookie.getCookie('sign'),
+        corpid: this.$localSelfStore.getLocal('defaultCorp') && this.$localSelfStore.getLocal('defaultCorp') != 'undefined' ? JSON.parse(this.$localSelfStore.getLocal('defaultCorp')).corpid : '',
+        type:3
+      },
+      returnFlag:false,
+      ur_list:[],
+      coverErrInfo:'',
+      coverErrFlag:false,
+      mp4Url:'',
+      pdfUrl:'',
+    }
+  },
+  watch:{
+    fileType_Val(){
+      this.$emit('getType',this.fileType_Val)
+    }
+  },
+  created(){
+    if (this.$route.query.id) {
+      let paramsType = this.comeBackParms.type
+      let paramsurl = this.comeBackParms.url_list_echo
+      this.fileType_Val = paramsType
+      if(paramsType==1){
+        this.jumplink_val=paramsurl[0]
+      }else if(paramsType==2){
+        this.pdfList.push({
+          url:paramsurl[0]
+        })
+        this.pdfVal = paramsurl
+      }else if(paramsType==3){
+        paramsurl.forEach(item=>{
+          this.typeImgList.push({
+            url:item
+          })
+        })
+        this.imgVals = paramsurl
+      }else if(paramsType==4){
+          this.mp4List.push({
+            url:paramsurl[0]
+          })
+        this.mp4Val = paramsurl
+      }
     }
   },
   methods:{
-    handlePreview(file){
-      this.imgCoverVisible = true
-      this.imgCoverUrl = file.url;
-    },
-    handleRemove(){
+    judgeType(){
+      this.returnFlag = false
+      this.ur_list=[]
+      if(this.fileType_Val == 1){
+        if(this.jumplink_val==''){
+          this.$message({
+            type: 'error',
+            message: '文件类型- 跳转链接不能为空!'
+          });
+          this.returnFlag = true
+        }else{
+          this.ur_list.push(this.jumplink_val)
+        }
+      }else if(this.fileType_Val == 2){
+        if(this.pdfVal&&this.pdfVal.length==0){
+          this.$message({
+            type: 'error',
+            message: '文件类型- PDF不能为空!'
+          });
+          this.returnFlag = true
+        }else{
+          this.ur_list=this.pdfVal
+        }
+      }else if(this.fileType_Val == 3){
+        if(this.imgVals&&this.imgVals.length==0){
+          this.$message({
+            type: 'error',
+            message: '文件类型- 图片不能为空!'
+          });
+          this.returnFlag = true
+        }else{
+          this.ur_list=this.imgVals
+        }
+      }else if(this.fileType_Val == 4){
+        if(this.mp4Val&&this.mp4Val.length==0){
+          this.$message({
+            type: 'error',
+            message: '文件类型- 视频不能为空!'
+          });
+          this.returnFlag = true
+        }else{
+          this.ur_list=this.mp4Val
+        }
+      }else{
+        this.ur_list=[]
+      }
 
     },
-    uploadSuccess(res, file, fileList){
+    handlePreview(file,type){
+      this.dialogVisible = true
+      let path_url = file.response&&file.response.rst ? file.response.rst.url : file.url
+      if(type=='img'){
+        this.imgTypeUrl = path_url
+      }else if(type=='mp4'){
+        this.mp4Url = path_url
+      }else if(type=='pdf'){
+        this.pdfUrl = path_url
+      }
+    },
+    handleRemove(file, fileList,type){
+      this.coverErrFlag=false
+      if(type=='img'){
+        let path_url = file.response&&file.response.rst ? file.response.rst.url : file.url
+        this.imgVals.forEach((item,idx)=>{
+          if(path_url == item){
+          this.imgVals.splice(idx,1)
+          }
+        })
+        console.log(this.imgVals,'imgVals,handleRemove');
+      }else if(type=='mp4'){
+        this.mp4Val = []
+      }else if(type=='pdf'){
+        this.pdfVal = []
+      }
+    },
+    uploadSuccess(res, file, fileList,type){
       this.$loading(this.$loadingConfig).close()
-      console.log(res, file, fileList);
+      if(res&&res.errno==0){
+        if(type == 'pdf'){
+          this.pdfVal = []
+          this.pdfVal.push(res.rst.url)
+          this.$loading(this.$loadingConfig).close()
+        }else if(type == 'img'){
+          let arr = []
+          fileList.forEach(item=>{
+            let obj=''
+            if(item.response&&item.response.rst&&item.response.rst.url){
+              obj = item.response.rst.url
+            }
+           arr.push(obj)
+          })
+          this.imgVals=arr
+          let loadingflag = true//假设都上传完毕
+          this.imgVals.forEach(item=>{
+            if(item==''){//如果有一个为空，就是没有上传完毕
+              loadingflag = false
+            }
+          })
+          if(loadingflag){
+            this.$loading(this.$loadingConfig).close()
+          }
+        }else if(type == 'mp4'){
+          this.mp4Val = []
+          this.mp4Val.push(res.rst.url)
+          this.$loading(this.$loadingConfig).close()
+        }
+      }else{
+        this.$message({
+          type: 'error',
+          message: res.err
+        });
+        this.coverErrFlag = true
+        this.coverErrInfo = res.err
+      }
     },
-    uploadFail(){
+    uploadFail(err, file, fileList){
       this.$message({
-        message: '上传失败',
-        type: 'fail'
+        message: err.err,
+        type: 'error'
       })
     },
     handleExceed(){

project/src/components/smartRadar/groupList.vue

@@ -7,22 +7,26 @@
         添加分组
       </span>
     </div>
-    <div class="listBox" v-loading="loading">
-      <div class="item_css" :class="[acIdx==null? 'ac_css' : '']" @click="itemClick(null)"><i class="el-icon-folder"></i>全部雷达</div>
-      <draggable class="syllable_ul" element="ul"
-                 @sort="draggableSort"
-                 :list="tableData"
-                 :emptyInsertThreshold="0"
-                 :options="{group:'name',
+    <div class="listBox infinite-list-wrapper" v-loading.body="loading">
+      <div v-infinite-scroll="load"
+           :infinite-scroll-distance="20"
+           :infinite-scroll-immediate="false"
+           infinite-scroll-disabled="disabled">
+        <div class="item_css" :class="[acIdx==null? 'ac_css' : '']" @click="itemClick(null)"><i class="el-icon-folder"></i>全部雷达</div>
+        <draggable class="syllable_ul" element="ul"
+                   @sort="draggableSort"
+                   :list="tableData"
+                   :emptyInsertThreshold="0"
+                   :options="{group:'name',
                  animation:200,
                  ghostClass:'ghostClass',
                  dragClass:'dragClass'}">
-        <div v-for="(item,index) in tableData" :key="item.group_id" class="item_css"
-             @click="itemClick(item.group_id)"
-             :class="[acIdx==item.group_id ? 'ac_css' : '']">
-          <i class="el-icon-folder" style="cursor: move;"></i>
-          <span>{{item.group_name ? item.group_name : '-'}}</span>
-          <span class="lMarauto">
+          <div v-for="(item,index) in tableData" :key="item.group_id" class="item_css"
+               @click="itemClick(item.group_id)"
+               :class="[acIdx==item.group_id ? 'ac_css' : '']">
+            <i class="el-icon-folder" style="cursor: move;"></i>
+            <span>{{item.group_name ? item.group_name : '-'}}</span>
+            <span class="lMarauto">
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">
                 <i class="el-icon-more"></i>
@@ -34,8 +38,11 @@
             </el-dropdown>
 
           </span>
-        </div>
-      </draggable>
+          </div>
+        </draggable>
+      </div>
+      <p class="text-center f14 tMar8 c-d3" v-if="moreloading">加载中...</p>
+      <p class="text-center f14 tMar8 c-d3" v-if="noMore">没有更多了</p>
     </div>
 
     <dialogGroup
@@ -49,68 +56,86 @@
 </template>
 
 <script>
-import order from '@/components/mixins/order'
 import dialogGroup from './dialogGroup.vue'
 import draggable from "vuedraggable"
 export default {
   name: "groupList",
-  mixins:[order],
   components:{
     dialogGroup,
     draggable
   },
+  computed: {
+    noMore () {
+      return this.currPage_len < this.page_size
+    },
+    disabled () {
+      return this.moreloading || this.noMore
+    }
+  },
   data(){
     return{
       dialogTitle:'添加',
       acIdx:null,
       tableData:[],
+      copy_tableData:[],
       loading:false,
       page: 1,
-      pages: 0,
-      total: 0,
-      page_size: 500,
-      groupId:''
-
+      page_size: 20,
+      groupId:'',
+      currPage_len:0,
+      moreloading: false,
     }
   },
   created(){
     this.init()
   },
   methods:{
+    load(){
+      this.page += 1
+      this.init()
+    },
     draggableSort({to,from,item,clone,oldIndex,newIndex}){
-      // let ids = []
-      // this.tableData.forEach(item=>{
-      //   ids.push(item.id)
-      // })
-      // this.$axios.post(this.URL.BASEURL + this.URL.channel_sortGroup, {
-      //   ids : ids
-      // }).then((res) => {
-      //   var res = res.data
-      //   this.loading = false
-      //   if (res && res.errno == 0) {
-      //     // this.init()
-      //   } else if (res.errno != 4002) {
-      //     this.$message({
-      //       message: res.err,
-      //       type: "warning"
-      //     })
-      //   }
-      // })
+      if(!this.copy_tableData[oldIndex].group_id){
+        this.$message({
+          message: '被拖动的雷达组id错误',
+          type: "warning"
+        })
+        return
+      }
+      this.$axios.post(this.URL.BASEURL + this.URL.radar_sortGroup, {
+        operate_group_id:this.copy_tableData[oldIndex].group_id,
+        behind_group_id:newIndex-1>=0?this.tableData[newIndex-1].group_id:'',
+        front_group_id:newIndex+1<this.tableData.length?this.tableData[newIndex+1].group_id:'',
+      }).then((res) => {
+        var res = res.data
+        if (res && res.errno == 0) {
+
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      })
     },
     init(){//分组列表
       this.loading = true
+      if(this.currPage_len>=this.page_size){
+        this.moreloading = true
+      }
       this.$axios.get(this.URL.BASEURL + this.URL.radar_groupList, {
         params:{
           page: this.page,
-          pagesize: this.page_size,
+          page_size: this.page_size,
         }
       }).then((res) => {
         var res = res.data
         this.loading = false
         if (res && res.errno == 0) {
-          this.tableData = res.rst.data
-          this.total = res.rst.pageInfo.total;
-          this.pages = res.rst.pageInfo.pages;
+          this.tableData = [...this.tableData,...res.rst.data]
+          this.copy_tableData =  JSON.parse(JSON.stringify(this.tableData))
+          this.currPage_len=res.rst.data.length
+          this.moreloading = false
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -192,6 +217,8 @@ export default {
 }
 .listBox{
   margin-top: 10px;
+  height: calc(100vh - 60px - 62px - 20px - 10px - 50px);
+  overflow-y:auto;
   .item_css{
     display: flex;
     align-items: center;

project/src/components/smartRadar/index.vue

@@ -10,15 +10,12 @@
         <groupList @getId="val=>{group_id=val,initFlag=!initFlag}"></groupList>
       </div>
       <div class="tableBox">
-        <publicTable
+        <radarList
           :propsData="{
-            desCol:desCol,
-            source:'radarIndex',
             initFlag:initFlag,
             radar_val:radar_val,
             group_id:group_id
-          }"
-          ></publicTable>
+          }"></radarList>
       </div>
     </div>
   </div>
@@ -26,28 +23,19 @@
 
 <script>
 import selfInput from '@/components/assembly/screen/input.vue'
-import publicTable from './publicTable.vue'
 import groupList from './groupList.vue'
+import radarList from './radarList.vue'
 export default {
   name: "codeIndex",
   components:{
-    publicTable,
     selfInput,
-    groupList
+    groupList,
+    radarList
   },
   data() {
     return {
       initFlag:false,
       radar_val:'',
-      desCol:[
-        { prop: "name", label: "名称" },
-        { prop: "type", label: "类型" },
-        { prop: "group_name", label: "分组" },
-        { prop: "tag_list", label: "客户标签" },
-        { prop: "uv_count", label: "总访问人数",},
-        { prop: "send_count", label: "总发送次数",},
-        { prop: "create_time", label: "添加时间", min_width:'160'}
-      ],
       reset:false,
       group_id:''
     }

project/src/components/smartRadar/publicTable.vue

@@ -1,5 +1,21 @@
 <template>
   <div>
+    <template v-if="propsData.source == 'dataAnalyse'">
+      <div class="span_title">打开链接的客户 ({{customer_count||customer_count==0 ? customer_count : '-'}})</div>
+      <div class="flex-align-center">
+        <self-input :reset="reset" :hasLabel="true" label_name="搜索客户" @inputChange='(val)=>{customer_name = val;source_init()}'></self-input>
+        <div style="width: 20px"></div>
+        <self-input :reset="reset" :hasLabel="true" label_name="选择渠道" @inputChange='(val)=>{channel = val;source_init()}'></self-input>
+        <div style="width: 20px"></div>
+        <date-picker :reset="reset" title="选择时间"  :quickFlag="false" :afferent_time="default_time"
+                     :clearFlag='false' @changeTime="changeTime"></date-picker>
+        <div style="width: 20px"></div>
+        <self-input :reset="reset" :hasLabel="true" label_name="所属成员" @inputChange='(val)=>{user_list = val;source_init()}'></self-input>
+        <div style="width: 20px"></div>
+        <el-button type="primary" size="small" @click="resetAll">重置</el-button>
+      </div>
+    </template>
+
   <!-- table -->
     <el-table v-loading="loading" ref="multipleTable"
               border
@@ -41,7 +57,7 @@
         <el-table-column label="操作" align="center" min-width="180px">
           <template slot-scope="scope">
               <div class="flex">
-                <div class="c-00B38A pointer">编辑</div>
+                <div class="c-00B38A pointer" @click="editRadar(scope.row.radar_id)">编辑</div>
                 <el-popconfirm @confirm="deleRadar(scope.row.radar_id)" :title="`确定删除【${scope.row.name}】渠道活码？`">
                   <div slot="reference" class="c-00B38A pointer lMar8">删除</div>
                 </el-popconfirm>
@@ -59,9 +75,15 @@
 </template>
 
 <script>
+  import datePicker from '@/components/assembly/screen/datePicker.vue'
+  import selfInput from '@/components/assembly/screen/input.vue'
 export default {
   name: "publicTable",
   props:['propsData'],
+  components:{
+    selfInput,
+    datePicker
+  },
   data(){
     return{
       loading: false,
@@ -71,7 +93,14 @@ export default {
       total: 0,
       page_size: 20,
       height: '',
-      tableData:[]
+      tableData:[],
+      default_time: [this.$getDay(-30, false), this.$getDay(0, false)],
+      time:[],
+      customer_name:'',
+      channel:'',
+      user_list:'',
+      reset:false,
+      customer_count:0
     }
   },
   watch:{
@@ -80,34 +109,54 @@ export default {
     }
   },
   created() {
+    this.time = this.default_time
     this.height = document.documentElement.clientHeight - 300 > 400 ? document.documentElement.clientHeight - 300 : 400
     this.source_init()
   },
   methods:{
+    resetAll(){
+      this.customer_name=''
+        this.channel=''
+        this.user_list=''
+      this.reset = !this.reset
+
+    },
+    changeTime (time) {//筛选时间变化
+      if (!time || time && time.length == 0) {
+        this.time = []
+      } else {
+        this.time = time
+      }
+      this.source_init(1)
+    },
     source_init(val){
       val=val?val:1
       if(this.propsData.source=='radarIndex'){
         this.init(val)
         this.height = document.documentElement.clientHeight - 220 > 400 ? document.documentElement.clientHeight - 220 : 400
-      }else if(this.propsData.source=='channelAnalyse'){
-        this.tableData = this.propsData.tableData
+      }else if(this.propsData.source=='dataAnalyse'){
+        this.init_analyse_list(val)
       }
     },
-    init_analyse_list(){//数据概览
+    init_analyse_list(){//数据概览列表
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.radar_dataView_list, {
         params:{
           radar_id:this.$route.params.id,
-          customer_name:'',
-          channel:''
+          customer_name:this.customer_name,
+          channel:this.channel,
+          user_list:this.user_list,
+          start_date:this.time[0],
+          end_date:this.time[1],
+          page:this.page,
+          page_size:this.page_size,
         }
       }).then((res) => {
         var res = res.data
         this.loading = false
         if (res && res.errno == 0) {
-          this.dataPreview.forEach(item=>{
-            item.bigNum = res.rst[item.bigKey]
-          })
+         this.tableData = res.rst.data.list
+         this.customer_count = res.rst.data.customer_count
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -121,6 +170,9 @@ export default {
     goDataAanlyse(id){
       this.$router.push('/radar_dataAnalyse/'+id)
     },
+    editRadar(id){
+      this.$router.push({path:'/createRadar',query: {id:id}})
+    },
     deleRadar(id){
       this.loading = true
       this.$axios.post(this.URL.BASEURL + this.URL.radar_radarDele, {
@@ -174,5 +226,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+  .span_title{
+    font-weight: 600;
+    color: #000;
+    margin: 10px 0 ;
+  }
 </style>

project/src/components/smartRadar/radarList.vue

@@ -0,0 +1,253 @@
+<template>
+  <div>
+  <!-- table -->
+    <div class="infinite-list-wrapper" v-loading.body="loading">
+      <div class="tHead">
+        <div v-for="item in desCol"
+             :style="{width:item.min_width?item.min_width:'11%'}">{{item.label?item.label:'-'}}</div>
+      </div>
+      <div class="tBody"
+           v-if="tableData&&tableData.length>0"
+           v-infinite-scroll="load"
+           :infinite-scroll-distance="20"
+           :infinite-scroll-immediate="false"
+           infinite-scroll-disabled="disabled">
+        <draggable class="syllable_ul" element="ul"
+                   @sort="draggableSort"
+                   :list="tableData"
+                   :emptyInsertThreshold="0"
+                   :options="{group:'name',
+                 animation:200,
+                 ghostClass:'ghostClass',
+                 dragClass:'dragClass'}">
+          <div class="body_item" v-for="(row,index) in tableData"
+               :class="index == tableData.length-1 ? 'borderBottomline' : ''">
+          <div class="body_cell" v-for="item in desCol"
+               :style="{width:item.min_width?item.min_width:'11%'}">
+            <div v-if="item.prop=='type'">
+              <span v-if="row.type==1">链接</span>
+              <span v-else-if="row.type==2">PDF</span>
+              <span v-else-if="row.type==3">图片</span>
+              <span v-else-if="row.type==4">视频</span>
+              <span v-else="row.type==1">-</span>
+            </div>
+            <div v-else-if="item.prop=='tag_list'" class="flex-align-jus-center">
+              <template v-if="row.tag_list&&row.tag_list.length==0 || !row.tag_list">-</template>
+              <div class="customerServiceTagBox biaoqian" v-else>
+                <div class="customerServiceTag" v-for="(item,index) in row.tag_list" :key="index+'biaoqian'">{{item}}</div>
+              </div>
+            </div>
+            <div v-else-if="item.prop=='oprate'">
+              <div class="flex" style="padding: 0 10px">
+                <div class="c-00B38A pointer" @click="editRadar(row.radar_id)">编辑</div>
+                <el-popconfirm @confirm="deleRadar(row.radar_id)" :title="`确定删除【${row.name}】渠道活码？`">
+                  <div slot="reference" class="c-00B38A pointer lMar8">删除</div>
+                </el-popconfirm>
+                <div class="c-00B38A pointer lMar8" @click="goDataAanlyse(row.radar_id)">分析数据</div>
+              </div>
+            </div>
+            <div v-else>{{row[item.prop] ||row[item.prop]==0 ? row[item.prop] : '-'}}</div>
+          </div>
+        </div>
+        </draggable>
+          <p class="text-center f14 tMar8 c-d3" v-if="moreloading">加载中...</p>
+        <p class="text-center f14 tMar8 c-d3" v-if="noMore">没有更多了</p>
+      </div>
+      <div class="noData" v-else>暂无数据</div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import draggable from "vuedraggable"
+export default {
+  name: "radarList",
+  components:{
+    draggable
+  },
+  props:['propsData'],
+  computed: {
+    noMore () {
+      return this.currPage_len < this.page_size
+    },
+    disabled () {
+      return this.moreloading || this.noMore
+    }
+  },
+  data(){
+    return{
+      loading: false,
+      moreloading: false,
+      page: 1,
+      page_size: 20,
+      height: '',
+      tableData:[],
+      copy_tableData:[],
+      currPage_len:0,
+      desCol:[
+        { prop: "name", label: "名称" },
+        { prop: "type", label: "类型" },
+        { prop: "group_name", label: "分组" },
+        { prop: "tag_list", label: "客户标签" },
+        { prop: "uv_count", label: "总访问人数",},
+        { prop: "send_count", label: "总发送次数",},
+        { prop: "create_time", label: "添加时间", min_width:'17%'},
+        { prop: "oprate", label: "操作", min_width:'17%'}
+      ],
+    }
+  },
+  watch:{
+    'propsData.initFlag'(){
+      this.page=1
+      this.tableData=[]
+      this.copy_tableData=[]
+      this.init()
+    }
+  },
+  created() {
+    this.height = document.documentElement.clientHeight - 300 > 400 ? document.documentElement.clientHeight - 300 : 400
+    this.init(1)
+  },
+  methods:{
+    load(){
+      this.page += 1
+      this.init()
+    },
+    goDataAanlyse(id){
+      this.$router.push('/radar_dataAnalyse/'+id)
+    },
+    editRadar(id){
+      this.$router.push({path:'/createRadar',query: {id:id}})
+    },
+    deleRadar(id){
+      this.loading = true
+      this.$axios.post(this.URL.BASEURL + this.URL.radar_radarDele, {
+        radar_id:id
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        this.$message({
+          message: res.err,
+          type: "warning"
+        })
+        if (res && res.errno == 0) {
+          this.init(1)
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+
+    draggableSort({to,from,item,clone,oldIndex,newIndex}){
+      if(!this.copy_tableData[oldIndex].radar_id){
+        this.$message({
+          message: '被拖动的雷达id错误',
+          type: "warning"
+        })
+        return
+      }
+      this.$axios.post(this.URL.BASEURL + this.URL.radar_radarSort, {
+        operate_radar_id:this.copy_tableData[oldIndex].radar_id,
+        behind_radar_id:newIndex-1>=0?this.tableData[newIndex-1].radar_id:'',
+        front_radar_id:newIndex+1<this.tableData.length?this.tableData[newIndex+1].radar_id:'',
+      }).then((res) => {
+        var res = res.data
+        if (res && res.errno == 0) {
+
+      } else if (res.errno != 4002) {
+        this.$message({
+          message: res.err,
+          type: "warning"
+        })
+      }
+    })
+    },
+    init () {
+      this.loading = true
+      if(this.currPage_len>=this.page_size){
+        this.moreloading = true
+      }
+      this.$axios.get(this.URL.BASEURL + this.URL.radar_radarList, {
+        params:{
+          group_id:this.propsData.group_id,
+          name:this.propsData.radar_val,
+          page: this.page,
+          page_size: this.page_size,
+        }
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        if (res && res.errno == 0) {
+          this.tableData = [...this.tableData,...res.rst.data]
+          this.copy_tableData =  JSON.parse(JSON.stringify(this.tableData))
+          this.currPage_len=res.rst.data.length
+          this.moreloading = false
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .span_title{
+    font-weight: 600;
+    color: #000;
+    margin: 10px 0 ;
+  }
+  .ghostClass{
+    font-weight: 600;
+  }
+  .tHead{
+    border:1px solid #ddd;
+    border-bottom: none;
+    div{
+      background-color: #f6f6f6 ;
+      font-size:14px;
+      display:inline-block;
+      font-weight:600;
+      color:#777;
+      text-align: center;
+      height:48px;
+      line-height:48px
+    };
+
+  }
+  .tBody{
+    height: calc(100vh - 60px - 62px - 20px - 10px - 50px);
+    overflow-y: auto;
+    .body_item{
+      display: flex;
+      align-items: center;
+      cursor: move;
+      padding:20px 0;
+      border:1px solid #ddd;
+      border-bottom:none;
+      .body_cell{
+        font-size:14px;
+        color:#333;
+        text-align: center;
+
+      }
+    }
+  }
+  .borderBottomline{
+    border-bottom:1px solid #ddd!important;
+  }
+  .c-00B38A {
+    color: #00B38A!important;
+  }
+  .noData{
+    text-align:center;
+    margin:20px auto;
+  }
+</style>

project/src/router/allRouter.js

@@ -44,6 +44,7 @@ const createChannelCode = () => import(/* webpackChunkName: 'createChannelCode'
 const codeIndex_radar = () => import(/* webpackChunkName: 'codeIndex_radar' */ '@/components/smartRadar/index.vue')
 const radar_dataAnalyse = () => import(/* webpackChunkName: 'radar_dataAnalyse' */ '@/components/smartRadar/dataAnalyse.vue')
 const createRadar = () => import(/* webpackChunkName: 'createRadar' */ '@/components/smartRadar/createRadar.vue')
+const h5test = () => import(/* webpackChunkName: 'h5test' */ '@/components/h5test.vue')
 
 // name与菜单配置的页面路由一致
 // meta下isData:true为数据看板,否则为助手