fix bug

src/views/chartRelevance_manage/components/explainText.js

@@ -39,5 +39,24 @@ export const statisticFeatureListTextArr = [
 
 //跨品种分析
 export const crossVarietyAnalisisTextArr = [
+    `<p style="font-weight:bold;">一、处理逻辑</p>
+    <p>1、百分位计算公式：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算</p>
+    <p>2、取值方式：</p>
+    <p>（1）通过“选择日期”和“时间长度”，时间范围为“选择日期”至选择的日期往过去推“时间长度”，在这个时间段找出指标最大值和最小值，进行百分位计算。</p>
+    <p>（2）若在（1）的时间范围下找不到值，则继续往过去找，直到找到值。</p>
+    <p>3、图表说明：</p>
+    <p> （1）某个品种会有多个坐标点（坐标点的数量取决于设置的日期数量）；</p>
+    <p> （2）坐标点的X、Y值取实际日期与值。</p>`,
+
+    `<p style="font-weight:bold;">二、相关配置</p>
+    <p>1、基本配置</p>
+    <p>（1）管理员进行品种管理、标签管理；</p>
+    <p>（2）使用者对标签的品种关联指标。</p>
+    <p>2、计算配置</p>
+    <p>（1）时间长度：默认显示6个月；</p>
+    <p>（2）选择日期：最多支持选择5个日期；</p>
+    <p>（3）X轴坐标：选择标签；</p>
+    <p>（4）Y轴坐标：选择标签；</p>
+    <p>（5）图表名称：X轴坐标和Y轴坐标的拼接。</p>`
 
 ]

src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue

@@ -96,7 +96,7 @@
                 height="450px"
                 ref="chartRef"
               />
-              <span class="chart-author">作者:{{ chartInfo.SysUserRealName}}</span>
+              <span class="chart-author">作者:{{ chartInfo.SysUserRealName || accountName}}</span>
 
               <!-- 上下限 -->
               <template>	
@@ -174,6 +174,7 @@
       :isShow.sync="isShowSetDia"
       :type="dialogType"
       :dataList="dialogType==='variety'?varietyOptions:tagOptions"
+      @refresh="dialogType==='tag'?getTagList():getVarietyList();"
     />
 
     <!-- 标签指标配置 -->
@@ -181,6 +182,7 @@
       :isShow.sync="isShowTagRelationDia"
       :varietyList="varietyOptions"
       :info="tagRelationInfo"
+      @refresh="getTagList"
     />
 
     <!-- 操作说明 -->
@@ -236,13 +238,18 @@ export default {
     },
   },
   mixins: [ chartSetMixin ],
+  computed: {
+    accountName() {
+      return localStorage.getItem('userName')
+    }
+  },
   data() {
     return {
       chart_code: this.$route.query.code || '',
       isSlideLeft: false,
       chartInfo: {
         Source: 10,
-        SysUserRealName: '还真'
+        SysUserRealName: ''
       },
 
       showExplain: false,

src/views/chartRelevance_manage/crossVarietyAnalysis/components/chartFormSection.vue

@@ -130,8 +130,8 @@ export default {
       form: {
         ChartName:'',
         Source: 10,
-        CalculateValue: '',
-        CalculateUnit: '天',
+        CalculateValue: 6,
+        CalculateUnit: '月',
         TagX: '',
         TagY: '',
         DateConfigList: [
@@ -154,6 +154,8 @@ export default {
   },
   methods: {
     addDateHandle() {
+      if(this.form.DateConfigList.length === 5) return this.$message.warning('日期数量已达上限')
+
       this.form.DateConfigList.push({
         DateType: 1,Num: 1
       })

src/views/chartRelevance_manage/crossVarietyAnalysis/components/tagRelationDialog.vue

@@ -135,6 +135,7 @@ export default {
 
       if(res.Ret!==200) return
       this.$message.success('配置保存成功')
+      this.$emit('refresh')
       this.cancelHandle()
     },300),
 

src/views/chartRelevance_manage/crossVarietyAnalysis/components/tagSetDialog.vue

@@ -16,10 +16,12 @@
         placeholder="请输入名称"
         prefix-icon="el-icon-search"
         size="medium"
+        clearable 
+        @change="filterList"
       />
       <div class="tag-list">
         <div
-          v-for="(item,index) in list"
+          v-for="(item,index) in showList"
           :key="item.id"
           class="el-tag"
           :style="item.isEdit&&'padding:0;border:none;'"
@@ -32,14 +34,20 @@
             class="input-edit"
             :ref="`inputRef${index}`"
             size="small"
-            @keyup.enter.native="editItemHandle(item)"
+            @change="editItemHandle(item)"
           />
           <span v-else>
             {{ item.label }}
-            <i 
-              class="el-tag__close el-icon-close" 
-              @click.stop="closeItemHandle(item)"
-            />
+            <el-popconfirm
+              :title="`是否确认删除该${type==='tag'?'标签':'品种'}`"
+              @onConfirm="closeItemHandle(item)"
+            >
+              <i
+                slot="reference"
+                class="el-tag__close el-icon-close" 
+              />
+                <!-- @click.stop="closeItemHandle(item)" -->
+            </el-popconfirm>
           </span>
         </div>
 
@@ -49,7 +57,7 @@
           v-model="inputValue"
           ref="saveTagInput"
           size="small"
-          @keyup.enter.native="addNewTagHandle"
+          @change="addNewTagHandle"
         >
         </el-input>
         <el-button v-else size="small" @click="addNewItem">+ 标签</el-button>
@@ -84,17 +92,17 @@ export default {
       this.initData();
     }
   },
+  computed: {
+    showList() {
+      return this.list.length ? this.list.filter(_ => _.label.includes(this.searchTxt)) : []
+    }
+  },
   data() {
     return {
       searchTxt: '',
       inputVisible: false,
       inputValue: '',
-      list: [
-        { label: '基差' },
-        { label: '库存' },
-        { label: '进口' },
-        { label: '产量' },
-      ]
+      list: []
     }
   },
   mounted(){
@@ -103,7 +111,6 @@ export default {
   methods:{
     /* 关闭标签 */
     closeItemHandle(item) {
-
       this.delItem(item)
     },
 
@@ -113,6 +120,7 @@ export default {
         : await crossVarietyInterface.varietyDel({ChartVarietyId:item.id})
 
       if(res.Ret !== 200) return
+      this.$message.success('删除成功')
       // let index = this.list.findIndex(_ => _.id === item.id);
       // this.list.splice(index,1)
       
@@ -160,18 +168,20 @@ export default {
     },
 
     refreshData() {
-      this.type==='tag' ? this.$parent.getTagList() : this.$parent.getVarietyList();
+      this.searchTxt = ''
+      this.$emit('refresh')
     },
 
     initData() {
       this.list = this.dataList.map(_ => ({
-        label: this.type==='tag' ? _.ChartTagName : _.ChartVarietyName,
-        id: this.type==='tag' ? _.ChartTagId : _.ChartVarietyId,
+        label: _.ChartTagName || _.ChartVarietyName,
+        id:  _.ChartTagId || _.ChartVarietyId,
         ..._
       }))
     },
 
     cancelHandle() {
+      this.searchTxt = ''
       this.$emit('update:isShow',false)
     }
   },