switch branch

src/api/modules/chartRelevanceApi.js

@@ -682,4 +682,194 @@ export const statisticFeatureInterface = {
     previewSpline: params => {
       return http.post('/line_feature/preview_cure',params)
     }
+}
+
+/* 跨品种分析 */
+export const crossVarietyInterface = {
+  /**
+   * 分类列表
+   * @param {*} params 
+   * @returns 
+   */
+  classifyList: params => {
+    return http.get('/cross_variety/chart_classify/list',params)
+  },
+
+  /**
+   * 分类添加
+   * @param {*} params ChartClassifyName
+   * @returns 
+   */
+  classifyAdd: params => {
+    return http.post('/cross_variety/chart_classify/add',params)
+  },
+
+  /**
+   * 分类编辑
+   * @param {*} params ChartClassifyName ChartClassifyId
+   * @returns 
+   */
+  classifyEdit: params => {
+    return http.post('/cross_variety/chart_classify/edit',params)
+  },
+
+  /**
+   * 删除监测
+   * @param {*} params ChartClassifyId
+   * @returns 
+   */
+  classifyDelCheck: params => {
+    return http.post('/cross_variety/chart_classify/delete/check',params)
+  },
+
+  /**
+   * 删除
+   * @param {*} params ChartClassifyId
+   * @returns 
+   */
+  classifyDel: params => {
+    return http.post('/cross_variety/chart_classify/delete',params)
+  },
+
+  /**
+   * 分类移动
+   * @param {*} params 
+   * "ClassifyId": 269,
+    "PrevClassifyId": 0,
+    "NextClassifyId": 227,
+   * @returns 
+   */
+  classifyMove: params => {
+    return http.post('/cross_variety/chart_classify/move',params)
+  },
+
+   /**
+   * 图表拖动
+   * @param {*} params 
+   * "ChartInfoId": 844,
+    "PrevChartInfoId": 0,
+    "NextChartInfoId": 839,
+    "ChartClassifyId": 270
+   * @returns 
+   */
+    chartMove: params => {
+      return http.post('/cross_variety/chart_info/move',params)
+    },
+  
+    /**
+     * 获取图表列表
+     * @param {*} params 
+     * CurrentIndex PageSize ChartClassifyId Keyword IsShowMe
+     * @returns 
+     */
+    getChartList: params => {
+      return http.get('/cross_variety/chart_info/list',params)
+    },
+  
+    /**
+     * 图表详情
+     * @param {*} params  ChartInfoId
+     * @returns 
+     */
+    chartDetail: params => {
+      return http.get('/cross_variety/chart_info/detail',params)
+    },
+    
+    /**
+     * 添加品种
+     * @param {VarietyName} params 
+     * @returns 
+     */
+    varietyAdd: params => {
+      return http.post('/cross_variety/variety/add',params)
+    },
+    
+    /**
+     * 编辑品种
+     * @param {VarietyName ChartVarietyId} params 
+     * @returns 
+     */
+    varietyEdit: params => {
+      return http.post('/cross_variety/variety/edit',params)
+    },
+    
+    /**
+     * 删除品种检测
+     * @param {ChartVarietyId} params 
+     * @returns 
+     */
+    varietyDelCheck: params => {
+      return http.post('/cross_variety/variety/delete/check',params)
+    },
+    
+    /**
+     * 删除品种
+     * @param {VarietyName} params 
+     * @returns 
+     */
+    varietyDel: params => {
+      return http.post('/cross_variety/variety/delete',params)
+    },
+
+    /**
+     * 添加标签
+     * @param {TagName} params 
+     * @returns 
+     */
+    tagAdd: params => {
+      return http.post('/cross_variety/tag/add',params)
+    },
+
+    /**
+     * 编辑标签
+     * @param {TagName ChartTagId} params 
+     * @returns 
+     */
+    tagEdit: params => {
+      return http.post('/cross_variety/tag/edit',params)
+    },
+
+    /**
+     * 删除标签检测
+     * @param {ChartTagId} params 
+     * @returns 
+     */
+    tagDelCheck: params => {
+      return http.post('/cross_variety/tag/delete/check',params)
+    },
+
+    /**
+     * 添加标签
+     * @param {ChartTagId} params 
+     * @returns 
+     */
+    tagDel: params => {
+      return http.post('/cross_variety/tag/delete',params)
+    },
+
+    /**
+     * 设置标签关联品种对应信息
+     * @param {
+        "ChartTagId": 1,
+        "VarietyEdb": [
+            {
+                "ChartVarietyId": 2,
+                "EdbInfoId": 103407
+            },
+        ]
+     * } params 
+     * @returns 
+     */
+    setTagRelationVariety: params => {
+      return http.post('/cross_variety/tag/variety_edb/save',params)
+    },
+
+
+    /**
+     * 获取标签关联的品种信息
+     * @param {ChartTagId} params 
+     */
+    getTagRelation: params => {
+      return http.get('/cross_variety/tag/variety_edb/list',params)
+    }
 }

src/utils/buttonConfig.js

