冲突处理

src/views/Decision/Decision2Cndb.vue

@@ -960,7 +960,6 @@ export default {
     tooltip(param, callback) {
       var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
 
-<<<<<<< HEAD
       var result = param[0].axisValue;
       param.forEach((value, index) => {
         result +=
@@ -997,41 +996,6 @@ export default {
     },
   },
 };
-=======
-				var result = param[0].axisValue;
-				param.forEach((value, index) => {
-					result += "<br />" +
-						`<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${color[index]};"></span>` +
-						value.seriesName + "：" + value.value;
-				});
-				callback(result);
-				return true;
-			},
-			dbfx() {
-				var that = this;
-				console.log('dbid:',that.tableId)
-				if (that.tableId.length == 2) {
-					that.dialogVisible = true;
-					this.AjaxDbfx();
-					this.clearDb();
-				}
-			},
-			clearDb() { //清空对标状态
-				this.$refs.curRef.clearCheckBox();
-				this.tableId = [];
-				this.dbData = [];
-				this.checkLength = 0;
-			},
-			back() {
-				this.detailShow = 1;
-				this.clearDb();
-			},
-			onSort(){
-				this.clearDb();
-			}
-		}
-	};
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
 </script>
 
 <style lang="less">

src/views/Decision/Decision2Xldb.vue

