youhua radar

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -2,9 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerService.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/createquickword.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/createquickword.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/fileType.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/fileType.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/quickwordList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/quickwordList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/createRadar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/createRadar.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/dataAnalyse.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/dataAnalyse.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/dialogGroup.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/dialogGroup.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/fileType.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/fileType.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/groupList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/groupList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/publicTable.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/publicTable.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/radarList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/smartRadar/radarList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/src/router/allRouter.js" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/router/allRouter.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -145,6 +159,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="ts.external.directory.path" value="C:\Program Files (x86)\webstorm\WebStorm 2021.2.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
@@ -159,6 +174,7 @@
       <updated>1657000152862</updated>
       <workItem from="1657000165741" duration="17574000" />
       <workItem from="1657029123073" duration="545000" />
+      <workItem from="1657159278707" duration="9223000" />
     </task>
     <servers />
   </component>
@@ -190,7 +206,7 @@
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />

project/src/components/assembly/screen/customerService.vue

@@ -9,7 +9,7 @@
         <div :class="['common-screen-self-con',
         !final_result||final_result.length==0?'common-screen-self-placeholder':'']">
           <div class="common-screen-self-con-div">
-            <span v-if="!final_result||final_result.length==0">请选择</span>
+            <span v-if="!final_result||final_result.length==0">请选择客服</span>
             <template v-else>
               <span v-for="(item,index) in final_result" :key="index">{{item.name}}{{index==final_result.length-1?'':','}}</span>
             </template>

project/src/components/customOperate/sideTool/index.vue

@@ -15,12 +15,12 @@
 <script>
 import userPortrait from './userPortrait.vue'
 import quickWord from './quickWord/index.vue'
-import radar from '@/components/smartRadar/index'
+import radar from './smartRadar/index'
 export default {
   components: { userPortrait, quickWord, radar },
   data () {
     return {
-      type: 'quickWord'
+      type: 'userPortrait'
     }
   },
   methods: {
@@ -29,15 +29,15 @@ export default {
     },
 
   },
-  beforeRouteEnter(to, from, next) {
-    next(vm=>{
-      if(from.meta.radarChild){
-        vm.type = 'radar'
-      }else{
-        vm.type = 'userPortrait'
-      }
-    });
-  },
+  // beforeRouteEnter(to, from, next) {
+  //   next(vm=>{
+  //     if(from.meta.radarChild){
+  //       vm.type = 'radar'
+  //     }else{
+  //       vm.type = 'userPortrait'
+  //     }
+  //   });
+  // },
 }
 </script>
 <style lang="scss" scoped>

project/src/components/customOperate/sideTool/quickWord/createquickword.vue