@@ -508,6 +508,22 @@ export const statisticPermission = {
     fittingEq_refresh:'fittingEq:refresh',
     fittingEq_addMyChart:'fittingEq:addMyChart',
     fittingEq_share:'fittingEq:share',
+
+    /* 跨品种分析 */
+    crossVariety_addChart:'crossVariety:addChart',//添加图表按钮
+    crossVariety_onlyMine:'crossVariety:onlyMine',//只看我的
+    crossVariety_classifyOpt_edit:'crossVariety:classifyOpt:edit',//添加编辑分类
+    crossVariety_classifyOpt_delete:'crossVariety:classifyOpt:delete',//删除分类
+        /*---图表操作栏--- */
+    crossVariety_del:'crossVariety:del',
+    crossVariety_enNameSetting:'crossVariety:enNameSetting',
+    crossVariety_copyWechat:'crossVariety:copyWechat',
+    crossVariety_copyOffice:'crossVariety:copyOffice',
+    crossVariety_edit:'crossVariety:edit',
+    crossVariety_otherSave:'crossVariety:otherSave',
+    crossVariety_refresh:'crossVariety:refresh',
+    crossVariety_addMyChart:'crossVariety:addMyChart',
+    crossVariety_share:'crossVariety:share',
 }
 /*
  * --------------------------------------------------------------------------供应分析------------------------------------------------

src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue

@@ -26,7 +26,7 @@
             <label>选择品种</label>
             <el-button type="text" @click="setDialogOpen('variety')">品种管理</el-button>
           </div>
-          <div class="list">
+          <div class="list" v-if="varietyOptions.length">
             <el-tag 
               size="small" 
               class="tag"
@@ -35,6 +35,8 @@
               @click="checkVarietyHandle(item)"
             >{{item.label}}</el-tag>
           </div>
+
+          <tableNoData v-else text="暂无品种" size="mini"/>
         </section>
 
         <el-divider/>
@@ -44,7 +46,7 @@
             <label>标签配置</label>
             <el-button type="text" @click="setDialogOpen('tag')">标签管理</el-button>
           </div>
-          <div class="list">
+          <div class="list" v-if="tagOptions.length">
             <el-tag 
               size="small" 
               class="tag"
@@ -53,6 +55,8 @@
               @click="setTagRelationOpen(item)"
             >{{item.label}}</el-tag>
           </div>
+
+          <tableNoData text="暂无标签" size="mini" v-else/>
         </section>
 
       </div>
@@ -167,7 +171,7 @@
 </template>
 
 <script>
-import {statisticFeatureInterface} from '@/api/modules/chartRelevanceApi';
+import { crossVarietyInterface } from '@/api/modules/chartRelevanceApi';
 import { chartSetMixin } from '@/views/dataEntry_manage/mixins/chartPublic';
 import Chart from '@/views/dataEntry_manage/components/chart';
 import ExplainDialog from '../components/explainDialog.vue';
@@ -220,22 +224,10 @@ export default {
 
       showExplain: false,
 
-      checkedVariety: [],
-      varietyOptions: [
-        {label: '螺纹'},
-        {label: 'PTA'},
-        {label: '大豆'},
-        {label: '猪肉'},
-        {label: '热卷'},
-        {label: '焦炭'},
-      ],
-
-      tagOptions: [
-        {label:'基差'},
-        {label:'库存'},
-        {label:'进口'},
-        {label:'产量'},
-      ],
+      checkedVariety: [], //选中的品种
+      varietyOptions: [],
+
+      tagOptions: [],
 
       isShowSetDia: false,//管理弹窗
       dialogType: '',
@@ -250,6 +242,15 @@ export default {
     async getChartDetail() {
       
     },
+
+    /* 获取标签列表 */
+    async getTagList() {
+      // let res = await crossVarietyInterface.getTagListApi() 
+    },
+
+    async getVarietyList() {
+      // let res = await crossVarietyInterface.getVarietyListApi()
+    },
     
     /* 选择品种 */
     checkVarietyHandle(item) {

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

@@ -60,12 +60,13 @@
   </el-dialog>
 </template>
 <script>
+import { crossVarietyInterface } from '@/api/modules/chartRelevanceApi';
 export default {
   props: {
     isShow: {
       type: Boolean
     },
-    type: {
+    type: { //tag  variety
       type: String
     },
     dataList: {
@@ -111,14 +112,17 @@ export default {
     },
 
     /* 新增标签 */
-    addNewTagHandle() {
+    async addNewTagHandle() {
       this.inputVisible = false;
       if(!this.inputValue) return
 
-      let item = {
-        label: this.inputValue
-      }
-      this.list.push(item)
+      let res = this.type==='tag' 
+        ? await crossVarietyInterface.tagAdd({ TagName: this.inputValue})
+        : await crossVarietyInterface.varietyAdd({ VarietyName: this.inputValue})
+      // let item = {
+      //   label: this.inputValue
+      // }
+      // this.list.push(item)
       
     },
 
@@ -130,13 +134,11 @@ export default {
     },
 
     /* 编辑标签 */
-    editItemHandle(item) {
+    async editItemHandle(item) {
       item.isEdit = false;
-    },
-
-    /* 保存标签 */
-    saveListHandle() {
-
+      let res = this.type==='tag' 
+        ? await crossVarietyInterface.tagEdit({ TagName: this.inputValue,ChartTagId:''})
+        : await crossVarietyInterface.varietyEdit({ VarietyName: this.inputValue,ChartVarietyId:''})
     },
 
     cancelHandle() {