@@ -190,11 +190,6 @@ export default {
   data() {
     let that = this;
     return {
-<<<<<<< HEAD
-=======
-      detailId: "", //详情id
-      idArr: [],
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       oneData: [],
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
@@ -214,27 +209,14 @@ export default {
             is_num: false,
             is_light: false,
             width: "50px",
-<<<<<<< HEAD
             template: function () {
               return "<input class='check curCheckBox' type='CheckBox'/>";
             },
             click: function (event, data) {
-=======
-            template: function() {
-              return "<input class='check curCheckBox' type='CheckBox'/>";
-            },
-            click: function(event, data) {
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               // checkbox 事件
               // event.target checkbox or td 需进行判断
               // event.target.checked 判断 checkbox 是否选中
               // data  当前数据
-<<<<<<< HEAD
-=======
-              // console.log(that);
-              // console.log(event.target);
-              // console.log(event.target.checked);
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {

src/views/Decision/Decision2Xmdb.vue

@@ -170,11 +170,6 @@ export default {
   data() {
     let that = this;
     return {
-<<<<<<< HEAD
-=======
-      detailId: "", //详情id
-      idArr: [],
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       tableIdArr: [], //放checkbox的id数组
       tableId: [],
       checkLength: 0, //对标分析只能选择2个
@@ -403,69 +398,11 @@ export default {
             field: "cz",
             is_num: false,
             is_light: false,
-<<<<<<< HEAD
             template: function () {
               return "<a class='action'>详情</a>";
             },
             click: function (event, data) {
               var dataId = that.tableIdArr[data.index - 1];
-=======
-            template: function() {
-              return "<a class='action'>详情</a>";
-            },
-            click: function(event, data) {
-              console.log("dataDetail:", data);
-			   if (data.name.includes("麻黄山一期")) {
-                that.detailId = "MHS01_GC";
-                console.log("麻黄山一期");
-              } else if (data.name.includes("麻黄山二期")) {
-                that.detailId = "MHS02_GC";
-                console.log("麻黄山二期");
-              }
-              else if (data.name.includes("牛首山一期")) {
-                that.detailId = "NSS01_GC";
-                console.log("牛首山一期");
-              } else if (data.name.includes("牛首山二期")) {
-                that.detailId = "NSS02_GC";
-                console.log("牛首山二期");
-              } else if (data.name.includes("牛首山三期")) {
-                that.detailId = "NSS03_GC";
-                console.log("牛首山三期");
-              }else if (data.name.includes("青山一期")) {
-                that.detailId = "QS01_GC";
-                console.log("青山一期");
-              } else if (data.name.includes("青山二期")) {
-                that.detailId = "QS02_GC";
-                console.log("青山二期");
-              } else if (data.name.includes("青山三期")) {
-                that.detailId = "QS03_GC";
-                console.log("青山三期");
-              }
-			  else if (data.name.includes("石板泉一期")) {
-                that.detailId = "SBQ01_GC";
-                console.log("石板泉一期");
-              } else if (data.name.includes("石板泉二期")) {
-                that.detailId = "SBQ02_GC";
-                console.log("石板泉二期");
-              } else if (data.name.includes("石板泉三期")) {
-                that.detailId = "SBQ03_GC";
-                console.log("石板泉三期");
-              }else if (data.name.includes("石板泉四期")) {
-                that.detailId = "SBQ04_GC";
-                console.log("石板泉四期");
-              }
-			  else if (data.name.includes("香山一期")) {
-                that.detailId = "XS01_GC";
-                console.log("香山一期");
-              } else if (data.name.includes("香山二期")) {
-                that.detailId = "XS02_GC";
-                console.log("香山二期");
-              }
-            //   var dataId = that.tableIdArr[data.index - 1];
-              console.log("dataIndex:", data.index);
-              console.log("that.tableIdArr:", that.tableIdArr);
-            //   console.log("dataId:", dataId);
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               that.clearDb();
               that.detailShow = 2;
               // var that = this;
@@ -474,13 +411,7 @@ export default {
                 baseURL: "http://10.155.32.4:9001/",
                 subUrl: "benchmarking/details",
                 data: {
-<<<<<<< HEAD
                   id: dataId,
-=======
-					id:that.detailId,
-                //   id: dataId,
-                  // id:that.idArr.length==1?that.detailId:dataId,
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
                   beginDate: that.value4,
                   endDate: that.value5,
                   target: "",
@@ -541,17 +472,10 @@ export default {
             field: "check",
             is_num: false,
             is_light: false,
-<<<<<<< HEAD
             template: function () {
               return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
             },
             click: function (event, data) {
-=======
-            template: function() {
-              return "<input class='check curCheckBox checkItem' type='CheckBox'/>";
-            },
-            click: function(event, data) {
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               var dataId = that.tableIdArr[data.index - 1];
               if (event.target.checked == false && that.checkLength <= 2) {
                 that.tableId.forEach((item, i) => {
@@ -759,10 +683,6 @@ export default {
         subUrl: "benchmarking/wplist",
         success(res) {
           that.value1.push(res.data[0].id);
-<<<<<<< HEAD
-=======
-          console.log('value1:',that.value1)
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
           that.ChangZhan = res.data;
           that.AjaxCommon();
         },
@@ -777,10 +697,6 @@ export default {
     },
     XiangMuVal(val) {
       var that = this;
-<<<<<<< HEAD
-=======
-        console.log('xianmguVal:',val)
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
       that.API.requestData({
         method: "GET",
         baseURL: "http://10.155.32.4:9001/",
@@ -790,10 +706,6 @@ export default {
         },
         success(res) {
           that.XiangMu = res.data;
-<<<<<<< HEAD
-=======
-          console.log('Xiangmu:',res.data)
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
         },
       });
     },
@@ -845,15 +757,6 @@ export default {
         },
         success(res) {
           that.ajaxData = res.data;
-<<<<<<< HEAD
-=======
-          that.idArr = res.data;
-          // console.log("idArr:", that.idArr);
-          // if(res.data.length==1){
-          // 	that.detailId = res.data[0].id
-          // 	console.log('detailId:',that.detailId)
-          // }
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
           var dataTab = [], //表格
             fdl = [],
             cz = [],
@@ -866,10 +769,6 @@ export default {
             slssdl = [];
           res.data.forEach((item, index) => {
             that.tableIdArr.push(item.id);
-<<<<<<< HEAD
-=======
-            // console.log("ajaxTable:", that.tableIdArr);
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
             dataTab.push({
               //表格
               index: index + 1,

src/views/Decision/Decision3.vue

@@ -1065,7 +1065,6 @@ export default {
     tooltip(param, callback) {
       var color = ["#05bb4c", "#4b55ae", "#fa8c16", "#f8de5b"];
 
-<<<<<<< HEAD
       var result = param[0].axisValue;
       param.forEach((value, index) => {
         result +=
@@ -1117,61 +1116,6 @@ export default {
           var dataTab = [];
           res.data.forEach((item, index) => {
             that.tableIdArr.push(item.id);
-=======
-				var result = param[0].axisValue;
-				param.forEach((value, index) => {
-					result += "<br />" +
-						`<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${color[index]};"></span>` +
-						value.seriesName + "：" + value.value;
-				});
-				callback(result);
-				return true;
-			},
-			dbfx() {
-				var that = this;
-				if (that.tableId.length == 2) {
-					that.dialogVisible = true;
-					this.AjaxDbfx();
-					this.clearDb();
-				}
-			},
-			clearDb() { //清空对标状态
-				this.$refs.curRef.clearCheckBox();
-				this.tableId = [];
-				this.dbData = [];
-				this.checkLength = 0;
-			},
-			back() {
-				this.detailShow = 1;
-				this.clearDb();
-			},
-			detailClick(data) {
-				var that = this;
-				// console.log('DetailData:',data)
-				var dataId = that.tableIdArr[data.index - 1];
-				console.log('dataIndex:',data.index)
-				console.log('that.tableIdArr:',that.tableIdArr)
-				console.log('dataId:',dataId)
-				that.clearDb();
-				that.detailShow = 2;
-				that.API.requestData({
-					method: "GET",
-					baseURL: "http://10.155.32.4:9001/",
-					subUrl: "benchmarking/details",
-					data: {
-						// id: dataId,
-						id:that.idArr.length==1?that.detailId:dataId,
-						beginDate: that.value4,
-						endDate: that.value5,
-						target: '',
-						sort: ''
-					},
-					success(res) {
-						console.log('resDetail:',res)
-						var dataTab = [];
-						res.data.forEach((item, index) => {
-							that.tableIdArr.push(item.id);
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
 
             dataTab.push({
               //表格

src/views/specific/ztfx.vue

@@ -1755,7 +1755,6 @@ export default {
         months = this.monthChange(this.monthValue);
       }
       _this.API.requestData({
-<<<<<<< HEAD
         showLoading,
         method: "GET",
         baseURL: "http://10.155.32.4:8034",
@@ -1770,24 +1769,6 @@ export default {
             for (let key in item) {
               if (_this.isNumber(item[key]) && key.indexOf("Compare") === -1) {
                 item[key] = item[key].toFixed(2);
-=======
-          showLoading,
-          method: "GET",
-          baseURL: 'http://10.155.32.4:8034',
-          subUrl: "/specific/maincenterlist",
-          data:{
-            month: months
-          },
-          success(res) {
-            console.log('resSecord:',res)
-            let currentMonth = {}
-            let currentYear = {}
-            res.data['当月'].map(item => {
-              for (let key in item) {
-                if(_this.isNumber(item[key]) && key.indexOf('Compare') === -1) {
-                  item[key] = item[key].toFixed(2)
-                }
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               }
             }
             if (item.wpid === "麻黄山风电场") {
@@ -1834,7 +1815,6 @@ export default {
         months = this.monthChange(this.monthValue);
       }
       _this.API.requestData({
-<<<<<<< HEAD
         showLoading,
         method: "GET",
         baseURL: "http://10.155.32.4:8034",
@@ -1847,22 +1827,6 @@ export default {
             for (let key in item) {
               if (_this.isNumber(item[key]) && item.type !== "比较") {
                 item[key] = item[key].toFixed(2);
-=======
-          showLoading,
-          method: "GET",
-          baseURL: 'http://10.155.32.4:8034',
-          subUrl: "/specific/maintoplist",
-          data:{
-            month: months
-          },
-          success(res) {
-            console.log('resMonth:',res)
-            res.data.map(item => {
-              for (let key in item) {
-                if(_this.isNumber(item[key]) && item.type !== '比较') {
-                  item[key] = item[key].toFixed(2)
-                }
->>>>>>> b490f10ac94c4e62780986524a58a4a793b81bd3
               }
             }
             if (item.type === "本期") {