@@ -58,7 +58,6 @@ export default {
   },
   methods:{
     rule_id_init(){
-      console.log(this.rule_id,'rule_id_init');
       if (this.rule_id) {//详情
         this.detail()
       }else{
@@ -68,7 +67,6 @@ export default {
     },
     empty_define(){
       this.reset=!this.reset
-      // this.file_rule_id=''
       this.quickwordtitle=''
       this.group_id=''
       this.msg_list=[]
@@ -93,6 +91,7 @@ export default {
     },
     detail () {//详情
       this.loading = true
+      this.reset=!this.reset
       this.$axios.post(this.URL.BASEURL + this.URL.quick_quickDetial, {
         rule_id: this.rule_id
       }).then((res) => {
@@ -104,7 +103,6 @@ export default {
           this.quickwordtitle = dataInfo.title
           this.msg_list = dataInfo.msg_list
           this.file_rule_id = this.rule_id
-          this.reset=!this.reset
           this.edit_detial_Flag=true
         } else if (res.errno != 4002) {
           this.$message({
@@ -145,7 +143,6 @@ export default {
         this.$loading(this.$loadingConfig).close()
         if (res && res.errno == 0) {
           this.$emit('init')
-          // this.empty_define()
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,

project/src/components/customOperate/sideTool/quickWord/fileType.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="regulations">
-    <label><em>*</em>企业话术</label>
+    <label style="flex-shrink: 0"><em>*</em>企业话术</label>
     <div class="wordsCon">
       <div class="con_left">
         <div v-for="(item,index) in wordsList" :key="item.key_val">
@@ -337,9 +337,9 @@ export default {
     reset(){
       this.chuanzhi_msg_list()
     },
-    file_rule_id(){
-      this.chuanzhi_msg_list()
-    }
+    // file_rule_id(){
+    //   this.chuanzhi_msg_list()
+    // }
   },
   created(){
     this.chuanzhi_msg_list()
@@ -428,7 +428,8 @@ export default {
           this.$nextTick(()=>{
             this.wordsActive = this.wordsList[0].key_val
         })
-        }else{
+        }
+        else{
           this.$message({
             type: 'error',
             message: 'msg_list不正确，请联系开发成员'

project/src/components/customOperate/sideTool/quickWord/index.vue

@@ -22,7 +22,7 @@
     <el-drawer
       :visible.sync="showQuick"
       direction="rtl"
-      size="60%">
+      size="65%">
       <div slot="title" class="c-000">新增话术</div>
       <createquickword ref="createquickwordRef" rule_id="" @init="()=>{initFlag=!initFlag;showQuick=false}"></createquickword>
     </el-drawer>

project/src/components/customOperate/sideTool/quickWord/quickwordList.vue

@@ -139,7 +139,7 @@
     <el-drawer
       :visible.sync="showQuick"
       direction="rtl"
-      size="60%">
+      size="65%">
       <div slot="title" class="c-000">编辑话术</div>
       <createquickword :rule_id="rule_id" @init="re_load()"></createquickword>
     </el-drawer>

project/src/components/smartRadar/createRadar.vue

@@ -1,12 +1,5 @@
 <template>
   <div v-loading="loading">
-    <div class="backBox" @click="$router.go(-1)">
-     <div class="back">
-       <i class="el-icon-back"></i>
-       <span>返回</span>
-     </div>
-   </div>
-
     <div v-if="edit_detial_Flag" class="bg-ffffff createMassMsg" style="padding: 10px 30px 10px;">
       <div class="regulations">
         <label><em>*</em>名称</label>
@@ -31,6 +24,8 @@
                   url_list_echo:url_list_echo,
                   type:type
                 }"
+                :reset='resetFlag'
+                :file_rule_id="file_rule_id"
                 @getType="(val)=>{type = val}"></fileType>
       <div class="regulations">
         <label><em>*</em>雷达标题</label>
@@ -100,7 +95,6 @@
         <el-button type="primary" @click="newCode_click">保存</el-button>
       </div>
     </div>
-
     <el-dialog
       :append-to-body="true"
       title="查看案例"
@@ -119,6 +113,7 @@ import fileType from './fileType.vue'
 import enterpriseTag from '@/components/assembly/screen/enterpriseTagFC.vue'
 export default {
   name: "createRadar",
+  props:['radar_id'],
   components:{
     fileType,
     enterpriseTag
@@ -156,21 +151,43 @@ export default {
       tag_info:[],
       url_list_echo:[],
       caseShow:false,
-      caseType:'title'
+      caseType:'title',
+      file_rule_id:''
     }
   },
   watch:{
-
+    radar_id(){
+      this.radar_id_init()
+    }
   },
   created(){
     this.init_groupList()
-    if (this.$route.query.id) {//详情
-      this.detail()
-    }else{
-      this.edit_detial_Flag=true
-    }
+    this.radar_id_init()
   },
   methods:{
+    radar_id_init(){
+      this.empty_define()
+      if (this.radar_id) {//详情
+        this.detail()
+      }else{
+        this.edit_detial_Flag=true
+      }
+    },
+    empty_define(){
+      this.resetFlag=!this.resetFlag
+      this.smartVal=[]
+      this.user_id_list=[]
+      this.coverFileList=[]
+      this.cover_id=''
+      this.radardesc=''
+      this.radartitle=''
+      this.radarName=''
+      this.group_id=''
+      this.afferent_tag_obj.tag_id_list=[]
+      this.tag_info=[]
+      this.url_list_echo=[]
+      this.type=1
+    },
     caseClick(type){
       this.caseShow = true
       this.caseType = type
@@ -240,13 +257,14 @@ export default {
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.radar_radarDetail, {
         params: {
-          radar_id: this.$route.query.id
+          radar_id: this.radar_id
         }
       }).then((res) => {
         this.loading = false
         var res = res.data
         if (res && res.errno == 0) {
           let dataInfo = res.rst
+          this.file_rule_id = this.radar_id
           this.radarName = dataInfo.name
           this.group_id = dataInfo.group_id
           this.radartitle = dataInfo.title
@@ -327,13 +345,13 @@ export default {
 
       this.$loading(this.$loadingConfig)
       let api=''
-      if(this.$route.query.id){//编辑
+      if(this.radar_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 : '',
+        radar_id: this.radar_id ? this.radar_id : '',
         group_id:this.group_id,
         name: this.radarName,
         type:this.type,
@@ -349,7 +367,7 @@ export default {
         var res = res.data
         this.$loading(this.$loadingConfig).close()
         if (res && res.errno == 0) {
-          this.$router.go(-1)
+          this.$emit('init')
         } else if (res.errno != 4002) {
           this.$message({
             message: res.err,
@@ -402,7 +420,7 @@ export default {
 
 </style>
 <style lang="scss" scoped>
-@import "../customOperate/create.scss";
+@import "@/components/customOperate/create.scss";
 
 .newGroupCss{
   color: #00b38a;

project/src/components/smartRadar/dataAnalyse.vue

@@ -1,13 +1,5 @@
 <template>
   <div class="con" v-loading="loading">
-    <div class="backBox" @click="$router.go(-1)">
-      <div class="back">
-        <i class="el-icon-back"></i>
-        <span>返回</span>
-        (数据分析)
-      </div>
-    </div>
-
     <div class="dataBox">
       <div v-for="(item,index) in dataPreview" :key="index" class="box_item">
         <div class="c-000 fWeight600">{{item.bigTitle?item.bigTitle:'-'}}</div>
@@ -20,7 +12,9 @@
       <publicTable
         :propsData="{
           desCol:desCol,
-          source:'dataAnalyse'
+          source:'dataAnalyse',
+          radar_id:analyse_id,
+          reset:reset
         }"
       ></publicTable>
     </div>
@@ -31,6 +25,7 @@
 import publicTable from './publicTable.vue'
 export default {
   name: "dataAnalyse",
+  props:['analyse_id','reset'],
   components:{
     publicTable
   },
@@ -65,18 +60,23 @@ export default {
         { prop: "last_click_time", label: "最近点击时间" },
         { prop: "last_click_channel", label: "最近点击渠道" },
         { prop: "pv_count", label: "客户访问总次数"}
-      ]
+      ],
     }
   },
-  created(){
-    this.init_preview()
+  watch:{
+    reset(){
+      console.log(this.reset);
+      this.$nextTick(()=>{
+        this.init_preview()
+      })
+    }
   },
   methods:{
     init_preview(){//数据概览
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.radar_dataView, {
         params:{
-          radar_id:this.$route.params.id
+          radar_id:this.analyse_id
         }
       }).then((res) => {
         var res = res.data
@@ -108,11 +108,12 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  padding: 0 20px;
   .box_item{
     min-width: 23%;
     padding: 20px 15px 10px;
     font-size: 14px;
-    background-color: #fff;
+    background-color: rgb(249,249,249);
     border-radius: 4px;
     .splitLine{
       width: 100%;

project/src/components/smartRadar/fileType.vue

@@ -120,7 +120,7 @@
 <script>
 export default {
   name: "fileType",
-  props:['comeBackParms'],
+  props:['comeBackParms','reset','file_rule_id'],
   data(){
     return{
       fileType_Val:1,
@@ -163,40 +163,61 @@ export default {
     }
   },
   watch:{
+    reset(){
+      this.chuanzhi_init()
+    },
+    file_rule_id(){
+      this.chuanzhi_init()
+    },
     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],
-          name:paramsurl[0],
-        })
-        this.pdfVal = paramsurl
-      }else if(paramsType==3){
-        paramsurl.forEach(item=>{
-          this.typeImgList.push({
-            url:item
+    this.chuanzhi_init()
+  },
+  methods:{
+    chuanzhi_init(){
+      if (this.file_rule_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=[]
+          this.pdfList.push({
+            url:paramsurl[0],
+            name:paramsurl[0],
           })
-        })
-        this.imgVals = paramsurl
-      }else if(paramsType==4){
+          this.pdfVal = paramsurl
+        }else if(paramsType==3){
+          this.typeImgList=[]
+          paramsurl.forEach(item=>{
+            this.typeImgList.push({
+              url:item
+            })
+          })
+          this.imgVals = paramsurl
+        }else if(paramsType==4){
+          this.mp4List=[]
           this.mp4List.push({
             url:paramsurl[0],
             name:paramsurl[0],
           })
-        this.mp4Val = paramsurl
+          this.mp4Val = paramsurl
+        }
+      }else{
+        this.fileType_Val=1
+        this.jumplink_val=''
+          this.pdfList=[]
+          this.pdfVal=[]
+          this.typeImgList=[]
+          this.imgVals=[]
+          this.mp4List=[]
+          this.mp4Val=[]
       }
-    }
-  },
-  methods:{
+    },
     judgeType(){
       this.returnFlag = false
       this.ur_list=[]
@@ -349,7 +370,7 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-@import "../customOperate/create.scss";
+@import "@/components/customOperate/create.scss";
 .regulations{
   margin-top: 0;
 }

project/src/components/smartRadar/index.vue

@@ -19,6 +19,14 @@
           }"></radarList>
       </div>
     </div>
+
+    <el-drawer
+      :visible.sync="showOerateBox"
+      direction="rtl"
+      size="60%">
+      <div slot="title" class="c-000">新增雷达</div>
+      <createRadar ref="createRadarRef" radar_id="" @init="()=>{initFlag=!initFlag;showOerateBox=false}"></createRadar>
+    </el-drawer>
   </div>
 </template>
 
@@ -26,15 +34,18 @@
 import selfInput from '@/components/assembly/screen/input.vue'
 import groupList from './groupList.vue'
 import radarList from './radarList.vue'
+import createRadar from './createRadar.vue'
 export default {
   name: "codeIndex",
   components:{
     selfInput,
     groupList,
-    radarList
+    radarList,
+    createRadar
   },
   data() {
     return {
+      showOerateBox:false,
       initFlag:false,
       radar_val:'',
       reset:false,
@@ -48,7 +59,10 @@ export default {
       this.radar_val = ''
     },
     created_radar(){//新建
-      this.$router.push({path:'/createRadar'})
+      this.showOerateBox=true
+      this.$nextTick(()=>{
+        this.$refs.createRadarRef.radar_id_init()
+      })
     },
     copy() {
       let corpid = '';

project/src/components/smartRadar/publicTable.vue

@@ -1,11 +1,14 @@
 <template>
   <div>
     <template v-if="propsData.source == 'dataAnalyse'">
-      <div class="span_title">打开链接的客户 ({{customer_count||customer_count==0 ? customer_count : '-'}})</div>
+      <div class="span_title">
+        <span class="spn_area"></span>
+        打开链接的客户 ({{customer_count||customer_count==0 ? customer_count : '-'}})
+      </div>
       <div class="flex-align-center" style="flex-wrap: wrap">
-        <self-input :reset="reset" :hasLabel="true" label_name="搜索客户" @inputChange='(val)=>{customer_name = val;source_init()}'></self-input>
-        <div class="flex" style="margin-right: 20px">
-          <div class="f14 c-666" style="flex-shrink: 0;margin-right: 6px;width: 80px;text-align: right;">选择渠道</div>
+        <self-input :reset="reset" :hasLabel="false" label_name="搜索客户" @inputChange='(val)=>{customer_name = val;source_init()}'></self-input>
+        <div class="flex" style="margin: 0 10px">
+<!--          <div class="f14 c-666" style="flex-shrink: 0;margin-right: 6px;width: 80px;text-align: right;">选择渠道</div>-->
           <el-select v-model="channel" size="small" clearable placeholder="请选择渠道" @change="source_init()" style="width: 200px">
             <el-option
               v-for="(item,index) in channelList"
@@ -18,7 +21,7 @@
         <date-picker :reset="reset" title=""  :quickFlag="false" :afferent_time="default_time"
                      :clearFlag='false' @changeTime="changeTime"></date-picker>
         <!-- 所属客服 -->
-        <self-customerservice :reset='reset' :hasLabel="true" label_name="" @customerDefine="(val)=>{user_list=val;source_init()}"></self-customerservice>
+        <self-customerservice style="margin-left: 10px" :reset='reset' title="" @customerDefine="(val)=>{user_list=val;source_init()}"></self-customerservice>
         <el-button type="primary" size="mini" @click="resetAll" style="margin-left: 10px">重置</el-button>
       </div>
     </template>
@@ -116,6 +119,9 @@ export default {
   watch:{
     'propsData.initFlag'(){
       this.source_init()
+    },
+    'propsData.reset'(){
+      this.init_analyse_list()
     }
   },
   created() {
@@ -164,10 +170,19 @@ export default {
       });
     },
     init_analyse_list(){//数据概览列表
+
+      console.log(this.propsData.radar_id);
+      if(this.propsData.radar_id==''){
+        this.$message({
+          message: 'radar_id不正确',
+          type: "warning"
+        })
+        return
+      }
       this.loading = true
       this.$axios.get(this.URL.BASEURL + this.URL.radar_dataView_list, {
         params:{
-          radar_id:this.$route.params.id,
+          radar_id:this.propsData.radar_id,
           customer_name:this.customer_name,
           channel:this.channel,
           user_list:this.user_list,
@@ -196,7 +211,7 @@ export default {
       this.$router.push('/radar_dataAnalyse/'+id)
     },
     editRadar(id){
-      this.$router.push({path:'/createRadar',query: {id:id}})
+      // this.$router.push({path:'/createRadar',query: {id:id}})
     },
     deleRadar(id){
       this.loading = true
@@ -255,5 +270,14 @@ export default {
     font-weight: 600;
     color: #000;
     margin: 10px 0 ;
+    display: flex;
+    align-items: center;
+    .spn_area{
+      display: inline-block;
+      width: 4px;
+      height: 16px;
+      background-color: #00B38A;
+      margin-right: 4px;
+    }
   }
 </style>

project/src/components/smartRadar/radarList.vue

@@ -38,11 +38,11 @@
               </div>
               <div v-else-if="item.prop=='oprate'">
                 <div class="flex" style="padding: 0 10px;font-size: 13px">
-                  <div class="c-00B38A pointer" @click="editRadar(row.radar_id)">编辑</div>
-                  <el-popconfirm @confirm="deleRadar(row.radar_id)" :title="`确定删除【${row.name}】渠道活码？`">
+                  <div class="c-00B38A pointer" @click="editRadar(row.radar_id,row.name)">编辑</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 class="c-00B38A pointer lMar8" @click="goDataAanlyse(row.radar_id,row.name)">分析数据</div>
                 </div>
               </div>
               <div v-else>{{row[item.prop] ||row[item.prop]==0 ? row[item.prop] : '-'}}</div>
@@ -53,17 +53,35 @@
         <p class="text-center f14 tMar8 c-d3" v-if="noMore"></p>
       </div>
       <div class="noData" v-else>暂无数据</div>
-
     </div>
+    <el-drawer
+      :visible.sync="showOerateBox"
+      direction="rtl"
+      size="60%">
+      <div slot="title" class="c-000">编辑雷达({{radar_name}})</div>
+      <createRadar :radar_id="radar_id" @init="re_load()"></createRadar>
+    </el-drawer>
+
+    <el-drawer
+      :visible.sync="showOerateBox_analyse"
+      direction="rtl"
+      size="70%">
+      <div slot="title" class="c-000">数据分析({{radar_name}})</div>
+      <dataAnalyse :reset="reset" :analyse_id="analyse_id"></dataAnalyse>
+    </el-drawer>
   </div>
 </template>
 
 <script>
   import draggable from "vuedraggable"
+  import dataAnalyse from './dataAnalyse.vue'
+  import createRadar from './createRadar.vue'
 export default {
   name: "radarList",
   components:{
-    draggable
+    draggable,
+    createRadar,
+    dataAnalyse
   },
   props:['propsData'],
   computed: {
@@ -76,6 +94,12 @@ export default {
   },
   data(){
     return{
+      radar_id:'',
+      radar_name:'',
+      analyse_id:'',
+      reset: false,
+      showOerateBox_analyse: false,
+      showOerateBox: false,
       loading: false,
       moreloading: false,
       page: 1,
@@ -98,10 +122,7 @@ export default {
   },
   watch:{
     'propsData.initFlag'(){
-      this.page=1
-      this.tableData=[]
-      this.copy_tableData=[]
-      this.init()
+      this.re_load()
     }
   },
   created() {
@@ -109,15 +130,27 @@ export default {
     this.init(1)
   },
   methods:{
+    re_load(){
+      this.showOerateBox=false
+      this.page=1
+      this.tableData=[]
+      this.copy_tableData=[]
+      this.init()
+    },
     load(){
       this.page += 1
       this.init()
     },
-    goDataAanlyse(id){
-      this.$router.push('/radar_dataAnalyse/'+id)
+    goDataAanlyse(id,name){
+      this.reset=!this.reset
+      this.radar_name = name
+      this.analyse_id = id
+      this.showOerateBox_analyse = true
     },
-    editRadar(id){
-      this.$router.push({path:'/createRadar',query: {id:id}})
+    editRadar(id,name){
+      this.radar_name = name
+      this.radar_id = id
+      this.showOerateBox = true
     },
     deleRadar(id){
       this.loading = true

project/src/router/allRouter.js

@@ -41,10 +41,7 @@ const importRecordDetial = () => import(/* webpackChunkName: 'importRecordDetial
 const codeIndex = () => import(/* webpackChunkName: 'codeIndex' */ '@/components/channelCode/codeIndex.vue')
 const code_dataAnalyse = () => import(/* webpackChunkName: 'dataAnalyse' */ '@/components/channelCode/dataAnalyse.vue')
 const createChannelCode = () => import(/* webpackChunkName: 'createChannelCode' */ '@/components/channelCode/createChannelCode.vue')
-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 createquickword = () => import(/* webpackChunkName: 'createquickword' */ '@/components/customOperate/sideTool/quickWord/createquickword.vue')
+const radarIndex = () => import(/* webpackChunkName: 'radarIndex' */ '@/components/customOperate/sideTool/smartRadar/index.vue')
 
 // name与菜单配置的页面路由一致
 // meta下isData:true为数据看板,否则为助手
@@ -106,19 +103,9 @@ export var allRouter = [
         }
       },
       {
-        path: 'createquickword',
+        path: 'radarIndex',
         name: 'sideTool',
-        component: createquickword,
-        meta: {
-          keepAlive: false,
-          isLogin: true,
-          title: '快捷话术'
-        }
-      },
-      {
-        path: 'codeIndex_radar',
-        name: 'sideTool',
-        component: codeIndex_radar,
+        component: radarIndex,
         meta: {
           keepAlive: false,
           isLogin: true,
@@ -126,28 +113,6 @@ export var allRouter = [
         }
       },
       {
-        path: 'radar_dataAnalyse/:id',
-        name: 'sideTool',
-        component: radar_dataAnalyse,
-        meta: {
-          keepAlive: false,
-          isLogin: true,
-          title: '雷达数据分析',
-          radarChild: true
-        }
-      },
-      {
-        path: 'createRadar',
-        name: 'codeIndex',
-        component: createRadar,
-        meta: {
-          keepAlive: false,
-          isLogin: true,
-          title: '新建智能雷达',
-          radarChild: true
-        }
-      },
-      {
         path: 'codeIndex',
         name: 'codeIndex',
         component: codeIndex,