webapp / GreenwayWeb

Commit d5f60c72d4c2578fc3600162edb90851dfd03a87

Authored by 杨鑫
1 parent b7a88997

'最新'

Inline Side-by-side
Showing 19 changed files with 1624 additions and 1409 deletions
admin-web-master/src/utils/request.js
  View file @d5f60c7
@@ -21,7 +21,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost @@ -21,7 +21,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 - baseURL = 'http://128.10.249.13:9003'; 24 + baseURL = 'http://128.10.249.23:9003';
25 25
26 } else { 26 } else {
27 console.error('---------------------') 27 console.error('---------------------')
admin-web-master/src/views/activity/activityHis.vue
  View file @d5f60c7
@@ -316,12 +316,12 @@ @@ -316,12 +316,12 @@
316 </div> 316 </div>
317 </div> 317 </div>
318 <div style="padding: 20px 40px 20px 20px"> 318 <div style="padding: 20px 40px 20px 20px">
319 - <el-form label-position="top" ref="ruleFormInfo" :model="zhixingList" 319 + <el-form label-position="top" :rules="zhixingRules" :model="zhixingList"
320 label-width="120px" style="position: relative"> 320 label-width="120px" style="position: relative">
321 <el-row :gutter="20"> 321 <el-row :gutter="20">
322 <el-col :span="8"> 322 <el-col :span="8">
323 <el-form-item label="活动名称" class="grid-content bg-purple device-from" 323 <el-form-item label="活动名称" class="grid-content bg-purple device-from"
324 - prop="name"> 324 + prop="planName">
325 <el-input v-model="zhixingList.planName" placeholder="请输入" 325 <el-input v-model="zhixingList.planName" placeholder="请输入"
326 :disabled="!zhixingBian" /> 326 :disabled="!zhixingBian" />
327 </el-form-item> 327 </el-form-item>
@@ -1203,20 +1203,20 @@ @@ -1203,20 +1203,20 @@
1203 </div> 1203 </div>
1204 </el-dialog> 1204 </el-dialog>
1205 <!-- 效果对比 --> 1205 <!-- 效果对比 -->
1206 - <el-dialog :visible.sync="xiaoDui" title="效果对比" width="65%" center :close-on-click-modal="false" 1206 + <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
1207 :close-on-press-escape="false"> 1207 :close-on-press-escape="false">
1208 - <div style="display:flex;padding: 20px;width:100%;justify-content: center;"> 1208 + <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
1209 <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne"> 1209 <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
1210 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType" 1210 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1211 - :value="item"> 1211 + :value="index">
1212 </el-option> 1212 </el-option>
1213 </el-select> 1213 </el-select>
1214 <div style="line-height:200%;"> 1214 <div style="line-height:200%;">
1215 - <img src="../../assets/images/vs.png" alt="" style="height: 32px;"> 1215 + <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
1216 </div> 1216 </div>
1217 <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo"> 1217 <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
1218 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType" 1218 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1219 - :value="item"> 1219 + :value="index">
1220 </el-option> 1220 </el-option>
1221 </el-select> 1221 </el-select>
1222 <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff" 1222 <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
@@ -1272,7 +1272,7 @@ @@ -1272,7 +1272,7 @@
1272 </div> 1272 </div>
1273 </div> 1273 </div>
1274 </div> 1274 </div>
1275 - <div style="width: 15%;"> 1275 + <div style="width: 15%;margin: 0 20px;">
1276 <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div> 1276 <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
1277 <div 1277 <div
1278 style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;"> 1278 style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
@@ -1805,7 +1805,14 @@ @@ -1805,7 +1805,14 @@
1805 ListOne: '', 1805 ListOne: '',
1806 ListTwo: '', 1806 ListTwo: '',
1807 effectivenessListOne: {}, 1807 effectivenessListOne: {},
1808 - effectivenessListTwo: {} 1808 + effectivenessListTwo: {},
  1809 + zhixingRules:{
  1810 + planName: [{
  1811 + required: true,
  1812 + message: '请输入活动名称',
  1813 + trigger: 'blur'
  1814 + }],
  1815 + }
1809 } 1816 }
1810 }, 1817 },
1811 created() { 1818 created() {
@@ -1955,6 +1962,13 @@ @@ -1955,6 +1962,13 @@
1955 activityEffectivenessId: item.id 1962 activityEffectivenessId: item.id
1956 }).then(res => { 1963 }).then(res => {
1957 this.effectivenessList = res.data 1964 this.effectivenessList = res.data
  1965 + // let actName = this.effectivenessList.operationType.split('')
  1966 + this.effectivenessList.map((item,index)=>{
  1967 + let actName = item.operationType.split(' ')
  1968 + this.effectivenessList[index].operationType = actName[0]
  1969 + })
  1970 + // console.log(this.effectivenessList.operationType,'actName')
  1971 + // this.effectivenessList.operationType = actName[0]
1958 }) 1972 })
1959 this.liData = [] 1973 this.liData = []
1960 1974
@@ -2301,8 +2315,12 @@ @@ -2301,8 +2315,12 @@
2301 effectivenessLog({ 2315 effectivenessLog({
2302 activityEffectivenessId: item.id 2316 activityEffectivenessId: item.id
2303 }).then(res => { 2317 }).then(res => {
2304 - console.log(res.data, 'effectivenessListeffectivenessList') 2318 +
2305 this.effectivenessList = res.data 2319 this.effectivenessList = res.data
  2320 + this.effectivenessList.map((item,index)=>{
  2321 + let actName = item.operationType.split(' ')
  2322 + this.effectivenessList[index].operationType = actName[0]
  2323 + })
2306 }) 2324 })
2307 this.ListOne ='' 2325 this.ListOne =''
2308 this.ListTwo = '' 2326 this.ListTwo = ''
@@ -2501,41 +2519,47 @@ @@ -2501,41 +2519,47 @@
2501 // this.duibiList = JSON.parse(msg.modifyContent) 2519 // this.duibiList = JSON.parse(msg.modifyContent)
2502 2520
2503 this.duibiList = JSON.parse(msg.modifiedData) 2521 this.duibiList = JSON.parse(msg.modifiedData)
2504 -console.log(this.duibiList,'msgmsgmsg') 2522 +
2505 }, 2523 },
2506 lichangeOne(e) { 2524 lichangeOne(e) {
2507 - this.effectivenessListOne = JSON.parse(e.modifiedData)  
2508 - if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo 2525 + let msg = this.effectivenessList[e]
  2526 + if(typeof msg.modifiedData == 'string'){
  2527 + this.effectivenessListOne = JSON.parse(msg.modifiedData)
  2528 + }else{
  2529 + this.effectivenessListOne = msg.modifiedData
  2530 + }
  2531 +
  2532 + if (this.effectivenessListOne.internalLaborCostEstimation!=undefined&&this.effectivenessListTwo.internalLaborCostEstimation!=undefined && this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
2509 .internalLaborCostEstimation != '') { 2533 .internalLaborCostEstimation != '') {
2510 this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) / 2534 this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
2511 Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100 2535 Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
2512 } 2536 }
2513 - if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo 2537 + if (this.effectivenessListOne.externalLaborCostEstimation!=undefined&&this.effectivenessListTwo.externalLaborCostEstimation!=undefined &&this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
2514 .externalLaborCostEstimation != '') { 2538 .externalLaborCostEstimation != '') {
2515 this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) / 2539 this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
2516 Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100 2540 Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
2517 } 2541 }
2518 - if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo 2542 + if (this.effectivenessListOne.costEstimationGoods!=undefined&&this.effectivenessListTwo.costEstimationGoods!=undefined &&this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
2519 .costEstimationGoods != '') { 2543 .costEstimationGoods != '') {
2520 this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) / 2544 this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
2521 Number(this.effectivenessListTwo.costEstimationGoods) * 100 2545 Number(this.effectivenessListTwo.costEstimationGoods) * 100
2522 } 2546 }
2523 - if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo 2547 + if (this.effectivenessListOne.setCostEstimate!=undefined&&this.effectivenessListTwo.setCostEstimate!=undefined &&this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2524 .setCostEstimate != '') { 2548 .setCostEstimate != '') {
2525 this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) / 2549 this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
2526 Number(this.effectivenessListTwo.setCostEstimate) * 100 2550 Number(this.effectivenessListTwo.setCostEstimate) * 100
2527 } 2551 }
2528 - if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo 2552 + if (this.effectivenessListOne.estimatedPromotionalExpenses!=undefined&&this.effectivenessListTwo.estimatedPromotionalExpenses!=undefined &&this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
2529 .estimatedPromotionalExpenses != '') { 2553 .estimatedPromotionalExpenses != '') {
2530 this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) / 2554 this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
2531 Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100 2555 Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
2532 } 2556 }
2533 - if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo 2557 + if (this.effectivenessListOne.otherNecessaryEstimates!=undefined&&this.effectivenessListTwo.otherNecessaryEstimates!=undefined &&this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
2534 .otherNecessaryEstimates != '') { 2558 .otherNecessaryEstimates != '') {
2535 this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) / 2559 this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
2536 Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100 2560 Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
2537 } 2561 }
2538 - if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo 2562 + if (this.effectivenessListOne.totalCostEstimation!=undefined&&this.effectivenessListTwo.totalCostEstimation!=undefined &&this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
2539 .totalCostEstimation != '') { 2563 .totalCostEstimation != '') {
2540 2564
2541 this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) / 2565 this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
@@ -2556,46 +2580,50 @@ console.log(this.duibiList,&#39;msgmsgmsg&#39;) @@ -2556,46 +2580,50 @@ console.log(this.duibiList,&#39;msgmsgmsg&#39;)
2556 // otherNecessaryEstimates 2580 // otherNecessaryEstimates
2557 // totalCostEstimation 2581 // totalCostEstimation
2558 2582
2559 - console.log(JSON.parse(e.modifiedData))  
2560 }, 2583 },
2561 lichangeTwo(e) { 2584 lichangeTwo(e) {
2562 - this.effectivenessListTwo = JSON.parse(e.modifiedData)  
2563 - if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo  
2564 - .internalLaborCostEstimation != '') {  
2565 - this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /  
2566 - Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100  
2567 - }  
2568 - if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo  
2569 - .externalLaborCostEstimation != '') {  
2570 - this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /  
2571 - Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100  
2572 - }  
2573 - if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo  
2574 - .costEstimationGoods != '') {  
2575 - this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /  
2576 - Number(this.effectivenessListTwo.costEstimationGoods) * 100  
2577 - }  
2578 - if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo  
2579 - .setCostEstimate != '') {  
2580 - this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /  
2581 - Number(this.effectivenessListTwo.setCostEstimate) * 100  
2582 - }  
2583 - if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo  
2584 - .estimatedPromotionalExpenses != '') {  
2585 - this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /  
2586 - Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100  
2587 - }  
2588 - if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo  
2589 - .otherNecessaryEstimates != '') {  
2590 - this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /  
2591 - Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100  
2592 - }  
2593 - if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo  
2594 - .totalCostEstimation != '') {  
2595 -  
2596 - this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /  
2597 - Number(this.effectivenessListTwo.totalCostEstimation) * 100 2585 + let msg = this.effectivenessList[e]
  2586 + if(typeof msg.modifiedData == 'string'){
  2587 + this.effectivenessListTwo = JSON.parse(msg.modifiedData)
  2588 + }else{
  2589 + this.effectivenessListTwo = msg.modifiedData
2598 } 2590 }
  2591 + if (this.effectivenessListOne.internalLaborCostEstimation!=undefined&&this.effectivenessListTwo.internalLaborCostEstimation!=undefined && this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2592 + .internalLaborCostEstimation != '') {
  2593 + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
  2594 + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2595 + }
  2596 + if (this.effectivenessListOne.externalLaborCostEstimation!=undefined&&this.effectivenessListTwo.externalLaborCostEstimation!=undefined &&this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2597 + .externalLaborCostEstimation != '') {
  2598 + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
  2599 + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2600 + }
  2601 + if (this.effectivenessListOne.costEstimationGoods!=undefined&&this.effectivenessListTwo.costEstimationGoods!=undefined &&this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2602 + .costEstimationGoods != '') {
  2603 + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
  2604 + Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2605 + }
  2606 + if (this.effectivenessListOne.setCostEstimate!=undefined&&this.effectivenessListTwo.setCostEstimate!=undefined &&this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2607 + .setCostEstimate != '') {
  2608 + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
  2609 + Number(this.effectivenessListTwo.setCostEstimate) * 100
  2610 + }
  2611 + if (this.effectivenessListOne.estimatedPromotionalExpenses!=undefined&&this.effectivenessListTwo.estimatedPromotionalExpenses!=undefined &&this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2612 + .estimatedPromotionalExpenses != '') {
  2613 + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
  2614 + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2615 + }
  2616 + if (this.effectivenessListOne.otherNecessaryEstimates!=undefined&&this.effectivenessListTwo.otherNecessaryEstimates!=undefined &&this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2617 + .otherNecessaryEstimates != '') {
  2618 + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
  2619 + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2620 + }
  2621 + if (this.effectivenessListOne.totalCostEstimation!=undefined&&this.effectivenessListTwo.totalCostEstimation!=undefined &&this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2622 + .totalCostEstimation != '') {
  2623 +
  2624 + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
  2625 + Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2626 + }
2599 }, 2627 },
2600 tiaozheng() { 2628 tiaozheng() {
2601 this.tiaozhengShow = true 2629 this.tiaozhengShow = true
@@ -2614,42 +2642,50 @@ console.log(this.duibiList,&#39;msgmsgmsg&#39;) @@ -2614,42 +2642,50 @@ console.log(this.duibiList,&#39;msgmsgmsg&#39;)
2614 }, 2642 },
2615 //执行效果保存 2643 //执行效果保存
2616 async bianji() { 2644 async bianji() {
2617 - if (this.fileData.length != 0) {  
2618 - this.zhixingList.feedbackContent = this.fileData[0].url  
2619 - }  
2620 - if (this.zhiXing) {  
2621 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
2622 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
2623 - this.zhixingList.detailsId = this.secondData.id  
2624 - this.zhixingList.createDate = this.updateCurrentTime()  
2625 - actAdd(this.zhixingList).then(res => {  
2626 - for (let i = 0; i < this.tableDa.length; i++) {  
2627 - this.tableDa[i].detailsId = res.data.id  
2628 - MingAdd(this.tableDa[i]).then(res => {  
2629 - this.$message({  
2630 - message: '保存成功',  
2631 - type: 'success'  
2632 - })  
2633 - })  
2634 - }  
2635 - })  
2636 -  
2637 - } else {  
2638 - let that = this  
2639 - Vue.delete(that.zhixingList, 'createDate')  
2640 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
2641 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
2642 - Vue.delete(that.zhixingList, 'planTime')  
2643 - this.zhixingList.updateDate = ''  
2644 - await actEdit(this.zhixingList)  
2645 - this.$message({  
2646 - message: '保存成功',  
2647 - type: 'success' 2645 + this.$refs.zhixingFormInfo.validate((valid) => {
  2646 + if (valid) {
  2647 + if (this.fileData.length != 0) {
  2648 + this.zhixingList.feedbackContent = this.fileData[0].url
  2649 + }
  2650 + if (this.zhiXing) {
  2651 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2652 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2653 + this.zhixingList.detailsId = this.secondData.id
  2654 + this.zhixingList.createDate = this.updateCurrentTime()
  2655 + actAdd(this.zhixingList).then(res => {
  2656 + for (let i = 0; i < this.tableDa.length; i++) {
  2657 + this.tableDa[i].detailsId = res.data.id
  2658 + MingAdd(this.tableDa[i]).then(res => {
  2659 + this.ggXin = false
  2660 + this.getAll()
  2661 + })
  2662 + }
  2663 + })
  2664 +
  2665 + } else {
  2666 + let that = this
  2667 + Vue.delete(that.zhixingList, 'createDate')
  2668 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2669 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2670 + Vue.delete(that.zhixingList, 'planTime')
  2671 + this.zhixingList.updateDate = ''
  2672 + actEdit(this.zhixingList).then(()=>{
  2673 + this.ggXin = false
  2674 + this.getAll()
  2675 + })
  2676 + }
  2677 +
  2678 +
  2679 + }else{
  2680 + this.$message({
  2681 + message: '请填写数据',
  2682 + type: 'error',
  2683 + offset: 100
  2684 + })
  2685 + return false;
  2686 + }
2648 }) 2687 })
2649 - }  
2650 -  
2651 - this.ggXin = false  
2652 - this.getAll() 2688 +
2653 }, 2689 },
2654 searchQuit() { 2690 searchQuit() {
2655 this.searPei = { 2691 this.searPei = {
admin-web-master/src/views/activity/index.vue
  View file @d5f60c7
@@ -772,12 +772,12 @@ @@ -772,12 +772,12 @@
772 </div> 772 </div>
773 </div> 773 </div>
774 <div style="padding: 20px 40px 20px 20px"> 774 <div style="padding: 20px 40px 20px 20px">
775 - <el-form label-position="top" ref="ruleFormInfo" :model="zhixingList"  
776 - label-width="120px" style="position: relative"> 775 + <el-form label-position="top" ref="zhixingFormInfo" :rules="zhixingRules" :model="zhixingList"
  776 + label-width="120px" style="position: relative" >
777 <el-row :gutter="20"> 777 <el-row :gutter="20">
778 <el-col :span="8"> 778 <el-col :span="8">
779 <el-form-item label="活动名称" class="grid-content bg-purple device-from" 779 <el-form-item label="活动名称" class="grid-content bg-purple device-from"
780 - prop="name"> 780 + prop="planName">
781 <el-input v-model="zhixingList.planName" placeholder="请输入" 781 <el-input v-model="zhixingList.planName" placeholder="请输入"
782 v-if="zhixingBian" /> 782 v-if="zhixingBian" />
783 <div v-else>{{ zhixingList.planName }}</div> 783 <div v-else>{{ zhixingList.planName }}</div>
@@ -1029,8 +1029,9 @@ @@ -1029,8 +1029,9 @@
1029 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff" 1029 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff"
1030 v-if="activeName=='first'">下载 1030 v-if="activeName=='first'">下载
1031 </el-button> 1031 </el-button>
1032 - <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存  
1033 - </el-button> 1032 +
  1033 + <!-- <el-button @click="fivebian" style="background-color: #3F9B6A;color: #fff" v-if="activeName=='five'">保存
  1034 + </el-button> -->
1034 </div> 1035 </div>
1035 </div> 1036 </div>
1036 1037
@@ -1289,7 +1290,14 @@ @@ -1289,7 +1290,14 @@
1289 peiShow: false, 1290 peiShow: false,
1290 peiId: '', 1291 peiId: '',
1291 zhixingqingk: '', 1292 zhixingqingk: '',
1292 - editFen:0 1293 + editFen:0,
  1294 + zhixingRules:{
  1295 + planName: [{
  1296 + required: true,
  1297 + message: '请输入活动名称',
  1298 + trigger: 'blur'
  1299 + }],
  1300 + }
1293 } 1301 }
1294 }, 1302 },
1295 created() { 1303 created() {
@@ -1622,36 +1630,51 @@ @@ -1622,36 +1630,51 @@
1622 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; 1630 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
1623 }, 1631 },
1624 //执行效果保存 1632 //执行效果保存
1625 - async bianji() {  
1626 - if (this.fileData.length != 0) {  
1627 - this.zhixingList.feedbackContent = this.fileData[0].url  
1628 - }  
1629 - if (this.zhiXing) {  
1630 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
1631 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
1632 - this.zhixingList.detailsId = this.secondData.id  
1633 - this.zhixingList.createDate = this.updateCurrentTime()  
1634 - actAdd(this.zhixingList).then(res => {  
1635 - for (let i = 0; i < this.tableDa.length; i++) {  
1636 - this.tableDa[i].detailsId = res.data.id  
1637 - MingAdd(this.tableDa[i]).then(res => {  
1638 - console.log('成功')  
1639 - })  
1640 - } 1633 + bianji() {
  1634 + this.$refs.zhixingFormInfo.validate((valid) => {
  1635 + if (valid) {
  1636 + if (this.fileData.length != 0) {
  1637 + this.zhixingList.feedbackContent = this.fileData[0].url
  1638 + }
  1639 + if (this.zhiXing) {
  1640 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  1641 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  1642 + this.zhixingList.detailsId = this.secondData.id
  1643 + this.zhixingList.createDate = this.updateCurrentTime()
  1644 + actAdd(this.zhixingList).then(res => {
  1645 + for (let i = 0; i < this.tableDa.length; i++) {
  1646 + this.tableDa[i].detailsId = res.data.id
  1647 + MingAdd(this.tableDa[i]).then(res => {
  1648 + this.ggXin = false
  1649 + this.getAll()
  1650 + })
  1651 + }
  1652 + })
  1653 +
  1654 + } else {
  1655 + let that = this
  1656 + Vue.delete(that.zhixingList, 'createDate')
  1657 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  1658 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  1659 + Vue.delete(that.zhixingList, 'planTime')
  1660 + this.zhixingList.updateDate = ''
  1661 + actEdit(this.zhixingList).then(()=>{
  1662 + this.ggXin = false
  1663 + this.getAll()
  1664 + })
  1665 + }
  1666 +
  1667 +
  1668 + }else{
  1669 + this.$message({
  1670 + message: '请填写数据',
  1671 + type: 'error',
  1672 + offset: 100
  1673 + })
  1674 + return false;
  1675 + }
1641 }) 1676 })
1642 -  
1643 - } else {  
1644 - let that = this  
1645 - Vue.delete(that.zhixingList, 'createDate')  
1646 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
1647 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
1648 - Vue.delete(that.zhixingList, 'planTime')  
1649 - this.zhixingList.updateDate = ''  
1650 - await actEdit(this.zhixingList)  
1651 - }  
1652 -  
1653 - this.ggXin = false  
1654 - this.getAll() 1677 +
1655 }, 1678 },
1656 handleCurrentChange(val) { 1679 handleCurrentChange(val) {
1657 this.currentPage = val 1680 this.currentPage = val
admin-web-master/src/views/atmosphere/atmosphereGl.vue
  View file @d5f60c7
@@ -837,12 +837,12 @@ @@ -837,12 +837,12 @@
837 </div> 837 </div>
838 </div> 838 </div>
839 <div style="padding: 20px 40px 20px 20px"> 839 <div style="padding: 20px 40px 20px 20px">
840 - <el-form label-position="top" ref="ruleFormInfo" :model="zhixingList" 840 + <el-form label-position="top" :model="zhixingList" ref="zhixingFormInfo" :rules="zhixingRules"
841 label-width="120px" style="position: relative"> 841 label-width="120px" style="position: relative">
842 <el-row :gutter="20"> 842 <el-row :gutter="20">
843 <el-col :span="8"> 843 <el-col :span="8">
844 <el-form-item label="活动名称" class="grid-content bg-purple device-from" 844 <el-form-item label="活动名称" class="grid-content bg-purple device-from"
845 - prop="name"> 845 + prop="planName">
846 <el-input v-model="zhixingList.planName" placeholder="请输入" 846 <el-input v-model="zhixingList.planName" placeholder="请输入"
847 :disabled="!zhixingBian" /> 847 :disabled="!zhixingBian" />
848 </el-form-item> 848 </el-form-item>
@@ -1337,7 +1337,14 @@ @@ -1337,7 +1337,14 @@
1337 peiShow: false, 1337 peiShow: false,
1338 peiId: '', 1338 peiId: '',
1339 zhixingqingk: '', 1339 zhixingqingk: '',
1340 - editFen: 0 1340 + editFen: 0,
  1341 + zhixingRules:{
  1342 + planName: [{
  1343 + required: true,
  1344 + message: '请输入活动名称',
  1345 + trigger: 'blur'
  1346 + }],
  1347 + }
1341 1348
1342 } 1349 }
1343 }, 1350 },
@@ -1509,28 +1516,45 @@ @@ -1509,28 +1516,45 @@
1509 this.zhixingList.planTime = data 1516 this.zhixingList.planTime = data
1510 }, 1517 },
1511 //执行效果保存 1518 //执行效果保存
1512 - async bianji() {  
1513 - if (this.fileData.length != 0) {  
1514 - this.zhixingList.feedbackContent = this.fileData[0].url  
1515 - }  
1516 - if (this.zhiXing) {  
1517 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
1518 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
1519 - this.zhixingList.detailsId = this.secondData.id  
1520 - this.zhixingList.createDate = this.updateCurrentTime()  
1521 - await actAdd(this.zhixingList)  
1522 - } else {  
1523 - let that = this  
1524 - Vue.delete(that.zhixingList, 'createDate')  
1525 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
1526 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
1527 - Vue.delete(that.zhixingList, 'planTime')  
1528 - this.zhixingList.updateDate = ''  
1529 - await actEdit(this.zhixingList)  
1530 - }  
1531 -  
1532 - this.ggXin = false  
1533 - this.getAll() 1519 + bianji() {
  1520 + this.$refs.zhixingFormInfo.validate((valid) => {
  1521 + if (valid) {
  1522 + if (this.fileData.length != 0) {
  1523 + this.zhixingList.feedbackContent = this.fileData[0].url
  1524 + }
  1525 + if (this.zhiXing) {
  1526 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  1527 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  1528 + this.zhixingList.detailsId = this.secondData.id
  1529 + this.zhixingList.createDate = this.updateCurrentTime()
  1530 + actAdd(this.zhixingList).then(()=>{
  1531 + this.ggXin = false
  1532 + this.getAll()
  1533 + })
  1534 + } else {
  1535 + let that = this
  1536 + Vue.delete(that.zhixingList, 'createDate')
  1537 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  1538 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  1539 + Vue.delete(that.zhixingList, 'planTime')
  1540 + this.zhixingList.updateDate = ''
  1541 + actEdit(this.zhixingList).then(()=>{
  1542 + this.ggXin = false
  1543 + this.getAll()
  1544 + })
  1545 + }
  1546 +
  1547 +
  1548 + }else{
  1549 + this.$message({
  1550 + message: '请填写数据',
  1551 + type: 'error',
  1552 + offset: 100
  1553 + })
  1554 + return false;
  1555 + }
  1556 + })
  1557 +
1534 }, 1558 },
1535 //详情点击 1559 //详情点击
1536 handleEditForm(item, val) { 1560 handleEditForm(item, val) {
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @d5f60c7
@@ -314,12 +314,12 @@ @@ -314,12 +314,12 @@
314 </div> 314 </div>
315 </div> 315 </div>
316 <div style="padding: 20px 40px 20px 20px"> 316 <div style="padding: 20px 40px 20px 20px">
317 - <el-form label-position="top" ref="ruleFormInfo" :model="zhixingList" 317 + <el-form label-position="top" :rules="zhixingRules" :model="zhixingList"
318 label-width="120px" style="position: relative"> 318 label-width="120px" style="position: relative">
319 <el-row :gutter="20"> 319 <el-row :gutter="20">
320 <el-col :span="8"> 320 <el-col :span="8">
321 <el-form-item label="氛围名称" class="grid-content bg-purple device-from" 321 <el-form-item label="氛围名称" class="grid-content bg-purple device-from"
322 - prop="name"> 322 + prop="planName">
323 <el-input v-model="zhixingList.planName" placeholder="请输入" 323 <el-input v-model="zhixingList.planName" placeholder="请输入"
324 :disabled="!zhixingBian" /> 324 :disabled="!zhixingBian" />
325 </el-form-item> 325 </el-form-item>
@@ -543,299 +543,188 @@ @@ -543,299 +543,188 @@
543 <div style="margin-right:10px;line-height:200%">历史氛围策划方案搜索</div> 543 <div style="margin-right:10px;line-height:200%">历史氛围策划方案搜索</div>
544 <el-select v-model="lishiList" placeholder="请选择" style="margin:0 20px 20px 20px;" 544 <el-select v-model="lishiList" placeholder="请选择" style="margin:0 20px 20px 20px;"
545 @change="lichange"> 545 @change="lichange">
546 - <el-option v-for="(item,index) in liData" :key="item.id" :label="item.operationType" 546 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
547 :value="index"> 547 :value="index">
548 </el-option> 548 </el-option>
549 </el-select> 549 </el-select>
550 - <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff" 550 + <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
551 v-if="lishiList!=null">调整对比 551 v-if="lishiList!=null">调整对比
552 - </el-button> 552 + </el-button> -->
553 </div> 553 </div>
554 <div style="width: 100%;" v-if="lishiList!=null" ref="lishiRef"> 554 <div style="width: 100%;" v-if="lishiList!=null" ref="lishiRef">
555 - <div style="width: 100%;">  
556 - <div style="padding: 10px 20px;">  
557 - <el-descriptions class="margin-top" title="基本信息" :column="2" border  
558 - :labelStyle="labelStyle">  
559 - <el-descriptions-item>  
560 - <template slot="label">  
561 - 方案编号  
562 - </template>  
563 - {{lixiang.id}}  
564 - </el-descriptions-item>  
565 - <el-descriptions-item>  
566 - <template slot="label">  
567 - 方案名称  
568 - </template>  
569 -  
570 - <span  
571 - :style="duibiList.planName == lixiang.planName?'color: red':''">{{lixiang.planName}}</span>  
572 - </el-descriptions-item>  
573 - <el-descriptions-item>  
574 - <template slot="label">  
575 - 类型  
576 - </template>  
577 - <span  
578 - :style="duibiList.planType == lixiang.planType?'color: red':''">{{lixiang.planType}}</span>  
579 - </el-descriptions-item>  
580 - <el-descriptions-item>  
581 - <template slot="label">  
582 - 氛围地点  
583 - </template>  
584 -  
585 - <span  
586 - :style="duibiList.eventAddrs == lixiang.eventAddrs?'color: red':''">{{lixiang.eventAddrs}}</span>  
587 - </el-descriptions-item>  
588 - <el-descriptions-item>  
589 - <template slot="label">  
590 - 氛围开始时间  
591 - </template>  
592 -  
593 - <span  
594 - :style="duibiList.eventStartTime == lixiang.eventStartTime?'color: red':''">{{lixiang.eventStartTime}}</span>  
595 - </el-descriptions-item>  
596 - <el-descriptions-item>  
597 - <template slot="label">  
598 - 氛围结束时间  
599 - </template>  
600 -  
601 - <span  
602 - :style="duibiList.eventEndTime == lixiang.eventEndTime?'color: red':''">{{lixiang.eventEndTime}}</span>  
603 - </el-descriptions-item>  
604 - <el-descriptions-item>  
605 - <template slot="label">  
606 - 氛围主题  
607 - </template>  
608 - <span  
609 - :style="duibiList.eventTheme == lixiang.eventTheme?'color: red':''">{{lixiang.eventTheme}}</span>  
610 - </el-descriptions-item>  
611 - <el-descriptions-item>  
612 - <template slot="label">  
613 - 氛围主办方  
614 - </template>  
615 - <span  
616 - :style="duibiList.sponsor == lixiang.sponsor?'color: red':''">{{lixiang.sponsor}}</span>  
617 -  
618 - </el-descriptions-item>  
619 - <el-descriptions-item>  
620 - <template slot="label">  
621 - 氛围参与方  
622 - </template>  
623 -  
624 - <span  
625 - :style="duibiList.participants == lixiang.participants?'color: red':''">{{lixiang.participants}}</span>  
626 - </el-descriptions-item>  
627 - <el-descriptions-item>  
628 - <template slot="label">  
629 - 氛围主要目的  
630 - </template>  
631 -  
632 - <span  
633 - :style="duibiList.mainPurpose == lixiang.mainPurpose?'color: red':''">{{lixiang.mainPurpose}}</span>  
634 - </el-descriptions-item>  
635 - <el-descriptions-item>  
636 - <template slot="label">  
637 - 范围设置  
638 - </template>  
639 -  
640 - <span  
641 - :style="duibiList.rangeSetting == lixiang.rangeSetting?'color: red':''">{{lixiang.rangeSetting}}</span>  
642 - </el-descriptions-item>  
643 - <el-descriptions-item>  
644 - <template slot="label">  
645 - 状态  
646 - </template>  
647 -  
648 - {{getStatus(lixiang.state)}}  
649 -  
650 - </el-descriptions-item>  
651 - </el-descriptions>  
652 -  
653 - </div>  
654 - </div>  
655 - <div style="width: 100%;">  
656 - <div style="font-size: 14px;padding: 10px 20px 0px 20px;">氛围明细信息</div>  
657 - <div style="padding: 10px 20px;">  
658 - <el-table :data="tableData2"  
659 - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"  
660 - style="width: 100%;margin: auto;">  
661 - <el-table-column label="序号" min-width="5%" align='center'>  
662 - <template slot-scope="scope">  
663 - <span style="">{{ scope.$index +1}}</span>  
664 - </template>  
665 - </el-table-column>  
666 - <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">  
667 - </el-table-column>  
668 - <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">  
669 -  
670 - </el-table-column>  
671 - <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">  
672 -  
673 - </el-table-column>  
674 - <el-table-column label="备注" prop="notes" min-width="20%">  
675 - </el-table-column>  
676 - </el-table>  
677 - </div>  
678 - </div>  
679 - <div style="width: 100%;">  
680 - <div style="padding:10px 20px;">  
681 - <el-descriptions class="margin-top" title="氛围成本信息" :column="2" border  
682 - :labelStyle="labelStyle">  
683 - <el-descriptions-item>  
684 - <template slot="label">  
685 - 内部人力成本预估(/元)  
686 - </template>  
687 -  
688 - <span  
689 - :style="duibiList.internalLaborCostEstimation == lixiang.internalLaborCostEstimation?'color: red':''">{{lixiang.internalLaborCostEstimation}}</span>  
690 - </el-descriptions-item>  
691 - <el-descriptions-item>  
692 - <template slot="label">  
693 - 外部人力成本预估(/元)  
694 - </template>  
695 -  
696 - <span  
697 - :style="duibiList.externalLaborCostEstimation == lixiang.externalLaborCostEstimation?'color: red':''">{{lixiang.externalLaborCostEstimation}}</span>  
698 - </el-descriptions-item>  
699 - <el-descriptions-item>  
700 - <template slot="label">  
701 - 商品成本预估(/元)  
702 - </template>  
703 -  
704 - <span  
705 - :style="duibiList.costEstimationGoods == lixiang.costEstimationGoods?'color: red':''">{{lixiang.costEstimationGoods}}</span>  
706 - </el-descriptions-item>  
707 - <el-descriptions-item>  
708 - <template slot="label">  
709 - 设备成本预估(/元)  
710 - </template>  
711 -  
712 - <span  
713 - :style="duibiList.setCostEstimate == lixiang.setCostEstimate?'color: red':''">{{lixiang.setCostEstimate}}</span>  
714 - </el-descriptions-item>  
715 - <el-descriptions-item>  
716 - <template slot="label">  
717 - 宣传费用预估(/元)  
718 - </template>  
719 -  
720 - <span  
721 - :style="duibiList.estimatedPromotionalExpenses == lixiang.estimatedPromotionalExpenses?'color: red':''">{{lixiang.estimatedPromotionalExpenses}}</span>  
722 - </el-descriptions-item>  
723 - <el-descriptions-item>  
724 - <template slot="label">  
725 - 其他必要成本预估(/元)  
726 - </template>  
727 -  
728 - <span  
729 - :style="duibiList.otherNecessaryEstimates == lixiang.otherNecessaryEstimates?'color: red':''">{{lixiang.otherNecessaryEstimates}}</span>  
730 - </el-descriptions-item>  
731 - <el-descriptions-item>  
732 - <template slot="label">  
733 - 总成本预估(/元)  
734 - </template>  
735 -  
736 - <span  
737 - :style="duibiList.totalCostEstimation == lixiang.totalCostEstimation?'color: red':''">{{lixiang.totalCostEstimation}}</span>  
738 - </el-descriptions-item>  
739 - <el-descriptions-item>  
740 - <template slot="label">  
741 - 备注  
742 - </template>  
743 -  
744 - <span  
745 - :style="duibiList.notes == lixiang.notes?'color: red':''">{{lixiang.notes}}</span>  
746 - </el-descriptions-item>  
747 - </el-descriptions>  
748 - </div>  
749 - </div>  
750 - <div style="width: 100%;">  
751 -  
752 - <div style="padding:10px 20px;">  
753 - <el-descriptions class="margin-top" title="预估效果" :column="2" border  
754 - :labelStyle="labelStyle">  
755 - <el-descriptions-item>  
756 - <template slot="label">  
757 - 预计吸引流量  
758 - </template>  
759 -  
760 - <span  
761 - :style="duibiList.expectedAttractTraffic == lixiang.expectedAttractTraffic?'color: red':''">{{lixiang.expectedAttractTraffic}}</span>  
762 - </el-descriptions-item>  
763 - <el-descriptions-item>  
764 - <template slot="label">  
765 - 预计参与人数  
766 - </template>  
767 -  
768 - <span  
769 - :style="duibiList.expectedParticipation == lixiang.expectedParticipation?'color: red':''">{{lixiang.expectedParticipation}}</span>  
770 - </el-descriptions-item>  
771 - <el-descriptions-item>  
772 - <template slot="label">  
773 - 预计直接收益(/元)  
774 - </template>  
775 -  
776 - <span  
777 - :style="duibiList.expectedDirectBenefits == lixiang.expectedDirectBenefits?'color: red':''">{{lixiang.expectedDirectBenefits}}</span>  
778 - </el-descriptions-item>  
779 - <el-descriptions-item>  
780 - <template slot="label">  
781 - 预计间接收益(/元)  
782 - </template>  
783 -  
784 - <span  
785 - :style="duibiList.expectedIndirectBenefits == lixiang.expectedIndirectBenefits?'color: red':''">{{lixiang.expectedIndirectBenefits}}</span>  
786 - </el-descriptions-item>  
787 -  
788 - </el-descriptions>  
789 -  
790 - </div>  
791 - </div>  
792 - <div style="width: 100%;">  
793 - <div style="font-size: 14px;padding: 10px 20px 0px 20px;">相关附件信息</div>  
794 - <div style="padding:10px 20px;">  
795 - <el-table :data="tableData6"  
796 - :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"  
797 - style="width: 100%;margin: auto;">  
798 - <el-table-column label="序号" min-width="5%" align='center'>  
799 - <template slot-scope="scope">  
800 - <span style="">{{ scope.$index + 1 }}</span>  
801 - </template>  
802 - </el-table-column>  
803 - <el-table-column label="附件名称" prop="attachmentName" min-width="75%">  
804 - </el-table-column>  
805 - <el-table-column label="操作" min-width="20%">  
806 - <template slot-scope="scope">  
807 - <!-- <div class="tableBtn greens" @click="Down(scope.row)">下载</div> -->  
808 - <a class="tableBtn greens" :href="scope.row.attachmentUrl" target="_blank"  
809 - download>下载</a>  
810 - </template>  
811 - </el-table-column>  
812 -  
813 - </el-table>  
814 - </div>  
815 - </div>  
816 - <div style="width: 100%;">  
817 - <div style="font-size: 14px;padding: 10px 20px 0px 20px;">系统信息</div>  
818 - <div style="padding:10px 20px;">  
819 - <el-table :data="tableData5"  
820 - :header-cell-style="{fontSize: '14px', backgroundColor: '#fff',color:'#000',fontWeight: 'normal'}"  
821 - style="width: 100%;margin: auto;">  
822 - <el-table-column class-name="first-column-bg" label="创建人" prop="name"  
823 - min-width="15%">  
824 - </el-table-column>  
825 - <el-table-column :label="createUser" prop="eventTheme" min-width="35%">  
826 -  
827 - </el-table-column>  
828 - <el-table-column class-name="first-column-bg" label="创建时间" prop="text"  
829 - min-width="15%">  
830 -  
831 - </el-table-column>  
832 - <el-table-column :label="createDate" prop="planName" min-width="35%">  
833 -  
834 - </el-table-column>  
835 - </el-table>  
836 - </div>  
837 - </div>  
838 - </div> 555 + <div style="width: 100%;">
  556 + <div style="padding: 10px 20px;">
  557 + <el-descriptions class="margin-top" title="基本信息" :column="2" border
  558 + :labelStyle="labelStyle" :contentStyle="contentStyle">
  559 + <el-descriptions-item>
  560 + <template slot="label">
  561 + 活动名称
  562 + </template>
  563 +
  564 + <span>{{duibiList.planName}}</span>
  565 + </el-descriptions-item>
  566 + <el-descriptions-item>
  567 + <template slot="label">
  568 + 实际举办地点
  569 + </template>
  570 + <span>{{duibiList.eventAddrs}}</span>
  571 + </el-descriptions-item>
  572 + <el-descriptions-item>
  573 + <template slot="label">
  574 + 实际举办时间
  575 + </template>
  576 +
  577 + <span>{{formatTimestampToDate(duibiList.eventStartTime)}}-{{formatTimestampToDate(duibiList.eventEndTime)}}</span>
  578 + </el-descriptions-item>
  579 + <el-descriptions-item>
  580 + <template slot="label">
  581 + 活动主办方
  582 + </template>
  583 +
  584 + <span>{{duibiList.participants}}</span>
  585 + </el-descriptions-item>
  586 + <el-descriptions-item>
  587 + <template slot="label">
  588 + 活动实际参与方
  589 + </template>
  590 +
  591 + <span>{{duibiList.sponsor}}</span>
  592 + </el-descriptions-item>
  593 +
  594 +
  595 + </el-descriptions>
  596 +
  597 + </div>
  598 + </div>
  599 + <!-- <div style="width: 100%;">
  600 + <div style="font-size: 14px;padding: 10px 20px 0px 20px;">活动明细信息</div>
  601 + <div style="padding: 10px 20px;">
  602 + <el-table :data="tableData2"
  603 + :header-cell-style="{fontSize: '14px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
  604 + style="width: 100%;margin: auto;">
  605 + <el-table-column label="序号" min-width="5%" align='center'>
  606 + <template slot-scope="scope">
  607 + <span style="">{{ scope.$index +1}}</span>
  608 + </template>
  609 + </el-table-column>
  610 + <el-table-column label="明细项名称" prop="detailLtemName" min-width="28%">
  611 + </el-table-column>
  612 + <el-table-column label="预估数量" prop="estimatedQuantity" min-width="20%">
  613 +
  614 + </el-table-column>
  615 + <el-table-column label="预估费用(/元)" prop="estimatedCost" min-width="20%">
  616 +
  617 + </el-table-column>
  618 + <el-table-column label="备注" prop="notes" min-width="20%">
  619 + </el-table-column>
  620 + </el-table>
  621 + </div>
  622 + </div> -->
  623 + <div style="width: 100%;">
  624 + <div style="padding:10px 20px;">
  625 + <el-descriptions class="margin-top" title="实际花费成本" :column="2" border
  626 + :labelStyle="labelStyle" :contentStyle="contentStyle">
  627 + <el-descriptions-item>
  628 + <template slot="label">
  629 + 实际内部人力成本(/元)
  630 + </template>
  631 +
  632 + <span>{{duibiList.internalLaborCostEstimation}}</span>
  633 + </el-descriptions-item>
  634 + <el-descriptions-item>
  635 + <template slot="label">
  636 + 实际外部人力成本(/元)
  637 + </template>
  638 + <span>{{duibiList.externalLaborCostEstimation}}</span>
  639 +
  640 +
  641 + </el-descriptions-item>
  642 + <el-descriptions-item>
  643 + <template slot="label">
  644 + 实际商品成本(/元)
  645 + </template>
  646 + <span>{{duibiList.costEstimationGoods}}</span>
  647 +
  648 + </el-descriptions-item>
  649 + <el-descriptions-item>
  650 + <template slot="label">
  651 + 实际设备成本(/元)
  652 + </template>
  653 + <span>{{duibiList.setCostEstimate}}</span>
  654 +
  655 + </el-descriptions-item>
  656 + <el-descriptions-item>
  657 + <template slot="label">
  658 + 实际宣传费用(/元)
  659 + </template>
  660 + <span>{{duibiList.estimatedPromotionalExpenses}}</span>
  661 +
  662 + </el-descriptions-item>
  663 + <el-descriptions-item>
  664 + <template slot="label">
  665 + 实际其他成本(/元)
  666 + </template>
  667 + <span>{{duibiList.otherNecessaryEstimates}}</span>
  668 +
  669 + </el-descriptions-item>
  670 + <el-descriptions-item>
  671 + <template slot="label">
  672 + 实际总成本(/元)
  673 + </template>
  674 + <span>{{duibiList.totalCostEstimation}}</span>
  675 +
  676 + </el-descriptions-item>
  677 + <el-descriptions-item>
  678 + <template slot="label">
  679 + 备注
  680 + </template>
  681 + <span>{{duibiList.notes}}</span>
  682 +
  683 + </el-descriptions-item>
  684 + </el-descriptions>
  685 + </div>
  686 + </div>
  687 + <div style="width: 100%;">
  688 +
  689 + <div style="padding:10px 20px;">
  690 + <el-descriptions class="margin-top" title="活动执行效果" :column="2" border
  691 + :labelStyle="labelStyle" :contentStyle="contentStyle">
  692 + <el-descriptions-item>
  693 + <template slot="label">
  694 + 实际吸引流量
  695 + </template>
  696 + <span>{{duibiList.expectedAttractTraffic}}</span>
  697 +
  698 + </el-descriptions-item>
  699 + <el-descriptions-item>
  700 + <template slot="label">
  701 + 实际参与人数
  702 + </template>
  703 + <span>{{duibiList.expectedParticipation}}</span>
  704 +
  705 + </el-descriptions-item>
  706 + <el-descriptions-item>
  707 + <template slot="label">
  708 + 实际直接收益(/元)
  709 + </template>
  710 + <span>{{duibiList.expectedDirectBenefits}}</span>
  711 +
  712 + </el-descriptions-item>
  713 + <el-descriptions-item>
  714 + <template slot="label">
  715 + 实际间接收益(/元)
  716 + </template>
  717 + <span>{{duibiList.expectedIndirectBenefits}}</span>
  718 +
  719 + </el-descriptions-item>
  720 +
  721 + </el-descriptions>
  722 +
  723 + </div>
  724 + </div>
  725 +
  726 +
  727 + </div>
839 </div> 728 </div>
840 <div v-if="activeName=='five'"> 729 <div v-if="activeName=='five'">
841 <div style="width: 100%;padding:20px;"> 730 <div style="width: 100%;padding:20px;">
@@ -1293,15 +1182,164 @@ @@ -1293,15 +1182,164 @@
1293 </div> 1182 </div>
1294 </el-dialog> 1183 </el-dialog>
1295 <!-- 效果对比 --> 1184 <!-- 效果对比 -->
1296 - <el-dialog :visible.sync="xiaoDui" title="效果对比" width="60%" center  
1297 - :close-on-click-modal="false" :close-on-press-escape="false">  
1298 - <div style="padding:20px 50px;display:flex;justify-content: space-evenly;">  
1299 - <div style="width:30%"> 1185 + <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
  1186 + :close-on-press-escape="false">
  1187 + <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
  1188 + <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
  1189 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
  1190 + :value="item">
  1191 + </el-option>
  1192 + </el-select>
  1193 + <div style="line-height:200%;">
  1194 + <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
  1195 + </div>
  1196 + <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo">
  1197 + <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
  1198 + :value="item">
  1199 + </el-option>
  1200 + </el-select>
  1201 + <!-- <el-button @click="tiaozheng" style="background-color: #3F9B6A;color: #fff"
  1202 + >对比
  1203 + </el-button> -->
  1204 + </div>
  1205 + <div style="display:flex;width:100%;justify-content: center;padding: 0 20px;">
  1206 + <div style="width: 20%;">
  1207 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1208 + <div
  1209 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1210 + <div>内部人力</div>
  1211 + <div>
  1212 + {{effectivenessListOne.internalLaborCostEstimation?effectivenessListOne.internalLaborCostEstimation:0}}元
  1213 + </div>
  1214 + </div>
  1215 + <div
  1216 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1217 + <div>外部人力</div>
  1218 + <div>
  1219 + {{effectivenessListOne.externalLaborCostEstimation?effectivenessListOne.externalLaborCostEstimation:0}}元
  1220 + </div>
  1221 + </div>
  1222 + <div
  1223 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1224 + <div>商品成本</div>
  1225 + <div>{{effectivenessListOne.costEstimationGoods?effectivenessListOne.costEstimationGoods:0}}元
  1226 + </div>
  1227 + </div>
  1228 + <div
  1229 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1230 + <div>设备成本</div>
  1231 + <div>{{effectivenessListOne.setCostEstimate?effectivenessListOne.setCostEstimate:0}}元</div>
  1232 + </div>
  1233 + <div
  1234 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1235 + <div>宣传费用</div>
  1236 + <div>
  1237 + {{effectivenessListOne.estimatedPromotionalExpenses?effectivenessListOne.estimatedPromotionalExpenses:0}}元
  1238 + </div>
  1239 + </div>
  1240 + <div
  1241 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1242 + <div>其他成本</div>
  1243 + <div>
  1244 + {{effectivenessListOne.otherNecessaryEstimates?effectivenessListOne.otherNecessaryEstimates:0}}元
  1245 + </div>
  1246 + </div>
  1247 + <div
  1248 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1249 + <div>总成本</div>
  1250 + <div>{{effectivenessListOne.totalCostEstimation?effectivenessListOne.totalCostEstimation:0}}元
  1251 + </div>
  1252 + </div>
  1253 + </div>
  1254 + <div style="width: 15%;margin: 0 20px;">
  1255 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">增长率</div>
  1256 + <div
  1257 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1258 + {{effectivenessListOne.sumNei?effectivenessListOne.sumNei:0}}%
  1259 + </div>
  1260 + <div
  1261 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1262 + {{effectivenessListOne.sumWai?effectivenessListOne.sumWai:0}}%
  1263 + </div>
  1264 + <div
  1265 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1266 + {{effectivenessListOne.sumShop?effectivenessListOne.sumShop:0}}%
  1267 + </div>
  1268 + <div
  1269 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1270 + {{effectivenessListOne.sumSe?effectivenessListOne.sumSe:0}}%
  1271 + </div>
  1272 + <div
  1273 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1274 + {{effectivenessListOne.sumXuan?effectivenessListOne.sumXuan:0}}%
  1275 + </div>
  1276 + <div
  1277 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1278 + {{effectivenessListOne.sumQi?effectivenessListOne.sumQi:0}}%
  1279 + </div>
  1280 + <div
  1281 + style="padding:10px 0px;text-align: center;margin:10px;border: 1px solid #3F9B6A;border-radius: 5px;background-color: #3F9B6A;color: #fff;">
  1282 + {{effectivenessListOne.sumAll?effectivenessListOne.sumAll:0}}%
  1283 + </div>
  1284 +
  1285 +
  1286 + </div>
  1287 + <div style="width: 20%;">
  1288 + <div style="color:#3F9B6A;text-align: center;padding: 10px 0;">实际成本</div>
  1289 + <div
  1290 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1291 + <div>内部人力</div>
  1292 + <div>
  1293 + {{effectivenessListTwo.internalLaborCostEstimation?effectivenessListTwo.internalLaborCostEstimation:0}}元
  1294 + </div>
  1295 + </div>
  1296 + <div
  1297 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1298 + <div>外部人力</div>
  1299 + <div>
  1300 + {{effectivenessListTwo.externalLaborCostEstimation?effectivenessListTwo.externalLaborCostEstimation:0}}元
  1301 + </div>
  1302 + </div>
  1303 + <div
  1304 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1305 + <div>商品成本</div>
  1306 + <div>{{effectivenessListTwo.costEstimationGoods?effectivenessListTwo.costEstimationGoods:0}}元
  1307 + </div>
  1308 + </div>
  1309 + <div
  1310 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1311 + <div>设备成本</div>
  1312 + <div>{{effectivenessListTwo.setCostEstimate?effectivenessListTwo.setCostEstimate:0}}元</div>
  1313 + </div>
  1314 + <div
  1315 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1316 + <div>宣传费用</div>
  1317 + <div>
  1318 + {{effectivenessListTwo.estimatedPromotionalExpenses?effectivenessListTwo.estimatedPromotionalExpenses:0}}元
  1319 + </div>
  1320 + </div>
  1321 + <div
  1322 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1323 + <div>其他成本</div>
  1324 + <div>
  1325 + {{effectivenessListTwo.otherNecessaryEstimates?effectivenessListTwo.otherNecessaryEstimates:0}}元
  1326 + </div>
  1327 + </div>
  1328 + <div
  1329 + style="padding:10px 10px;display:flex;justify-content: space-between;border: 1px solid #DEDEDE;margin-top:10px;border-radius: 5px;">
  1330 + <div>总成本</div>
  1331 + <div>{{effectivenessListTwo.totalCostEstimation?effectivenessListTwo.totalCostEstimation:0}}元
  1332 + </div>
  1333 + </div>
  1334 + </div>
  1335 + </div>
  1336 + <!-- <div style="width:30%">
1300 <div style="display: flex;"> 1337 <div style="display: flex;">
1301 <div style="margin-right: 10px;padding: 10px 0;"> 1338 <div style="margin-right: 10px;padding: 10px 0;">
1302 <div>调整前方案</div> 1339 <div>调整前方案</div>
1303 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;"> 1340 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;">
1304 - {{xiaoduiObj.biliOne}}</div> 1341 + {{xiaoduiObj.biliOne}}
  1342 + </div>
1305 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div> 1343 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div>
1306 </div> 1344 </div>
1307 <el-progress type="circle" :percentage="xiaoduiObj.bilis" :show-text="false" :width="100"> 1345 <el-progress type="circle" :percentage="xiaoduiObj.bilis" :show-text="false" :width="100">
@@ -1310,53 +1348,51 @@ @@ -1310,53 +1348,51 @@
1310 <div style="padding:30px 0">计划任务（完成度）</div> 1348 <div style="padding:30px 0">计划任务（完成度）</div>
1311 <div class="jindutiao"> 1349 <div class="jindutiao">
1312 <div style="margin-right:10px;width:56px">直接收入</div> 1350 <div style="margin-right:10px;width:56px">直接收入</div>
1313 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1314 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1351 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1315 :percentage="baifenbi(duibiOne.expectedDirectBenefits)" status="success" 1352 :percentage="baifenbi(duibiOne.expectedDirectBenefits)" status="success"
1316 :format="() => customFormat(duibiOne.expectedDirectBenefits)"></el-progress> 1353 :format="() => customFormat(duibiOne.expectedDirectBenefits)"></el-progress>
1317 </div> 1354 </div>
1318 <div class="jindutiao"> 1355 <div class="jindutiao">
1319 <div style="margin-right:10px;width:56px">间接收入</div> 1356 <div style="margin-right:10px;width:56px">间接收入</div>
1320 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1357 +
1321 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1358 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1322 :percentage="baifenbi(duibiOne.expectedIndirectBenefits)" status="success" 1359 :percentage="baifenbi(duibiOne.expectedIndirectBenefits)" status="success"
1323 :format="() => customFormat(duibiOne.expectedIndirectBenefits)"></el-progress> 1360 :format="() => customFormat(duibiOne.expectedIndirectBenefits)"></el-progress>
1324 </div> 1361 </div>
1325 <div class="jindutiao"> 1362 <div class="jindutiao">
1326 <div style="margin-right:10px;width:56px">人力</div> 1363 <div style="margin-right:10px;width:56px">人力</div>
1327 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1328 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1364 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1329 :percentage="baifenbi(duibiOne.internalLaborCostEstimation)" status="success" 1365 :percentage="baifenbi(duibiOne.internalLaborCostEstimation)" status="success"
1330 :format="() => customFormat(duibiOne.internalLaborCostEstimation)"></el-progress> 1366 :format="() => customFormat(duibiOne.internalLaborCostEstimation)"></el-progress>
1331 </div> 1367 </div>
1332 <div class="jindutiao"> 1368 <div class="jindutiao">
1333 <div style="margin-right:10px;width:56px">设备</div> 1369 <div style="margin-right:10px;width:56px">设备</div>
1334 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> -->  
1335 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1370 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1336 :percentage="baifenbi(duibiOne.setCostEstimate)" status="success" 1371 :percentage="baifenbi(duibiOne.setCostEstimate)" status="success"
1337 :format="() => customFormat(duibiOne.setCostEstimate)"></el-progress> 1372 :format="() => customFormat(duibiOne.setCostEstimate)"></el-progress>
1338 </div> 1373 </div>
1339 <div class="jindutiao"> 1374 <div class="jindutiao">
1340 <div style="margin-right:10px;width:56px">宣传</div> 1375 <div style="margin-right:10px;width:56px">宣传</div>
1341 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1376 +
1342 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1377 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1343 :percentage="baifenbi(duibiOne.estimatedPromotionalExpenses)" status="success" 1378 :percentage="baifenbi(duibiOne.estimatedPromotionalExpenses)" status="success"
1344 :format="() => customFormat(duibiOne.estimatedPromotionalExpenses)"></el-progress> 1379 :format="() => customFormat(duibiOne.estimatedPromotionalExpenses)"></el-progress>
1345 </div> 1380 </div>
1346 <div class="jindutiao"> 1381 <div class="jindutiao">
1347 <div style="margin-right:10px;width:56px">其他</div> 1382 <div style="margin-right:10px;width:56px">其他</div>
1348 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1383 +
1349 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1384 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1350 :percentage="baifenbi(duibiOne.otherNecessaryEstimates)" status="success" 1385 :percentage="baifenbi(duibiOne.otherNecessaryEstimates)" status="success"
1351 :format="() => customFormat(duibiOne.otherNecessaryEstimates)"></el-progress> 1386 :format="() => customFormat(duibiOne.otherNecessaryEstimates)"></el-progress>
1352 </div> 1387 </div>
1353 - </div>  
1354 - <div style="width:30%"> 1388 + </div> -->
  1389 + <!-- <div style="width:30%">
1355 <div style="display: flex;"> 1390 <div style="display: flex;">
1356 <div style="margin-right: 10px;padding: 10px 0;"> 1391 <div style="margin-right: 10px;padding: 10px 0;">
1357 <div>调整后方案</div> 1392 <div>调整后方案</div>
1358 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;"> 1393 <div style="font-size: 22px;color: #3F9B6A;font-weight: 600;margin: 10px 0;">
1359 - {{xiaoduiObj.biliTwo}}</div> 1394 + {{xiaoduiObj.biliTwo}}
  1395 + </div>
1360 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div> 1396 <div style="font-size: 16px;color: #3F9B6A;font-weight: 600;">投入产出比</div>
1361 </div> 1397 </div>
1362 <el-progress type="circle" :percentage="xiaoduiObj.biliT" :show-text="false" :width="100"> 1398 <el-progress type="circle" :percentage="xiaoduiObj.biliT" :show-text="false" :width="100">
@@ -1365,7 +1401,7 @@ @@ -1365,7 +1401,7 @@
1365 <div style="padding:30px 0">计划任务（完成度）</div> 1401 <div style="padding:30px 0">计划任务（完成度）</div>
1366 <div class="jindutiao"> 1402 <div class="jindutiao">
1367 <div style="margin-right:10px;width:56px">直接收入</div> 1403 <div style="margin-right:10px;width:56px">直接收入</div>
1368 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1404 +
1369 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1405 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1370 :percentage="baifenbi(duibiTwo.expectedDirectBenefits==undefined?'':duibiTwo.expectedDirectBenefits)" 1406 :percentage="baifenbi(duibiTwo.expectedDirectBenefits==undefined?'':duibiTwo.expectedDirectBenefits)"
1371 status="success" 1407 status="success"
@@ -1373,7 +1409,7 @@ @@ -1373,7 +1409,7 @@
1373 </div> 1409 </div>
1374 <div class="jindutiao"> 1410 <div class="jindutiao">
1375 <div style="margin-right:10px;width:56px">间接收入</div> 1411 <div style="margin-right:10px;width:56px">间接收入</div>
1376 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1412 +
1377 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1413 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1378 :percentage="baifenbi(duibiTwo.expectedIndirectBenefits==undefined?'':duibiTwo.expectedIndirectBenefits)" 1414 :percentage="baifenbi(duibiTwo.expectedIndirectBenefits==undefined?'':duibiTwo.expectedIndirectBenefits)"
1379 status="success" 1415 status="success"
@@ -1381,7 +1417,7 @@ @@ -1381,7 +1417,7 @@
1381 </div> 1417 </div>
1382 <div class="jindutiao"> 1418 <div class="jindutiao">
1383 <div style="margin-right:10px;width:56px">人力</div> 1419 <div style="margin-right:10px;width:56px">人力</div>
1384 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1420 +
1385 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1421 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1386 :percentage="baifenbi(duibiTwo.internalLaborCostEstimation==undefined?'':duibiTwo.internalLaborCostEstimation)" 1422 :percentage="baifenbi(duibiTwo.internalLaborCostEstimation==undefined?'':duibiTwo.internalLaborCostEstimation)"
1387 status="success" 1423 status="success"
@@ -1389,7 +1425,7 @@ @@ -1389,7 +1425,7 @@
1389 </div> 1425 </div>
1390 <div class="jindutiao"> 1426 <div class="jindutiao">
1391 <div style="margin-right:10px;width:56px">设备</div> 1427 <div style="margin-right:10px;width:56px">设备</div>
1392 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1428 +
1393 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1429 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1394 :percentage="baifenbi(duibiTwo.setCostEstimate==undefined?'':duibiTwo.setCostEstimate)" 1430 :percentage="baifenbi(duibiTwo.setCostEstimate==undefined?'':duibiTwo.setCostEstimate)"
1395 status="success" 1431 status="success"
@@ -1397,7 +1433,7 @@ @@ -1397,7 +1433,7 @@
1397 </div> 1433 </div>
1398 <div class="jindutiao"> 1434 <div class="jindutiao">
1399 <div style="margin-right:10px;width:56px">宣传</div> 1435 <div style="margin-right:10px;width:56px">宣传</div>
1400 - <!-- <el-progress :text-inside="true" :stroke-width="26" :format="format(xiaoduiObj.shou)" :percentage="xiaoduiObj.shouBi"></el-progress> --> 1436 +
1401 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20" 1437 <el-progress style="width: 150px;" :text-inside="true" :stroke-width="20"
1402 :percentage="baifenbi(duibiTwo.estimatedPromotionalExpenses==undefined?'':duibiTwo.estimatedPromotionalExpenses)" 1438 :percentage="baifenbi(duibiTwo.estimatedPromotionalExpenses==undefined?'':duibiTwo.estimatedPromotionalExpenses)"
1403 status="success" 1439 status="success"
@@ -1410,8 +1446,8 @@ @@ -1410,8 +1446,8 @@
1410 status="success" 1446 status="success"
1411 :format="() => customFormat(duibiTwo.otherNecessaryEstimates==undefined?'':duibiTwo.otherNecessaryEstimates)"></el-progress> 1447 :format="() => customFormat(duibiTwo.otherNecessaryEstimates==undefined?'':duibiTwo.otherNecessaryEstimates)"></el-progress>
1412 </div> 1448 </div>
1413 - </div>  
1414 - </div> 1449 + </div> -->
  1450 +
1415 </el-dialog> 1451 </el-dialog>
1416 1452
1417 1453
@@ -1500,7 +1536,8 @@ @@ -1500,7 +1536,8 @@
1500 excelQueryByPage, 1536 excelQueryByPage,
1501 excelAdd, 1537 excelAdd,
1502 effectEvaluation, 1538 effectEvaluation,
1503 - lishiDeta 1539 + lishiDeta,
  1540 + effectivenessLog
1504 } from '../../api/activityBz' 1541 } from '../../api/activityBz'
1505 import actbians from "./atmosphereBian" 1542 import actbians from "./atmosphereBian"
1506 import * as echarts from 'echarts' 1543 import * as echarts from 'echarts'
@@ -1736,7 +1773,19 @@ @@ -1736,7 +1773,19 @@
1736 jiucuoShow: false, 1773 jiucuoShow: false,
1737 jiuMsg: '', 1774 jiuMsg: '',
1738 editId: '', 1775 editId: '',
1739 - zhixingqingk: '' 1776 + zhixingqingk: '',
  1777 + effectivenessList: [],
  1778 + ListOne: '',
  1779 + ListTwo: '',
  1780 + effectivenessListOne: {},
  1781 + effectivenessListTwo: {},
  1782 + zhixingRules:{
  1783 + planName: [{
  1784 + required: true,
  1785 + message: '请输入活动名称',
  1786 + trigger: 'blur'
  1787 + }],
  1788 + }
1740 } 1789 }
1741 }, 1790 },
1742 created() { 1791 created() {
@@ -1873,7 +1922,11 @@ @@ -1873,7 +1922,11 @@
1873 1922
1874 this.activeName = 'fourd' 1923 this.activeName = 'fourd'
1875 } 1924 }
1876 - 1925 + effectivenessLog({
  1926 + activityEffectivenessId: item.id
  1927 + }).then(res => {
  1928 + this.effectivenessList = res.data
  1929 + })
1877 this.liData = [] 1930 this.liData = []
1878 this.lixiang = {} 1931 this.lixiang = {}
1879 this.lishiList = null 1932 this.lishiList = null
@@ -2202,37 +2255,51 @@ @@ -2202,37 +2255,51 @@
2202 }, 2255 },
2203 xiaoguo(item) { 2256 xiaoguo(item) {
2204 2257
2205 -  
2206 - this.xiaoDui = true 2258 + this.xiaoDui = true
2207 this.duibiOne = item 2259 this.duibiOne = item
2208 console.log(item) 2260 console.log(item)
2209 let that = this 2261 let that = this
2210 - actPage({  
2211 - detailsId: item.id,  
2212 - pageNumber: 1,  
2213 - pageSize: 10, 2262 + effectivenessLog({
  2263 + activityEffectivenessId: item.id
2214 }).then(res => { 2264 }).then(res => {
2215 - this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];  
2216 - if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') {  
2217 - that.xiaoduiObj.biliTwo = '0%'  
2218 - that.xiaoduiObj.biliT = 0  
2219 - } else {  
2220 - that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo  
2221 - .totalCostEstimation * 100  
2222 - that.xiaoduiObj.biliTwo =  
2223 - `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%`  
2224 - }  
2225 - 2265 + console.log(res.data, 'effectivenessListeffectivenessList')
  2266 + this.effectivenessList = res.data
2226 }) 2267 })
2227 - if (that.duibiOne.totalCostEstimation == '') {  
2228 - that.xiaoduiObj.biliOne = '0%'  
2229 - that.xiaoduiObj.bilis = 0  
2230 - } else {  
2231 - that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne  
2232 - .totalCostEstimation * 100  
2233 - that.xiaoduiObj.biliOne =  
2234 - `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%`  
2235 - } 2268 + this.ListOne =''
  2269 + this.ListTwo = ''
  2270 + this.effectivenessListOne ={}
  2271 + this.effectivenessListTwo = {}
  2272 +
  2273 + // this.xiaoDui = true
  2274 + // this.duibiOne = item
  2275 + // console.log(item)
  2276 + // let that = this
  2277 + // actPage({
  2278 + // detailsId: item.id,
  2279 + // pageNumber: 1,
  2280 + // pageSize: 10,
  2281 + // }).then(res => {
  2282 + // this.duibiTwo = res.data.content[0] === undefined ? {} : res.data.content[0];
  2283 + // if (res.data.content[0] === undefined || res.data.content[0].totalCostEstimation == '') {
  2284 + // that.xiaoduiObj.biliTwo = '0%'
  2285 + // that.xiaoduiObj.biliT = 0
  2286 + // } else {
  2287 + // that.xiaoduiObj.biliT = that.duibiTwo.internalLaborCostEstimation / that.duibiTwo
  2288 + // .totalCostEstimation * 100
  2289 + // that.xiaoduiObj.biliTwo =
  2290 + // `${Math.round(that.duibiTwo.internalLaborCostEstimation / that.duibiTwo.totalCostEstimation*100)}%`
  2291 + // }
  2292 +
  2293 + // })
  2294 + // if (that.duibiOne.totalCostEstimation == '') {
  2295 + // that.xiaoduiObj.biliOne = '0%'
  2296 + // that.xiaoduiObj.bilis = 0
  2297 + // } else {
  2298 + // that.xiaoduiObj.bilis = that.duibiOne.internalLaborCostEstimation / that.duibiOne
  2299 + // .totalCostEstimation * 100
  2300 + // that.xiaoduiObj.biliOne =
  2301 + // `${Math.round(that.duibiOne.internalLaborCostEstimation / that.duibiOne.totalCostEstimation*100)}%`
  2302 + // }
2236 2303
2237 2304
2238 2305
@@ -2390,12 +2457,107 @@ @@ -2390,12 +2457,107 @@
2390 this.searchShow = true 2457 this.searchShow = true
2391 }, 2458 },
2392 lichange(e) { 2459 lichange(e) {
2393 - console.log(this.liData[e])  
2394 - this.lishiList = e  
2395 - let msg = this.liData[e]  
2396 - this.duibiList = JSON.parse(msg.modifyContent)  
2397 - this.lixiang = JSON.parse(msg.originalData)  
2398 - 2460 +
  2461 + // this.lishiList = e
  2462 + // let msg = this.liData[e]
  2463 + // this.duibiList = JSON.parse(msg.modifyContent)
  2464 + // this.lixiang = JSON.parse(msg.originalData)
  2465 + let msg = this.effectivenessList[e]
  2466 + this.duibiList = JSON.parse(msg.modifiedData)
  2467 + },
  2468 + lichangeOne(e) {
  2469 + this.effectivenessListOne = JSON.parse(e.modifiedData)
  2470 + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2471 + .internalLaborCostEstimation != '') {
  2472 + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
  2473 + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2474 + }
  2475 + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2476 + .externalLaborCostEstimation != '') {
  2477 + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
  2478 + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2479 + }
  2480 + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2481 + .costEstimationGoods != '') {
  2482 + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
  2483 + Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2484 + }
  2485 + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2486 + .setCostEstimate != '') {
  2487 + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
  2488 + Number(this.effectivenessListTwo.setCostEstimate) * 100
  2489 + }
  2490 + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2491 + .estimatedPromotionalExpenses != '') {
  2492 + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
  2493 + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2494 + }
  2495 + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2496 + .otherNecessaryEstimates != '') {
  2497 + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
  2498 + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2499 + }
  2500 + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2501 + .totalCostEstimation != '') {
  2502 +
  2503 + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
  2504 + Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2505 + }
  2506 + // sumNei
  2507 + // sumWai
  2508 + // sumShop
  2509 + // sumSe
  2510 + // sumXuan
  2511 + // sumQi
  2512 + // sumAll
  2513 + // internalLaborCostEstimation
  2514 + // externalLaborCostEstimation
  2515 + // costEstimationGoods
  2516 + // setCostEstimate
  2517 + // estimatedPromotionalExpenses
  2518 + // otherNecessaryEstimates
  2519 + // totalCostEstimation
  2520 +
  2521 + console.log(JSON.parse(e.modifiedData))
  2522 + },
  2523 + lichangeTwo(e) {
  2524 + this.effectivenessListTwo = JSON.parse(e.modifiedData)
  2525 + if (this.effectivenessListOne.internalLaborCostEstimation != '' && this.effectivenessListTwo
  2526 + .internalLaborCostEstimation != '') {
  2527 + this.effectivenessListOne.sumNei = Number(this.effectivenessListOne.internalLaborCostEstimation) /
  2528 + Number(this.effectivenessListTwo.internalLaborCostEstimation) * 100
  2529 + }
  2530 + if (this.effectivenessListOne.externalLaborCostEstimation != '' && this.effectivenessListTwo
  2531 + .externalLaborCostEstimation != '') {
  2532 + this.effectivenessListOne.sumWai = Number(this.effectivenessListOne.externalLaborCostEstimation) /
  2533 + Number(this.effectivenessListTwo.externalLaborCostEstimation) * 100
  2534 + }
  2535 + if (this.effectivenessListOne.costEstimationGoods != '' && this.effectivenessListTwo
  2536 + .costEstimationGoods != '') {
  2537 + this.effectivenessListOne.sumShop = Number(this.effectivenessListOne.costEstimationGoods) /
  2538 + Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2539 + }
  2540 + if (this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2541 + .setCostEstimate != '') {
  2542 + this.effectivenessListOne.sumSe = Number(this.effectivenessListOne.setCostEstimate) /
  2543 + Number(this.effectivenessListTwo.setCostEstimate) * 100
  2544 + }
  2545 + if (this.effectivenessListOne.estimatedPromotionalExpenses != '' && this.effectivenessListTwo
  2546 + .estimatedPromotionalExpenses != '') {
  2547 + this.effectivenessListOne.sumXuan = Number(this.effectivenessListOne.estimatedPromotionalExpenses) /
  2548 + Number(this.effectivenessListTwo.estimatedPromotionalExpenses) * 100
  2549 + }
  2550 + if (this.effectivenessListOne.otherNecessaryEstimates != '' && this.effectivenessListTwo
  2551 + .otherNecessaryEstimates != '') {
  2552 + this.effectivenessListOne.sumQi = Number(this.effectivenessListOne.otherNecessaryEstimates) /
  2553 + Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2554 + }
  2555 + if (this.effectivenessListOne.totalCostEstimation != '' && this.effectivenessListTwo
  2556 + .totalCostEstimation != '') {
  2557 +
  2558 + this.effectivenessListOne.sumAll = Number(this.effectivenessListOne.totalCostEstimation) /
  2559 + Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2560 + }
2399 }, 2561 },
2400 tiaozheng() { 2562 tiaozheng() {
2401 this.tiaozhengShow = true 2563 this.tiaozhengShow = true
@@ -2414,42 +2576,44 @@ @@ -2414,42 +2576,44 @@
2414 }, 2576 },
2415 //执行效果保存 2577 //执行效果保存
2416 async bianji() { 2578 async bianji() {
2417 - if (this.fileData.length != 0) {  
2418 - this.zhixingList.feedbackContent = this.fileData[0].url  
2419 - }  
2420 - if (this.zhiXing) {  
2421 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
2422 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
2423 - this.zhixingList.detailsId = this.secondData.id  
2424 - this.zhixingList.createDate = this.updateCurrentTime()  
2425 - actAdd(this.zhixingList).then(res => {  
2426 - for (let i = 0; i < this.tableDa.length; i++) {  
2427 - this.tableDa[i].detailsId = res.data.id  
2428 - MingAdd(this.tableDa[i]).then(res => {  
2429 - this.$message({  
2430 - message: '保存成功',  
2431 - type: 'success' 2579 + this.$refs.zhixingFormInfo.validate((valid) => {
  2580 + if (valid) {
  2581 + if (this.fileData.length != 0) {
  2582 + this.zhixingList.feedbackContent = this.fileData[0].url
  2583 + }
  2584 + if (this.zhiXing) {
  2585 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2586 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2587 + this.zhixingList.detailsId = this.secondData.id
  2588 + this.zhixingList.createDate = this.updateCurrentTime()
  2589 + actAdd(this.zhixingList).then(()=>{
  2590 + this.ggXin = false
  2591 + this.getAll()
  2592 + })
  2593 + } else {
  2594 + let that = this
  2595 + Vue.delete(that.zhixingList, 'createDate')
  2596 + this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
  2597 + this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
  2598 + Vue.delete(that.zhixingList, 'planTime')
  2599 + this.zhixingList.updateDate = ''
  2600 + actEdit(this.zhixingList).then(()=>{
  2601 + this.ggXin = false
  2602 + this.getAll()
  2603 + })
  2604 + }
  2605 +
  2606 +
  2607 + }else{
  2608 + this.$message({
  2609 + message: '请填写数据',
  2610 + type: 'error',
  2611 + offset: 100
  2612 + })
  2613 + return false;
  2614 + }
2432 }) 2615 })
2433 - })  
2434 - }  
2435 - })  
2436 -  
2437 - } else {  
2438 - let that = this  
2439 - Vue.delete(that.zhixingList, 'createDate')  
2440 - this.zhixingList.eventStartTime = this.zhixingList.planTime[0]  
2441 - this.zhixingList.eventEndTime = this.zhixingList.planTime[1]  
2442 - Vue.delete(that.zhixingList, 'planTime')  
2443 - this.zhixingList.updateDate = ''  
2444 - await actEdit(this.zhixingList)  
2445 - this.$message({  
2446 - message: '保存成功',  
2447 - type: 'success'  
2448 - })  
2449 - }  
2450 -  
2451 - this.ggXin = false  
2452 - this.getAll() 2616 +
2453 }, 2617 },
2454 searchQuit() { 2618 searchQuit() {
2455 this.searPei = { 2619 this.searPei = {
admin-web-master/src/views/media/mediaMana.vue
  View file @d5f60c7
@@ -132,10 +132,14 @@ @@ -132,10 +132,14 @@
132 <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/> 132 <img :src="$baseURL+secondData.coverImage" alt="" style="width:150px;height: 150px;" v-if="wangShow"/>
133 </div> 133 </div>
134 </el-form-item> 134 </el-form-item>
135 - <el-form-item label="宣传内容" class="grid-content bg-purple" prop="name">  
136 - <div v-if="wangShow" v-html="secondData.updateUser"></div>  
137 - <wang-editor v-model="secondData.updateUser" ref="editor" :read="false" v-if="!wangShow"></wang-editor> 135 + <el-form-item label="宣传内容" class="grid-content bg-purple" prop="promotionContent">
  136 + <div v-if="wangShow" v-html="secondData.promotionContent"></div>
  137 +
138 </el-form-item> 138 </el-form-item>
  139 + <el-form-item label="审核意见" class="grid-content bg-purple" >
  140 +
  141 + <div style="" >{{secondData.auditOpinion}}</div>
  142 + </el-form-item>
139 <!-- <el-form-item label="跳转链接" class="grid-content bg-purple" prop="name"> 143 <!-- <el-form-item label="跳转链接" class="grid-content bg-purple" prop="name">
140 <div v-if="wangShow">{{secondData.eventAddrs}}</div> 144 <div v-if="wangShow">{{secondData.eventAddrs}}</div>
141 <el-input v-model="secondData.eventAddrs" placeholder="请输入" v-else/> 145 <el-input v-model="secondData.eventAddrs" placeholder="请输入" v-else/>
admin-web-master/src/views/promotion/audit.vue
  View file @d5f60c7
@@ -503,6 +503,7 @@ components: { wangEditor}, @@ -503,6 +503,7 @@ components: { wangEditor},
503 pageindex: { 503 pageindex: {
504 pageNumber: 0, 504 pageNumber: 0,
505 pageSize: 10, 505 pageSize: 10,
  506 + state:'2'
506 }, 507 },
507 options: [{ 508 options: [{
508 value: 1, 509 value: 1,
admin-web-master/src/views/promotion/contentMant.vue
  View file @d5f60c7
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 <!-- 新建 --> 179 <!-- 新建 -->
180 <div v-if="ggXin" > 180 <div v-if="ggXin" >
181 <div style="height:58px;line-height:58px;background-color:#fff;padding-left:20px;"> 181 <div style="height:58px;line-height:58px;background-color:#fff;padding-left:20px;">
182 - <div style="color:#0006"> <span>媒体推广</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">内容管理{{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}</span></div> 182 + <div style="color:#0006"> <span>媒体推广</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">{{index == 1?'内容新增':index == 2?'内容详情':'内容编辑'}}</span></div>
183 </div> 183 </div>
184 <div style="background-color:#fff;padding-left:20px;"> 184 <div style="background-color:#fff;padding-left:20px;">
185 <div style="margin-bottom: 20px;"> 185 <div style="margin-bottom: 20px;">
admin-web-master/src/views/serve/procedure.vue
  View file @d5f60c7
1 <template> 1 <template>
2 - <div style="background-color:#f7f7f7;padding:10px 10px;">  
3 - <div class="zhuti">  
4 - <div style="height:58px;line-height:58px;">  
5 - <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span  
6 - style="color:#000000e6">公告通知发布</span></div>  
7 - </div>  
8 - <div>  
9 - <!-- 搜索 -->  
10 - <div style="margin-bottom:20px;">  
11 - <el-button  
12 - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"  
13 - @click="addbuss"  
14 - >新增</el-button  
15 - >  
16 - </div>  
17 -  
18 - <!-- 表格 -->  
19 - <el-table  
20 - :data=" 2 + <div style="background-color:#f7f7f7;padding:10px 10px;">
  3 + <div class="zhuti">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  6 + style="color:#000000e6">公告通知发布</span></div>
  7 + </div>
  8 + <div>
  9 + <!-- 搜索 -->
  10 + <div style="margin-bottom:20px;">
  11 + <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  12 + icon="el-icon-circle-plus-outline" @click="addbuss">新增</el-button>
  13 + </div>
  14 +
  15 + <!-- 表格 -->
  16 + <el-table :data="
21 tableData.slice( 17 tableData.slice(
22 (currentPage - 1) * pageSize, 18 (currentPage - 1) * pageSize,
23 currentPage * pageSize 19 currentPage * pageSize
24 ) 20 )
25 - "  
26 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"  
27 - style="width: 100%"  
28 - >  
29 - <el-table-column  
30 - label="序号"  
31 - width="auto"  
32 - min-width="6%"  
33 - align="center"  
34 - >  
35 - <template slot-scope="scope">  
36 - {{scope.$index+1}}  
37 - </template>  
38 - </el-table-column>  
39 - <el-table-column  
40 - label="标题"  
41 - prop="announcementTitle"  
42 - width="auto"  
43 - min-width="12%"  
44 - />  
45 - <el-table-column  
46 - label="信息类型"  
47 - prop="informationType"  
48 - width="auto"  
49 - min-width="12%"  
50 - />  
51 - <el-table-column  
52 - label="创建时间"  
53 - prop="releaseTime"  
54 - width="auto"  
55 - min-width="12%"  
56 - />  
57 -  
58 - <el-table-column label="操作" width="auto" min-width="17%">  
59 - <template slot-scope="scope">  
60 - <div class="tableBtn greens" @click="handleEditForm(scope.row)">  
61 - 查看  
62 - </div>  
63 - <div class="tableBtn greens" @click="bianjilist(scope.row)">  
64 - 编辑  
65 - </div>  
66 - <div class="tableBtn greens" @click="delGuan(scope.row)">  
67 - 删除  
68 - </div>  
69 - </template>  
70 - </el-table-column>  
71 - </el-table>  
72 - <!-- 详情框 :visible.sync="detbox" -->  
73 - <!-- <div v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->  
74 - <el-dialog  
75 - :visible.sync="detbox"  
76 - custom-class="dialog_css"  
77 - style="padding: 0"  
78 - width="55%"  
79 - center  
80 - :close-on-click-modal="false"  
81 - class="dialog_css_Xq"  
82 - :show-close="false"  
83 - >  
84 - <div  
85 - style=" 21 + " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
  22 + style="width: 100%">
  23 + <el-table-column label="序号" width="auto" min-width="6%" align="center">
  24 + <template slot-scope="scope">
  25 + {{scope.$index+1}}
  26 + </template>
  27 + </el-table-column>
  28 + <el-table-column label="标题" prop="announcementTitle" width="auto" min-width="12%" />
  29 + <el-table-column label="信息类型" prop="informationType" width="auto" min-width="12%" />
  30 + <el-table-column label="创建时间" prop="releaseTime" width="auto" min-width="12%" />
  31 +
  32 + <el-table-column label="操作" width="auto" min-width="17%">
  33 + <template slot-scope="scope">
  34 + <div class="tableBtn greens" @click="handleEditForm(scope.row)">
  35 + 查看
  36 + </div>
  37 + <div class="tableBtn greens" @click="bianjilist(scope.row)">
  38 + 编辑
  39 + </div>
  40 + <div class="tableBtn greens" @click="delGuan(scope.row)">
  41 + 删除
  42 + </div>
  43 + </template>
  44 + </el-table-column>
  45 + </el-table>
  46 + <!-- 详情框 :visible.sync="detbox" -->
  47 + <!-- <div v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
  48 + <el-dialog :visible.sync="detbox" custom-class="dialog_css" style="padding: 0" width="55%" center
  49 + :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
  50 + <div style="
86 background-color: #fafafa; 51 background-color: #fafafa;
87 border: 1px solid #eaeaea; 52 border: 1px solid #eaeaea;
88 height: 42px; 53 height: 42px;
@@ -90,188 +55,131 @@ @@ -90,188 +55,131 @@
90 margin-bottom: 20px; 55 margin-bottom: 20px;
91 padding: 0 20px; 56 padding: 0 20px;
92 line-height: 42px; 57 line-height: 42px;
93 - "  
94 - >  
95 - {{edit?'查看':'编辑'}}  
96 - </div>  
97 - <div style="padding: 0 20px">  
98 - <div  
99 - style=" 58 + ">
  59 + {{edit?'查看':'编辑'}}
  60 + </div>
  61 + <div style="padding: 0 20px">
  62 + <div style="
100 display: flex; 63 display: flex;
101 justify-content: space-between; 64 justify-content: space-between;
102 font-size: 14px; 65 font-size: 14px;
103 margin-bottom: 20px; 66 margin-bottom: 20px;
104 - "  
105 - >  
106 - <div style="width: 100%">  
107 - <el-row style="height: 38px; margin-bottom: 15px">  
108 - <el-col :span="24">  
109 - <el-form  
110 -  
111 - :inline="true"  
112 - label-width="100px"  
113 - >  
114 - <el-form-item prop="name" style="width: 100%">  
115 - <div  
116 - slot="label"  
117 - style=" 67 + ">
  68 + <div style="width: 100%">
  69 + <el-row style="height: 38px; margin-bottom: 15px">
  70 + <el-col :span="24">
  71 + <el-form :inline="true" label-width="100px">
  72 + <el-form-item prop="name" style="width: 100%">
  73 + <div slot="label" style="
118 text-align: left; 74 text-align: left;
119 height: 38px; 75 height: 38px;
120 line-height: 38px; 76 line-height: 38px;
121 padding-left: 10px; 77 padding-left: 10px;
122 - "  
123 - >  
124 - <span style="font-size: 14px; color: #000"  
125 - >公告标题</span  
126 - >  
127 - </div>  
128 - <div  
129 - v-if="edit"  
130 - style=" 78 + ">
  79 + <span style="font-size: 14px; color: #000">公告标题</span>
  80 + </div>
  81 + <div v-if="edit" style="
131 height: 38px; 82 height: 38px;
132 line-height: 38px; 83 line-height: 38px;
133 border: 1px solid #ebeef5; 84 border: 1px solid #ebeef5;
134 padding: 0 20px; 85 padding: 0 20px;
135 font-size: 14px; 86 font-size: 14px;
136 - "  
137 - >  
138 - {{secondData.announcementTitle}}  
139 - </div>  
140 - <el-input  
141 - v-else  
142 - v-model="secondData.announcementTitle"  
143 - placeholder="请输入"  
144 - class="moren"  
145 - />  
146 - </el-form-item>  
147 - </el-form>  
148 - </el-col>  
149 - </el-row>  
150 - <el-row style="height: 38px; margin-bottom: 15px">  
151 - <el-col :span="24">  
152 - <el-form  
153 -  
154 - :inline="true"  
155 - label-width="100px"  
156 - >  
157 - <el-form-item prop="name" style="width: 100%">  
158 - <div  
159 - slot="label"  
160 - style=" 87 + ">
  88 + {{secondData.announcementTitle}}
  89 + </div>
  90 + <el-input v-else v-model="secondData.announcementTitle"
  91 + placeholder="请输入" class="moren" />
  92 + </el-form-item>
  93 + </el-form>
  94 + </el-col>
  95 + </el-row>
  96 + <el-row style="height: 38px; margin-bottom: 15px">
  97 + <el-col :span="24">
  98 + <el-form :inline="true" label-width="100px">
  99 + <el-form-item prop="name" style="width: 100%">
  100 + <div slot="label" style="
161 text-align: left; 101 text-align: left;
162 height: 38px; 102 height: 38px;
163 line-height: 38px; 103 line-height: 38px;
164 padding-left: 10px; 104 padding-left: 10px;
165 - "  
166 - >  
167 - <span style="font-size: 14px; color: #000"  
168 - >信息类型</span  
169 - >  
170 - </div>  
171 - <div  
172 - v-if="edit"  
173 - style=" 105 + ">
  106 + <span style="font-size: 14px; color: #000">信息类型</span>
  107 + </div>
  108 + <div v-if="edit" style="
174 height: 38px; 109 height: 38px;
175 line-height: 38px; 110 line-height: 38px;
176 border: 1px solid #ebeef5; 111 border: 1px solid #ebeef5;
177 padding: 0 20px; 112 padding: 0 20px;
178 font-size: 14px; 113 font-size: 14px;
179 - "  
180 - >  
181 - {{secondData.informationType}}  
182 - </div>  
183 - <el-select v-model="secondData.informationType" placeholder="请选择" style="width:100%;" v-else>  
184 - <el-option label="通知" value="通知" />  
185 - <el-option label="热点租赁信息" value="热点租赁信息" />  
186 - <el-option label="广告信息" value="广告信息" />  
187 - <el-option label="活动信息" value="活动信息" />  
188 - </el-select>  
189 - </el-form-item>  
190 - </el-form>  
191 - </el-col>  
192 - </el-row>  
193 - <el-row style="height: 38px; margin-bottom: 15px">  
194 - <el-col :span="24">  
195 - <el-form  
196 -  
197 - :inline="true"  
198 - label-width="100px"  
199 - >  
200 - <el-form-item prop="name" style="width: 100%">  
201 - <div  
202 - slot="label"  
203 - style=" 114 + ">
  115 + {{secondData.informationType}}
  116 + </div>
  117 + <el-select v-model="secondData.informationType" placeholder="请选择"
  118 + style="width:100%;" v-else>
  119 + <el-option label="通知" value="通知" />
  120 + <el-option label="热点租赁信息" value="热点租赁信息" />
  121 + <el-option label="广告信息" value="广告信息" />
  122 + <el-option label="活动信息" value="活动信息" />
  123 + </el-select>
  124 + </el-form-item>
  125 + </el-form>
  126 + </el-col>
  127 + </el-row>
  128 + <el-row style="height: 38px; margin-bottom: 15px">
  129 + <el-col :span="24">
  130 + <el-form :inline="true" label-width="100px">
  131 + <el-form-item prop="name" style="width: 100%">
  132 + <div slot="label" style="
204 text-align: left; 133 text-align: left;
205 height: 38px; 134 height: 38px;
206 line-height: 38px; 135 line-height: 38px;
207 padding-left: 10px; 136 padding-left: 10px;
208 - "  
209 - >  
210 - <span style="font-size: 14px; color: #000"  
211 - >公告内容</span  
212 - >  
213 - </div>  
214 - <div  
215 - style=" 137 + ">
  138 + <span style="font-size: 14px; color: #000">公告内容</span>
  139 + </div>
  140 + <div style="
216 font-size: 14px; 141 font-size: 14px;
217 - "  
218 - >  
219 - <div>  
220 - <div style="padding:20px;" v-if="edit" v-html="secondData.announcementContent"></div>  
221 - <wang-editor v-model="secondData.announcementContent" ref="editor" v-else></wang-editor>  
222 - </div>  
223 - </div>  
224 -  
225 - </el-form-item>  
226 - </el-form>  
227 - </el-col>  
228 - </el-row>  
229 - </div>  
230 - </div>  
231 -  
232 - <div  
233 - style=" 142 + ">
  143 + <div>
  144 + <div style="padding:20px;" v-if="edit"
  145 + v-html="secondData.announcementContent"></div>
  146 + <wang-editor v-model="secondData.announcementContent"
  147 + ref="editor" v-else></wang-editor>
  148 + </div>
  149 + </div>
  150 +
  151 + </el-form-item>
  152 + </el-form>
  153 + </el-col>
  154 + </el-row>
  155 + </div>
  156 + </div>
  157 +
  158 + <div style="
234 margin-top: 50px; 159 margin-top: 50px;
235 width: 99%; 160 width: 99%;
236 padding: 10px; 161 padding: 10px;
237 display: flex; 162 display: flex;
238 justify-content: flex-end; 163 justify-content: flex-end;
239 - "  
240 - >  
241 - <el-button  
242 - class="buttonHover"  
243 - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"  
244 - @click="closeFn(1)"  
245 - >取消</el-button  
246 - >  
247 - <!-- <el-button 164 + ">
  165 + <el-button class="buttonHover"
  166 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  167 + @click="closeFn(1)">取消</el-button>
  168 + <!-- <el-button
248 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" 169 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
249 @click="bianji" 170 @click="bianji"
250 >编辑</el-button> --> 171 >编辑</el-button> -->
251 172
252 - <el-button  
253 - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"  
254 - @click="msgeditS"  
255 - v-if="!edit"  
256 - >确定</el-button  
257 - >  
258 - </div>  
259 - </div>  
260 - </el-dialog>  
261 - <!-- ******************************************************弹框开始****************************************************** -->  
262 - <!-- 新增弹框 -->  
263 - <el-dialog  
264 - :visible.sync="ggXin"  
265 - custom-class="dialog_css"  
266 - style="padding: 0"  
267 - width="55%"  
268 - center  
269 - :close-on-click-modal="false"  
270 - class="dialog_css_Xq"  
271 - :show-close="false"  
272 - >  
273 - <div  
274 - style=" 173 + <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="msgeditS"
  174 + v-if="!edit">确定</el-button>
  175 + </div>
  176 + </div>
  177 + </el-dialog>
  178 + <!-- ******************************************************弹框开始****************************************************** -->
  179 + <!-- 新增弹框 -->
  180 + <el-dialog :visible.sync="ggXin" custom-class="dialog_css" style="padding: 0" width="55%" center
  181 + :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
  182 + <div style="
275 background-color: #fafafa; 183 background-color: #fafafa;
276 border: 1px solid #eaeaea; 184 border: 1px solid #eaeaea;
277 height: 42px; 185 height: 42px;
@@ -279,611 +187,636 @@ @@ -279,611 +187,636 @@
279 margin-bottom: 20px; 187 margin-bottom: 20px;
280 padding: 0 20px; 188 padding: 0 20px;
281 line-height: 42px; 189 line-height: 42px;
282 - "  
283 - >  
284 - 新增  
285 - </div>  
286 - <div style="padding: 0 20px 20px 20px">  
287 - <el-form ref="ruleForm" :model="ruleForm" label-width="100px">  
288 - <el-form-item label="公告标题">  
289 - <el-input  
290 - v-model="ruleForm.announcementTitle"  
291 - placeholder="请输入"  
292 - size="mini"  
293 - />  
294 - </el-form-item>  
295 - <el-form-item label="信息类型" prop="informationType">  
296 - <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width:100%;">  
297 - <el-option label="通知" value="通知" />  
298 - <el-option label="热点租赁信息" value="热点租赁信息" />  
299 - <el-option label="广告信息" value="广告信息" />  
300 - <el-option label="活动信息" value="活动信息" />  
301 - </el-select>  
302 - </el-form-item>  
303 - <el-form-item label="公告内容">  
304 - <div>  
305 - <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>  
306 -  
307 - </div>  
308 - </el-form-item>  
309 - </el-form>  
310 - </div>  
311 - <span slot="footer" class="dialog-footer">  
312 - <el-button  
313 - class="buttonHover"  
314 - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"  
315 - @click="closeFn(2)"  
316 - >取 消</el-button  
317 - >  
318 - <el-button  
319 - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"  
320 - @click="addCheck('ruleForm')"  
321 - >确 定</el-button  
322 - >  
323 - </span>  
324 - </el-dialog>  
325 -  
326 - <div class="fenye">  
327 - <el-pagination  
328 - class="pagination"  
329 - :hide-on-single-page="flag"  
330 - background  
331 - small  
332 - :current-page="currentPage"  
333 - :page-sizes="[10, 20, 50, 100]"  
334 - layout="prev, pager, next,total"  
335 - :total="total"  
336 - @size-change="handleSizeChange"  
337 - @current-change="handleCurrentChange"  
338 - />  
339 - </div>  
340 - </div>  
341 - </div>  
342 - </div> 190 + ">
  191 + 新增
  192 + </div>
  193 + <div style="padding: 0 20px 20px 20px">
  194 + <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
  195 + <el-form-item label="公告标题">
  196 + <el-input v-model="ruleForm.announcementTitle" placeholder="请输入" size="mini" />
  197 + </el-form-item>
  198 + <el-form-item label="信息类型" prop="informationType">
  199 + <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width:100%;">
  200 + <el-option label="通知" value="通知" />
  201 + <el-option label="热点租赁信息" value="热点租赁信息" />
  202 + <el-option label="广告信息" value="广告信息" />
  203 + <el-option label="活动信息" value="活动信息" />
  204 + </el-select>
  205 + </el-form-item>
  206 + <el-form-item label="公告内容">
  207 + <div>
  208 + <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
  209 +
  210 + </div>
  211 + </el-form-item>
  212 + </el-form>
  213 + </div>
  214 + <span slot="footer" class="dialog-footer">
  215 + <el-button class="buttonHover"
  216 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  217 + @click="closeFn(2)">取 消</el-button>
  218 + <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  219 + @click="addCheck('ruleForm')">确 定</el-button>
  220 + </span>
  221 + </el-dialog>
  222 +
  223 + <div class="fenye">
  224 + <el-pagination class="pagination" :hide-on-single-page="flag" background small
  225 + :current-page="currentPage" :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total"
  226 + :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  227 + </div>
  228 + </div>
  229 + </div>
  230 + </div>
343 </template> 231 </template>
344 232
345 <script> 233 <script>
346 - import wangEditor from "@/components/editor/index";  
347 -import { uploadUrl,token } from '@/utils/request'  
348 -import {  
349 - queryByPage,  
350 - addId,  
351 - editId,  
352 - deleteById  
353 -} from '../../api/procedure';  
354 -export default {  
355 - components: {wangEditor},  
356 - data() {  
357 - return {  
358 - detbox: false, // 详情  
359 - edit: true, // 编辑  
360 - action: uploadUrl, // 上传图片  
361 - myHeaders: {  
362 - 'Authorization-admin': token  
363 - },  
364 - ggXin: false, // 新增  
365 - formSel: {  
366 - belongingRegion:'',  
367 - shopName:'',  
368 - scheduledTime:''  
369 - },  
370 - secondData:{  
371 -  
372 - },  
373 - ruleForm: {  
374 - announcementTitle:'',//公告标题  
375 - informationType:'',  
376 - announcementContent:'',//公告内容  
377 - releaseTime:''//时间  
378 - },  
379 - currentPage: 1,  
380 - total: 100,  
381 - flag: false,  
382 - pageSize: 10,  
383 - tableData: [],  
384 - msgid: '',  
385 - pageindex: {  
386 - pageNumber: 1,  
387 - pageSize: 10,  
388 - },  
389 - }  
390 - },  
391 -  
392 - created() {  
393 - this.getAll();  
394 - },  
395 - mounted() {},  
396 -  
397 - methods: {  
398 - // 获取当前时间  
399 - updateCurrentTime() {  
400 - const now = new Date();  
401 - const year = now.getFullYear();  
402 - const month = (now.getMonth() + 1).toString().padStart(2, '0');  
403 - const day = now.getDate().toString().padStart(2, '0');  
404 - const hours = now.getHours().toString().padStart(2, '0');  
405 - const minutes = now.getMinutes().toString().padStart(2, '0');  
406 - const seconds = now.getSeconds().toString().padStart(2, '0');  
407 -  
408 - return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;  
409 - },  
410 - handleSelectionChange(val) {  
411 - this.multipleSelection = val;  
412 - },  
413 -  
414 - // 查询全数据  
415 - async getAll() {  
416 - const res = await queryByPage(this.pageindex);  
417 - this.tableData = res.data.content  
418 - this.total = res.data.content.length  
419 - },  
420 - // 编辑  
421 - bianji() {  
422 - if (this.edit) {  
423 - this.edit = false;  
424 - }  
425 - },  
426 -  
427 - bianjilist(item) {  
428 - this.detbox = true;  
429 - this.secondData = item;  
430 - this.msgid = item.id;  
431 - if (this.edit) {  
432 - this.edit = false;  
433 - }  
434 - },  
435 -  
436 - // 查询  
437 - async onSubmit() {},  
438 -  
439 - // 详情点击  
440 - async handleEditForm(item) {  
441 - this.secondData = item;  
442 - this.detbox = true;  
443 - this.msgid = item.id;  
444 - },  
445 - // 详情编辑确定  
446 - async msgeditS(){  
447 - await editId(this.secondData)  
448 - this.detbox = false;  
449 - this.edit = true  
450 - },  
451 - // 新增  
452 - addbuss() {  
453 - this.ruleForm={  
454 - announcementTitle:'',  
455 - announcementContent:'',  
456 - releaseTime:''  
457 - }  
458 - this.ggXin = true;  
459 - },  
460 - // 新增确定  
461 - async addCheck() {  
462 - this.ruleForm.releaseTime = this.updateCurrentTime();  
463 - const res = await addId(this.ruleForm)  
464 - this.getAll();  
465 - this.ggXin = false;  
466 - },  
467 - handleCurrentChange(val) {  
468 - this.currentPage = val;  
469 - },  
470 - handleSizeChange(val) {  
471 - this.pageSize = val;  
472 - },  
473 - // 取消  
474 - closeFn(val) {  
475 - if (val == 1) {  
476 - this.detbox = false;  
477 - this.edit = true;  
478 - } else {  
479 - this.ggXin = false;  
480 - }  
481 - this.getAll()  
482 - },  
483 - //删除列表  
484 - async delGuan(item){  
485 - await deleteById({id:item.id})  
486 - this.getAll()  
487 - },  
488 -  
489 - handleClick() {},  
490 - // 上传  
491 -  
492 - handlePreview(file) {  
493 - console.log(file);  
494 - },  
495 - handleRemove(file, fileList) {  
496 - console.log(file, fileList);  
497 - },  
498 -  
499 - // 重置按钮  
500 - resetting() {  
501 - this.formSel = {  
502 - affiliation: '',  
503 - createUser: '',  
504 - createDate: '',  
505 - contacts: '',  
506 - };  
507 - this.getAll();  
508 - }  
509 - },  
510 -}; 234 + import wangEditor from "@/components/editor/index";
  235 + import {
  236 + uploadUrl,
  237 + token
  238 + } from '@/utils/request'
  239 + import {
  240 + queryByPage,
  241 + addId,
  242 + editId,
  243 + deleteById
  244 + } from '../../api/procedure';
  245 + export default {
  246 + components: {
  247 + wangEditor
  248 + },
  249 + data() {
  250 + return {
  251 + detbox: false, // 详情
  252 + edit: true, // 编辑
  253 + ggXin: false, // 新增
  254 + formSel: {
  255 + belongingRegion: '',
  256 + shopName: '',
  257 + scheduledTime: ''
  258 + },
  259 + secondData: {
  260 +
  261 + },
  262 + ruleForm: {
  263 + announcementTitle: '', //公告标题
  264 + informationType: '',
  265 + announcementContent: '', //公告内容
  266 + releaseTime: '' //时间
  267 + },
  268 + currentPage: 1,
  269 + total: 100,
  270 + flag: false,
  271 + pageSize: 10,
  272 + tableData: [],
  273 + msgid: '',
  274 + pageindex: {
  275 + pageNumber: 1,
  276 + pageSize: 10,
  277 + },
  278 + rules: {
  279 +
  280 + announcementTitle: [{
  281 + required: true,
  282 + message: '请输入公告标题',
  283 + trigger: 'blur'
  284 + }],
  285 + announcementContent: [{
  286 + required: true,
  287 + message: '请输入公告内容',
  288 + trigger: 'blur'
  289 + }],
  290 + informationType: [{
  291 + required: true,
  292 + message: '请选择信息类型',
  293 + trigger: 'change'
  294 + }]
  295 +
  296 + }
  297 + }
  298 + },
  299 +
  300 + created() {
  301 + this.getAll();
  302 + },
  303 + mounted() {},
  304 +
  305 + methods: {
  306 + // 获取当前时间
  307 + updateCurrentTime() {
  308 + const now = new Date();
  309 + const year = now.getFullYear();
  310 + const month = (now.getMonth() + 1).toString().padStart(2, '0');
  311 + const day = now.getDate().toString().padStart(2, '0');
  312 + const hours = now.getHours().toString().padStart(2, '0');
  313 + const minutes = now.getMinutes().toString().padStart(2, '0');
  314 + const seconds = now.getSeconds().toString().padStart(2, '0');
  315 +
  316 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  317 + },
  318 + handleSelectionChange(val) {
  319 + this.multipleSelection = val;
  320 + },
  321 +
  322 + // 查询全数据
  323 + async getAll() {
  324 + const res = await queryByPage(this.pageindex);
  325 + this.tableData = res.data.content
  326 + this.total = res.data.content.length
  327 + },
  328 + // 编辑
  329 + bianji() {
  330 + if (this.edit) {
  331 + this.edit = false;
  332 + }
  333 + },
  334 +
  335 + bianjilist(item) {
  336 + this.detbox = true;
  337 + this.secondData = item;
  338 + this.msgid = item.id;
  339 + if (this.edit) {
  340 + this.edit = false;
  341 + }
  342 + },
  343 +
  344 + // 查询
  345 + async onSubmit() {},
  346 +
  347 + // 详情点击
  348 + async handleEditForm(item) {
  349 + this.secondData = item;
  350 + this.detbox = true;
  351 + this.msgid = item.id;
  352 + },
  353 + // 详情编辑确定
  354 + async msgeditS() {
  355 + await editId(this.secondData)
  356 + this.detbox = false;
  357 + this.edit = true
  358 + },
  359 + // 新增
  360 + addbuss() {
  361 + this.ruleForm = {
  362 + announcementTitle: '',
  363 + announcementContent: '',
  364 + releaseTime: '',
  365 + publisher: ''
  366 + }
  367 + this.ggXin = true;
  368 + },
  369 + // 新增确定
  370 + addCheck() {
  371 + this.$refs[formName].validate((valid) => {
  372 + if (valid) {
  373 + this.ruleForm.publisher = localStorage.getItem('roleName')
  374 + this.ruleForm.releaseTime = this.updateCurrentTime();
  375 + addId(this.ruleForm).then(() => {
  376 + this.getAll();
  377 + this.ggXin = false;
  378 + })
  379 +
  380 + } else {
  381 + this.$message({
  382 + message: '请填写数据',
  383 + type: 'error',
  384 + offset: 100
  385 + })
  386 + return false;
  387 + }
  388 + })
  389 +
  390 +
  391 + },
  392 + handleCurrentChange(val) {
  393 + this.currentPage = val;
  394 + },
  395 + handleSizeChange(val) {
  396 + this.pageSize = val;
  397 + },
  398 + // 取消
  399 + closeFn(val) {
  400 + if (val == 1) {
  401 + this.detbox = false;
  402 + this.edit = true;
  403 + } else {
  404 + this.ggXin = false;
  405 + }
  406 + this.getAll()
  407 + },
  408 + //删除列表
  409 + async delGuan(item) {
  410 + await deleteById({
  411 + id: item.id
  412 + })
  413 + this.getAll()
  414 + },
  415 +
  416 + handleClick() {},
  417 + // 上传
  418 +
  419 + handlePreview(file) {
  420 + console.log(file);
  421 + },
  422 + handleRemove(file, fileList) {
  423 + console.log(file, fileList);
  424 + },
  425 +
  426 + // 重置按钮
  427 + resetting() {
  428 + this.formSel = {
  429 + affiliation: '',
  430 + createUser: '',
  431 + createDate: '',
  432 + contacts: '',
  433 + };
  434 + this.getAll();
  435 + }
  436 + },
  437 + };
511 </script> 438 </script>
512 <style src="@wangeditor/editor/dist/css/style.css"></style> 439 <style src="@wangeditor/editor/dist/css/style.css"></style>
513 <style scoped> 440 <style scoped>
514 -/deep/ .first-column-bg {  
515 - background-color: #f4f4f5 !important;  
516 -}  
517 -  
518 -.zhuti {  
519 - padding: 0 20px 20px 20px;  
520 - min-height: calc(100vh - 50px - 20px);  
521 - background-color: #fff;  
522 -}  
523 -  
524 -/deep/ .el-form-item__content {  
525 - width: 80%;  
526 -}  
527 -  
528 -.tableBtn {  
529 - display: inline-block;  
530 - margin-right: 10px;  
531 -}  
532 -  
533 -.formSearch {  
534 - display: flex;  
535 - width: 100%;  
536 - font-size: 14px;  
537 - justify-content: space-between;  
538 - }  
539 -  
540 -.greens {  
541 - color: #3f9b6a;  
542 -}  
543 - /deep/ .el-table__row {  
544 - font-size: 14px;  
545 - color: #000000e6;  
546 - height: 42px;  
547 - }  
548 -.fenye {  
549 - margin-top: 20px;  
550 - display: flex;  
551 - justify-content: flex-end;  
552 - position: relative;  
553 -}  
554 -  
555 -/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {  
556 - background-color: #3f9b6a;  
557 -}  
558 -  
559 -:last-child {  
560 - margin-bottom: 0;  
561 -}  
562 -  
563 -.el-col {  
564 - border-radius: 4px;  
565 -}  
566 -  
567 -.bg-purple-dark {  
568 - background: #99a9bf;  
569 -}  
570 -  
571 -.bg-purple {  
572 - /* background: #d3dce6; */  
573 -}  
574 -  
575 -.bg-purple-light {  
576 - background: #e5e9f2;  
577 -}  
578 -  
579 -.grid-content {  
580 - border-radius: 4px;  
581 - min-height: 36px;  
582 -}  
583 -  
584 -.row-bg {  
585 - padding: 10px 0;  
586 - background-color: #f9fafc;  
587 -}  
588 -  
589 -/deep/ .bg-purple[data-v-0e3fe4ec] {  
590 - background: #fff;  
591 - height: 50px;  
592 -}  
593 -  
594 -/deep/ .el-form--label-top .el-form-item__label {  
595 - padding: 0;  
596 -}  
597 -  
598 -.demo-input-suffix {  
599 - display: flex;  
600 - margin-right: 20px;  
601 -}  
602 -  
603 -.pagination {  
604 - text-align: right;  
605 - line-height: 20px;  
606 -}  
607 -  
608 -/deep/ .el-pagination__total {  
609 - margin-top: 4px;  
610 -}  
611 -  
612 -  
613 -.dialog_css {  
614 - padding: 0px;  
615 -}  
616 -  
617 -.dialog_xin {  
618 - padding: 0px;  
619 -}  
620 -  
621 -/deep/.el-dialog__body {  
622 - padding: 0px;  
623 -}  
624 -  
625 -/deep/ .el-dialog__header {  
626 - background-color: #fff;  
627 - padding: 0;  
628 -}  
629 -  
630 -/deep/.el-dialog__title {  
631 - color: #000;  
632 -}  
633 -  
634 -.el-row {  
635 - &:last-child {  
636 - margin-bottom: 0;  
637 - }  
638 -}  
639 -  
640 -/deep/ .avatar-uploader .el-upload {  
641 - border: 1px dashed #d9d9d9;  
642 - border-radius: 6px;  
643 - cursor: pointer;  
644 - position: relative;  
645 - overflow: hidden;  
646 -}  
647 -  
648 -.avatar-uploader .el-upload:hover {  
649 - border-color: #409eff;  
650 -}  
651 -  
652 -.avatar-uploader-icon {  
653 - font-size: 28px;  
654 - color: #8c939d;  
655 - width: 108px;  
656 - height: 108px;  
657 - line-height: 108px;  
658 - /*text-align: center;*/  
659 -}  
660 -  
661 -.avatar {  
662 - width: 108px;  
663 - height: 108px;  
664 - display: block;  
665 -}  
666 -  
667 -::v-deep .el-tabs__item.is-active {  
668 - color: #3f9b6a;  
669 - opacity: 1;  
670 -}  
671 -  
672 -/deep/ .el-tabs__nav-wrap::after {  
673 - background-color: #fff;  
674 -}  
675 -  
676 -  
677 -  
678 -/deep/ .el-tabs__active-bar {  
679 - background-color: #389865;  
680 -}  
681 -  
682 -/deep/ .el-table_2_column_13 {  
683 - font-weight: 100;  
684 -}  
685 -  
686 -::v-deep .el-input__inner:focus {  
687 - border: #3f9b6a 1px solid;  
688 -}  
689 -  
690 -::v-deep .el-input__inner:hover {  
691 - border: #3f9b6a 1px solid;  
692 -}  
693 -  
694 -::v-deep .el-select .el-input.is-focus .el-input__inner {  
695 - border-color: #3f9b6a;  
696 -}  
697 -  
698 -::v-deep .el-form-item__label {  
699 - font-weight: normal;  
700 - font-size: 14px;  
701 -} 441 + /deep/ .first-column-bg {
  442 + background-color: #f4f4f5 !important;
  443 + }
  444 +
  445 + .zhuti {
  446 + padding: 0 20px 20px 20px;
  447 + min-height: calc(100vh - 50px - 20px);
  448 + background-color: #fff;
  449 + }
  450 +
  451 + /deep/ .el-form-item__content {
  452 + width: 80%;
  453 + }
  454 +
  455 + .tableBtn {
  456 + display: inline-block;
  457 + margin-right: 10px;
  458 + }
  459 +
  460 + .formSearch {
  461 + display: flex;
  462 + width: 100%;
  463 + font-size: 14px;
  464 + justify-content: space-between;
  465 + }
  466 +
  467 + .greens {
  468 + color: #3f9b6a;
  469 + }
  470 +
  471 + /deep/ .el-table__row {
  472 + font-size: 14px;
  473 + color: #000000e6;
  474 + height: 42px;
  475 + }
  476 +
  477 + .fenye {
  478 + margin-top: 20px;
  479 + display: flex;
  480 + justify-content: flex-end;
  481 + position: relative;
  482 + }
  483 +
  484 + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
  485 + background-color: #3f9b6a;
  486 + }
  487 +
  488 + :last-child {
  489 + margin-bottom: 0;
  490 + }
  491 +
  492 + .el-col {
  493 + border-radius: 4px;
  494 + }
  495 +
  496 + .bg-purple-dark {
  497 + background: #99a9bf;
  498 + }
  499 +
  500 + .bg-purple {
  501 + /* background: #d3dce6; */
  502 + }
  503 +
  504 + .bg-purple-light {
  505 + background: #e5e9f2;
  506 + }
  507 +
  508 + .grid-content {
  509 + border-radius: 4px;
  510 + min-height: 36px;
  511 + }
  512 +
  513 + .row-bg {
  514 + padding: 10px 0;
  515 + background-color: #f9fafc;
  516 + }
  517 +
  518 + /deep/ .bg-purple[data-v-0e3fe4ec] {
  519 + background: #fff;
  520 + height: 50px;
  521 + }
  522 +
  523 + /deep/ .el-form--label-top .el-form-item__label {
  524 + padding: 0;
  525 + }
  526 +
  527 + .demo-input-suffix {
  528 + display: flex;
  529 + margin-right: 20px;
  530 + }
  531 +
  532 + .pagination {
  533 + text-align: right;
  534 + line-height: 20px;
  535 + }
  536 +
  537 + /deep/ .el-pagination__total {
  538 + margin-top: 4px;
  539 + }
  540 +
  541 +
  542 + .dialog_css {
  543 + padding: 0px;
  544 + }
  545 +
  546 + .dialog_xin {
  547 + padding: 0px;
  548 + }
  549 +
  550 + /deep/.el-dialog__body {
  551 + padding: 0px;
  552 + }
  553 +
  554 + /deep/ .el-dialog__header {
  555 + background-color: #fff;
  556 + padding: 0;
  557 + }
  558 +
  559 + /deep/.el-dialog__title {
  560 + color: #000;
  561 + }
  562 +
  563 + .el-row {
  564 + &:last-child {
  565 + margin-bottom: 0;
  566 + }
  567 + }
  568 +
  569 + /deep/ .avatar-uploader .el-upload {
  570 + border: 1px dashed #d9d9d9;
  571 + border-radius: 6px;
  572 + cursor: pointer;
  573 + position: relative;
  574 + overflow: hidden;
  575 + }
  576 +
  577 + .avatar-uploader .el-upload:hover {
  578 + border-color: #409eff;
  579 + }
  580 +
  581 + .avatar-uploader-icon {
  582 + font-size: 28px;
  583 + color: #8c939d;
  584 + width: 108px;
  585 + height: 108px;
  586 + line-height: 108px;
  587 + /*text-align: center;*/
  588 + }
  589 +
  590 + .avatar {
  591 + width: 108px;
  592 + height: 108px;
  593 + display: block;
  594 + }
  595 +
  596 + ::v-deep .el-tabs__item.is-active {
  597 + color: #3f9b6a;
  598 + opacity: 1;
  599 + }
  600 +
  601 + /deep/ .el-tabs__nav-wrap::after {
  602 + background-color: #fff;
  603 + }
  604 +
  605 +
  606 +
  607 + /deep/ .el-tabs__active-bar {
  608 + background-color: #389865;
  609 + }
  610 +
  611 + /deep/ .el-table_2_column_13 {
  612 + font-weight: 100;
  613 + }
  614 +
  615 + ::v-deep .el-input__inner:focus {
  616 + border: #3f9b6a 1px solid;
  617 + }
  618 +
  619 + ::v-deep .el-input__inner:hover {
  620 + border: #3f9b6a 1px solid;
  621 + }
  622 +
  623 + ::v-deep .el-select .el-input.is-focus .el-input__inner {
  624 + border-color: #3f9b6a;
  625 + }
  626 +
  627 + ::v-deep .el-form-item__label {
  628 + font-weight: normal;
  629 + font-size: 14px;
  630 + }
702 631
703 -  
704 -/* ::v-deep .el-steps .el-step__head.is-wait { 632 +
  633 + /* ::v-deep .el-steps .el-step__head.is-wait {
705 background-color: red; /* 修改为你想要的颜色 */ 634 background-color: red; /* 修改为你想要的颜色 */
706 635
707 -/* 修改未进行步骤的描述文字颜色 */  
708 -::v-deep .el-steps .el-step__description.is-wait {  
709 - color: #999;  
710 - /* 修改为你想要的颜色 */  
711 -}  
712 -  
713 -/* 修改未进行步骤的图标颜色 */  
714 -::v-deep .el-steps .el-step__icon.is-text.is-wait {  
715 - color: #999;  
716 - /* 修改为你想要的颜色 */  
717 -}  
718 -  
719 -/* 修改未进行步骤的边框色 */  
720 -::v-deep .el-steps .el-step__line.is-wait {  
721 - border-color: #eee;  
722 - /* 修改为你想要的颜色 */  
723 -}  
724 -  
725 -::v-deep .el-steps .is-process .el-step__line {  
726 - background-color: #3f9b6a;  
727 - /* 修改线的颜色 */  
728 -}  
729 -  
730 -::v-deep .el-steps .is-process .el-step__title {  
731 - color: #fe7b6a;  
732 - /* 修改进行中步骤的标题颜色 */  
733 -}  
734 -  
735 -::v-deep .el-steps .is-process .el-step__icon {  
736 - color: #fff;  
737 - /* 修改进行中步骤的图标颜色 */  
738 - background: #3f9b6a;  
739 - /* 修改进行中步骤图标的边框颜色 */  
740 - border: 0px;  
741 -}  
742 -  
743 -::v-deep .el-step__icon-inner {  
744 - line-height: 0;  
745 -}  
746 -  
747 -/* 线条长度 */  
748 -::v-deep .el-step.is-vertical .el-step__line {  
749 - top: 30px;  
750 - height: 60px;  
751 -}  
752 -  
753 -  
754 -  
755 -::v-deep .moren {  
756 - .el-input__inner {  
757 - margin-top: 5px;  
758 - padding: 0 20px;  
759 - }  
760 -}  
761 -  
762 -/deep/ .el-radio-group {  
763 - margin-top: 11px;  
764 -}  
765 -  
766 -/deep/ .el-radio__input.is-checked .el-radio__inner {  
767 - border-color: #3f9b6a;  
768 - background: #3f9b6a;  
769 -}  
770 -  
771 -::v-deep .el-col {  
772 - padding: 0 !important;  
773 -}  
774 -  
775 -/deep/ .el-radio-group {  
776 - width: 100%;  
777 -}  
778 -  
779 -.radio-right-side {  
780 - width: 100%;  
781 - display: flex;  
782 - justify-content: space-between;  
783 -}  
784 -  
785 -/deep/ .radio-right-side .el-radio__label {  
786 - display: flex;  
787 - align-items: center;  
788 -}  
789 -  
790 -/deep/ .radio-right-side .el-radio__inner {  
791 - order: 1;  
792 -}  
793 -  
794 -/deep/ .radio-right-side .el-radio__input {  
795 - display: flex;  
796 - order: 2;  
797 -}  
798 -  
799 -/deep/ .radio-right-side {  
800 - &:hover {  
801 - color: #000;  
802 - }  
803 -}  
804 -  
805 -::v-deep .el-dialog__wrapper {  
806 - .dialog_css {  
807 - margin-left: 20%;  
808 - margin-top: 61px !important;  
809 -  
810 - .el-dialog__title {  
811 - font-size: 16px !important;  
812 - font-weight: 600;  
813 - color: #000;  
814 - }  
815 - }  
816 -}  
817 -  
818 -::v-deep .setup {  
819 - .el-steps {  
820 - justify-content: center;  
821 - }  
822 -}  
823 -  
824 -::v-deep .el-step__head.is-finish {  
825 - color: #c0c4cc;  
826 - border-color: #c0c4cc;  
827 -}  
828 -  
829 -::v-deep .el-step__title.is-finish {  
830 - color: #c0c4cc;  
831 -}  
832 -  
833 -::v-deep .el-step__title.is-process {  
834 - color: #c0c4cc;  
835 -}  
836 -  
837 -::v-deep .el-tabs {  
838 - width: 100%;  
839 -}  
840 -::v-deep .setup{  
841 - .el-step__main{  
842 - margin-left: -17px;  
843 - }  
844 - .el-step__title.is-process{  
845 - color: #3f9b6a;  
846 - }  
847 -  
848 -}  
849 -::v-deep .el-pagination__jump{  
850 - margin-top:5px;  
851 -}  
852 -::v-deep .linClass{  
853 -.el-dialog__header{  
854 -padding: 20px 20px 10px;  
855 -font-size: 14px;  
856 -}  
857 -} 636 + /* 修改未进行步骤的描述文字颜色 */
  637 + ::v-deep .el-steps .el-step__description.is-wait {
  638 + color: #999;
  639 + /* 修改为你想要的颜色 */
  640 + }
  641 +
  642 + /* 修改未进行步骤的图标颜色 */
  643 + ::v-deep .el-steps .el-step__icon.is-text.is-wait {
  644 + color: #999;
  645 + /* 修改为你想要的颜色 */
  646 + }
  647 +
  648 + /* 修改未进行步骤的边框色 */
  649 + ::v-deep .el-steps .el-step__line.is-wait {
  650 + border-color: #eee;
  651 + /* 修改为你想要的颜色 */
  652 + }
  653 +
  654 + ::v-deep .el-steps .is-process .el-step__line {
  655 + background-color: #3f9b6a;
  656 + /* 修改线的颜色 */
  657 + }
  658 +
  659 + ::v-deep .el-steps .is-process .el-step__title {
  660 + color: #fe7b6a;
  661 + /* 修改进行中步骤的标题颜色 */
  662 + }
  663 +
  664 + ::v-deep .el-steps .is-process .el-step__icon {
  665 + color: #fff;
  666 + /* 修改进行中步骤的图标颜色 */
  667 + background: #3f9b6a;
  668 + /* 修改进行中步骤图标的边框颜色 */
  669 + border: 0px;
  670 + }
  671 +
  672 + ::v-deep .el-step__icon-inner {
  673 + line-height: 0;
  674 + }
  675 +
  676 + /* 线条长度 */
  677 + ::v-deep .el-step.is-vertical .el-step__line {
  678 + top: 30px;
  679 + height: 60px;
  680 + }
  681 +
  682 +
  683 +
  684 + ::v-deep .moren {
  685 + .el-input__inner {
  686 + margin-top: 5px;
  687 + padding: 0 20px;
  688 + }
  689 + }
  690 +
  691 + /deep/ .el-radio-group {
  692 + margin-top: 11px;
  693 + }
  694 +
  695 + /deep/ .el-radio__input.is-checked .el-radio__inner {
  696 + border-color: #3f9b6a;
  697 + background: #3f9b6a;
  698 + }
  699 +
  700 + ::v-deep .el-col {
  701 + padding: 0 !important;
  702 + }
  703 +
  704 + /deep/ .el-radio-group {
  705 + width: 100%;
  706 + }
  707 +
  708 + .radio-right-side {
  709 + width: 100%;
  710 + display: flex;
  711 + justify-content: space-between;
  712 + }
  713 +
  714 + /deep/ .radio-right-side .el-radio__label {
  715 + display: flex;
  716 + align-items: center;
  717 + }
  718 +
  719 + /deep/ .radio-right-side .el-radio__inner {
  720 + order: 1;
  721 + }
  722 +
  723 + /deep/ .radio-right-side .el-radio__input {
  724 + display: flex;
  725 + order: 2;
  726 + }
  727 +
  728 + /deep/ .radio-right-side {
  729 + &:hover {
  730 + color: #000;
  731 + }
  732 + }
  733 +
  734 + ::v-deep .el-dialog__wrapper {
  735 + .dialog_css {
  736 + margin-left: 20%;
  737 + margin-top: 61px !important;
  738 +
  739 + .el-dialog__title {
  740 + font-size: 16px !important;
  741 + font-weight: 600;
  742 + color: #000;
  743 + }
  744 + }
  745 + }
  746 +
  747 + ::v-deep .setup {
  748 + .el-steps {
  749 + justify-content: center;
  750 + }
  751 + }
  752 +
  753 + ::v-deep .el-step__head.is-finish {
  754 + color: #c0c4cc;
  755 + border-color: #c0c4cc;
  756 + }
  757 +
  758 + ::v-deep .el-step__title.is-finish {
  759 + color: #c0c4cc;
  760 + }
  761 +
  762 + ::v-deep .el-step__title.is-process {
  763 + color: #c0c4cc;
  764 + }
  765 +
  766 + ::v-deep .el-tabs {
  767 + width: 100%;
  768 + }
  769 +
  770 + ::v-deep .setup {
  771 + .el-step__main {
  772 + margin-left: -17px;
  773 + }
  774 +
  775 + .el-step__title.is-process {
  776 + color: #3f9b6a;
  777 + }
  778 +
  779 + }
  780 +
  781 + ::v-deep .el-pagination__jump {
  782 + margin-top: 5px;
  783 + }
  784 +
  785 + ::v-deep .linClass {
  786 + .el-dialog__header {
  787 + padding: 20px 20px 10px;
  788 + font-size: 14px;
  789 + }
  790 + }
858 </style> 791 </style>
859 <style lang="scss" scoped> 792 <style lang="scss" scoped>
860 - ::v-deep .bian_css {  
861 - .el-dialog__header {  
862 - padding: 0px;  
863 - }  
864 -  
865 - }  
866 -  
867 - ::v-deep .buttonHover:hover {  
868 - color: #3f9b6a !important;  
869 - border-color: #c5e1d2 !important;  
870 - background-color: #ecf5f0 !important;  
871 - outline: none;  
872 - }  
873 -  
874 - ::v-deep .el-pagination__total {  
875 - position: absolute;  
876 - left: 10px;  
877 - }  
878 -  
879 - ::v-deep .diaslog_zhong {  
880 - .el-dialog__body {  
881 - padding: 10px 20px 20px 20px;  
882 - }  
883 -  
884 - .el-upload--picture-card {  
885 - width: 130px;  
886 - height: 130px;  
887 - }  
888 - }  
889 -</style> 793 + ::v-deep .bian_css {
  794 + .el-dialog__header {
  795 + padding: 0px;
  796 + }
  797 +
  798 + }
  799 +
  800 + ::v-deep .buttonHover:hover {
  801 + color: #3f9b6a !important;
  802 + border-color: #c5e1d2 !important;
  803 + background-color: #ecf5f0 !important;
  804 + outline: none;
  805 + }
  806 +
  807 + ::v-deep .el-pagination__total {
  808 + position: absolute;
  809 + left: 10px;
  810 + }
  811 +
  812 + ::v-deep .diaslog_zhong {
  813 + .el-dialog__body {
  814 + padding: 10px 20px 20px 20px;
  815 + }
  816 +
  817 + .el-upload--picture-card {
  818 + width: 130px;
  819 + height: 130px;
  820 + }
  821 + }
  822 +</style>
890 \ No newline at end of file 823 \ No newline at end of file
lvdao-miniapp/pages/home/home.vue
  View file @d5f60c7
@@ -675,7 +675,7 @@ @@ -675,7 +675,7 @@
675 675
676 }, 676 },
677 tabsChange(itme) { 677 tabsChange(itme) {
678 - console.log(itme) 678 +
679 this.onCouponTab(itme) 679 this.onCouponTab(itme)
680 }, 680 },
681 gopath(e) { 681 gopath(e) {
@@ -685,9 +685,16 @@ @@ -685,9 +685,16 @@
685 685
686 }, 686 },
687 wuye() { 687 wuye() {
688 - uni.navigateTo({  
689 - url: `/pages/propertyPay/propertyPayList/propertyPayList`  
690 - }) 688 + if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
  689 + uni.navigateTo({
  690 + url: `/pages/propertyPay/propertyPayList/propertyPayList`
  691 + })
  692 + }else{
  693 + uni.navigateTo({
  694 + url: `/pages/login/login`
  695 + })
  696 + }
  697 +
691 698
692 }, 699 },
693 piaowu() { 700 piaowu() {
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
  View file @d5f60c7
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </view> 41 </view>
42 <view class="info-items"> 42 <view class="info-items">
43 <view class="info-title">{{item.itemName}}：<text class="price"><u-icon name="rmb" 43 <view class="info-title">{{item.itemName}}：<text class="price"><u-icon name="rmb"
44 - style="font-size: 24rpx;" />{{ item.itemDetailsVOList | jsitem}}</text> 44 + style="font-size: 24rpx;" />{{ item.detailsVOList | jsitem}}</text>
45 </view> 45 </view>
46 <view class="info-item"> 46 <view class="info-item">
47 <text style="margin-right: 20rpx;">单价：￥{{item.itemStandard}}</text> 47 <text style="margin-right: 20rpx;">单价：￥{{item.itemStandard}}</text>
@@ -53,15 +53,15 @@ @@ -53,15 +53,15 @@
53 <view><u-icon @click="changeisxl(index)" :name="item.isxl?'arrow-up':'arrow-down'"></u-icon> 53 <view><u-icon @click="changeisxl(index)" :name="item.isxl?'arrow-up':'arrow-down'"></u-icon>
54 </view> 54 </view>
55 </view> 55 </view>
56 - <view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0 && item.isxl">  
57 - <view class="list" v-for="(item1,index1) in item.itemDetailsVOList" > 56 + <view v-if="item.detailsVOList&& item.detailsVOList.length>0 && item.isxl">
  57 + <view class="list" v-for="(item1,index1) in item.detailsVOList" >
58 <view style="display: flex;align-items: center;"> 58 <view style="display: flex;align-items: center;">
59 <u-checkbox v-model="item1.isshowxz" shape="circle" :label-disabled="false" /> 59 <u-checkbox v-model="item1.isshowxz" shape="circle" :label-disabled="false" />
60 <view class="" @click="changeitemisshowxz(index,index1)"> 60 <view class="" @click="changeitemisshowxz(index,index1)">
61 <view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view> 61 <view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view>
62 <view class="info-item" style="margin-top: 6rpx;"> 62 <view class="info-item" style="margin-top: 6rpx;">
63 <text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text> 63 <text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text>
64 - <text>门店号：{{item1.storeCode}}</text> 64 + <text v-if="item1.houseNumber!=''">门牌号：{{item1.houseNumber}}</text>
65 </view> 65 </view>
66 </view> 66 </view>
67 </view> 67 </view>
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 allnum() { 183 allnum() {
184 let num = 0 184 let num = 0
185 for (let i = 0; i < this.recordList.length; i++) { 185 for (let i = 0; i < this.recordList.length; i++) {
186 - let list = this.recordList[i].itemDetailsVOList 186 + let list = this.recordList[i].detailsVOList
187 for (let n = 0; n < list.length; n++) { 187 for (let n = 0; n < list.length; n++) {
188 num = num + Number(list[n].payPrice) 188 num = num + Number(list[n].payPrice)
189 } 189 }
@@ -193,7 +193,7 @@ @@ -193,7 +193,7 @@
193 allcknum() { 193 allcknum() {
194 let num = 0 194 let num = 0
195 for (let i = 0; i < this.recordList.length; i++) { 195 for (let i = 0; i < this.recordList.length; i++) {
196 - let list = this.recordList[i].itemDetailsVOList 196 + let list = this.recordList[i].detailsVOList
197 for (let n = 0; n < list.length; n++) { 197 for (let n = 0; n < list.length; n++) {
198 if (list[n].isshowxz) { 198 if (list[n].isshowxz) {
199 num = num + Number(list[n].payPrice) 199 num = num + Number(list[n].payPrice)
@@ -208,7 +208,7 @@ @@ -208,7 +208,7 @@
208 deep: true, 208 deep: true,
209 handler(newVal) { 209 handler(newVal) {
210 for (let i = 0; i < this.recordList.length; i++) { 210 for (let i = 0; i < this.recordList.length; i++) {
211 - this.recordList[i].isshowxz = this.recordList[i].itemDetailsVOList.every(item => item.isshowxz) 211 + this.recordList[i].isshowxz = this.recordList[i].detailsVOList.every(item => item.isshowxz)
212 } 212 }
213 const allTrue = this.recordList.every(item => item.isshowxz) 213 const allTrue = this.recordList.every(item => item.isshowxz)
214 this.showAll = allTrue 214 this.showAll = allTrue
@@ -249,8 +249,8 @@ @@ -249,8 +249,8 @@
249 methods: { 249 methods: {
250 changeitemisshowxz(index,index1) { 250 changeitemisshowxz(index,index1) {
251 console.error(index,index1) 251 console.error(index,index1)
252 - console.error(this.recordList[index].itemDetailsVOList[index1].isshowxz)  
253 - this.recordList[index].itemDetailsVOList[index1].isshowxz = !this.recordList[index].itemDetailsVOList[index1].isshowxz 252 + console.error(this.recordList[index].detailsVOList[index1].isshowxz)
  253 + this.recordList[index].detailsVOList[index1].isshowxz = !this.recordList[index].detailsVOList[index1].isshowxz
254 this.$forceUpdate() 254 this.$forceUpdate()
255 }, 255 },
256 changeisxl(e) { 256 changeisxl(e) {
@@ -258,14 +258,14 @@ @@ -258,14 +258,14 @@
258 }, 258 },
259 quanxuanitem(e, index) { 259 quanxuanitem(e, index) {
260 console.error(e) 260 console.error(e)
261 - console.error(this.recordList[index].itemDetailsVOList) 261 + console.error(this.recordList[index].detailsVOList)
262 if (e.value) { 262 if (e.value) {
263 - for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) {  
264 - this.recordList[index].itemDetailsVOList[i].isshowxz = true 263 + for (let i = 0; i < this.recordList[index].detailsVOList.length; i++) {
  264 + this.recordList[index].detailsVOList[i].isshowxz = true
265 } 265 }
266 } else { 266 } else {
267 - for (let i = 0; i < this.recordList[index].itemDetailsVOList.length; i++) {  
268 - this.recordList[index].itemDetailsVOList[i].isshowxz = false 267 + for (let i = 0; i < this.recordList[index].detailsVOList.length; i++) {
  268 + this.recordList[index].detailsVOList[i].isshowxz = false
269 } 269 }
270 } 270 }
271 }, 271 },
@@ -277,7 +277,7 @@ @@ -277,7 +277,7 @@
277 this.recordList = this.recordList.map(item => { 277 this.recordList = this.recordList.map(item => {
278 item.isxl = true 278 item.isxl = true
279 item.isshowxz = true 279 item.isshowxz = true
280 - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { 280 + item.detailsVOList = item.detailsVOList.map(item1 => {
281 item1.isshowxz = true 281 item1.isshowxz = true
282 return item1 282 return item1
283 }) 283 })
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 this.recordList = this.recordList.map(item => { 287 this.recordList = this.recordList.map(item => {
288 item.isxl = true 288 item.isxl = true
289 item.isshowxz = false 289 item.isshowxz = false
290 - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { 290 + item.detailsVOList = item.detailsVOList.map(item1 => {
291 item1.isshowxz = false 291 item1.isshowxz = false
292 return item1 292 return item1
293 }) 293 })
@@ -322,10 +322,10 @@ @@ -322,10 +322,10 @@
322 c1.push(this.recordList[i]) 322 c1.push(this.recordList[i])
323 } else { 323 } else {
324 let newitem = JSON.parse(JSON.stringify(this.recordList[i])) 324 let newitem = JSON.parse(JSON.stringify(this.recordList[i]))
325 - newitem.itemDetailsVOList = newitem.itemDetailsVOList.filter(function(item1) { 325 + newitem.detailsVOList = newitem.detailsVOList.filter(function(item1) {
326 return item1.isshowxz 326 return item1.isshowxz
327 }) 327 })
328 - if (newitem.itemDetailsVOList.length > 0) { 328 + if (newitem.detailsVOList.length > 0) {
329 c1.push(newitem) 329 c1.push(newitem)
330 } 330 }
331 } 331 }
@@ -334,10 +334,10 @@ @@ -334,10 +334,10 @@
334 let storeNumber = [] 334 let storeNumber = []
335 let orderNumber = [] 335 let orderNumber = []
336 for (let i = 0; i < c1.length; i++) { 336 for (let i = 0; i < c1.length; i++) {
337 - for (let n = 0; n < c1[i].itemDetailsVOList.length; n++) {  
338 - // console.error(c1[i].itemDetailsVOList[n])  
339 - storeNumber.push(c1[i].itemDetailsVOList[n].storeCode)  
340 - orderNumber.push(c1[i].itemDetailsVOList[n].orderNo) 337 + for (let n = 0; n < c1[i].detailsVOList.length; n++) {
  338 + // console.error(c1[i].detailsVOList[n])
  339 + storeNumber.push(c1[i].detailsVOList[n].storeCode)
  340 + orderNumber.push(c1[i].detailsVOList[n].orderNo)
341 } 341 }
342 } 342 }
343 let info = { 343 let info = {
@@ -434,10 +434,10 @@ @@ -434,10 +434,10 @@
434 pageSize: 10 434 pageSize: 10
435 }, 1).then(res => { 435 }, 1).then(res => {
436 console.error(res) 436 console.error(res)
437 - this.recordList = res.data.data.itemDetailsVOList.map(item => { 437 + this.recordList = res.data.data.detailsVOList.map(item => {
438 item.isxl = true 438 item.isxl = true
439 item.isshowxz = false 439 item.isshowxz = false
440 - item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { 440 + item.detailsVOList = item.detailsVOList.map(item1 => {
441 item1.isshowxz = false 441 item1.isshowxz = false
442 return item1 442 return item1
443 }) 443 })
lvdao-miniapp/pages/workbench/workbench.vue
  View file @d5f60c7
@@ -303,8 +303,8 @@ pageList6: [{ @@ -303,8 +303,8 @@ pageList6: [{
303 }, 303 },
304 methods: { 304 methods: {
305 async toPath1(path) { 305 async toPath1(path) {
306 - // let c1 = uni.getStorageSync('user').phone  
307 - let c1 = '18188305496' 306 + let c1 = uni.getStorageSync('user').phone
  307 + // let c1 = '18188305496'
308 await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => { 308 await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => {
309 if(res.data.data.list.length>0) { 309 if(res.data.data.list.length>0) {
310 uni.setStorageSync('shopId', res.data.data.list[0].shopId); 310 uni.setStorageSync('shopId', res.data.data.list[0].shopId);
lvdao-miniapp/pagesA/application/application.vue
  View file @d5f60c7
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 createUser: '', 91 createUser: '',
92 promotionContent: '', 92 promotionContent: '',
93 coverImage: '', 93 coverImage: '',
94 - state:'1' 94 + state:'2'
95 }, 95 },
96 Fenshow:true, 96 Fenshow:true,
97 editorIns: null 97 editorIns: null
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
  View file @d5f60c7
@@ -153,7 +153,8 @@ @@ -153,7 +153,8 @@
153 contactNumber: '', 153 contactNumber: '',
154 locationDescription: '', 154 locationDescription: '',
155 shopPhotos: [], 155 shopPhotos: [],
156 - contractId: '' 156 + contractId: '',
  157 + storePrimaryKey:'',
157 }, 158 },
158 edit: false, 159 edit: false,
159 typeShow:false, 160 typeShow:false,
@@ -168,7 +169,10 @@ @@ -168,7 +169,10 @@
168 } 169 }
169 }, 170 },
170 onLoad(options) { 171 onLoad(options) {
171 - 172 + if(options.phone){
  173 + this.ruleForm.contactNumber = options.phone
  174 + this.pageindex.contactNumber = options.phone
  175 + }
172 if (options.msg != '' && options.msg) { 176 if (options.msg != '' && options.msg) {
173 this.ruleForm = JSON.parse(options.msg) 177 this.ruleForm = JSON.parse(options.msg)
174 // this.ruleForm.shopPhotos = shopPhotos 178 // this.ruleForm.shopPhotos = shopPhotos
@@ -187,10 +191,7 @@ @@ -187,10 +191,7 @@
187 if (options.ids) { 191 if (options.ids) {
188 this.ruleForm.contractId = options.ids 192 this.ruleForm.contractId = options.ids
189 } 193 }
190 - if(options.phone){  
191 - this.ruleForm.contactNumber = options.phone  
192 - this.pageindex.contactNumber = options.phone  
193 - } 194 +
194 this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1) 195 this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1)
195 .then(res => { 196 .then(res => {
196 if (res.data.data.content.length != 0) { 197 if (res.data.data.content.length != 0) {
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @d5f60c7
@@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
224 onLoad(options) { 224 onLoad(options) {
225 this.imgurl = this.$img 225 this.imgurl = this.$img
226 const item = JSON.parse(decodeURIComponent(options.item)); 226 const item = JSON.parse(decodeURIComponent(options.item));
227 - console.log(item, '1123123213') 227 + console.log(options.item, '1123123213')
228 this.record = item 228 this.record = item
229 let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item 229 let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
230 .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item 230 .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
@@ -263,7 +263,6 @@ @@ -263,7 +263,6 @@
263 this.btnShow = false 263 this.btnShow = false
264 this.myshopMsg = res.data.data.content[0] 264 this.myshopMsg = res.data.data.content[0]
265 this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',') 265 this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
266 - console.log(this.myshopMsg.shopPhotos)  
267 this.myshopMsg.shopPhotos.map(item => { 266 this.myshopMsg.shopPhotos.map(item => {
268 item = this.imgurl + item 267 item = this.imgurl + item
269 }) 268 })
@@ -308,6 +307,7 @@ @@ -308,6 +307,7 @@
308 }) 307 })
309 }, 308 },
310 xiuMsg(val) { 309 xiuMsg(val) {
  310 + console.log(this.record.applicant)
311 if (val == 1) { 311 if (val == 1) {
312 uni.navigateTo({ 312 uni.navigateTo({
313 url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&phone=${this.record.applicant}` 313 url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&phone=${this.record.applicant}`
lvdao-miniapp/pagesA/projectManagement/projectManagement.vue
  View file @d5f60c7
@@ -67,17 +67,13 @@ @@ -67,17 +67,13 @@
67 title:'全部' 67 title:'全部'
68 }, 68 },
69 { 69 {
70 - state:'1',  
71 - title:'待提交'  
72 - },  
73 - {  
74 state:'2', 70 state:'2',
75 title:'待审核' 71 title:'待审核'
76 }], 72 }],
77 listIn:0, 73 listIn:0,
78 tableData:[], 74 tableData:[],
79 pageindex: { 75 pageindex: {
80 - pageNumber: 1, 76 + pageNumber: 0,
81 pageSize: 10, 77 pageSize: 10,
82 createUser:'', 78 createUser:'',
83 schemeTitle:'' 79 schemeTitle:''
@@ -100,7 +96,7 @@ @@ -100,7 +96,7 @@
100 this.listIn = index 96 this.listIn = index
101 if(val=='0'){ 97 if(val=='0'){
102 this.pageindex={ 98 this.pageindex={
103 - pageNumber: 1, 99 + pageNumber: 0,
104 pageSize: 10, 100 pageSize: 10,
105 createUser:'' 101 createUser:''
106 } 102 }
merchant-web-master/src/utils/request.js
  View file @d5f60c7
@@ -19,8 +19,8 @@ let PREFIX; @@ -19,8 +19,8 @@ let PREFIX;
19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){ 19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
20 // 其他情况的默认值 20 // 其他情况的默认值
21 // PREFIX = 'http://8.130.38.56:8027/business-server'; 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 - PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';  
23 - // PREFIX = 'http://128.10.249.48:9004'; 22 + // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
  23 + PREFIX = 'http://128.10.249.23:9004';
24 }else{ 24 }else{
25 // PREFIX = '/merchant-business'; 25 // PREFIX = '/merchant-business';
26 // PREFIX = 'http://8.130.38.56:9004'; 26 // PREFIX = 'http://8.130.38.56:9004';
merchant-web-master/src/views/comprehensive/dAddress/index.vue
  View file @d5f60c7
@@ -143,6 +143,17 @@ async search(){ @@ -143,6 +143,17 @@ async search(){
143 name: item.address, 143 name: item.address,
144 value: item.refundAmount 144 value: item.refundAmount
145 })) 145 }))
  146 + processedData = [
  147 + {
  148 + name:'重庆市',
  149 + value:1000
  150 + },
  151 + {
  152 + name:'成都市',
  153 + value:3000
  154 + },
  155 + ]
  156 + // console.log()
146 // 指定图表的配置项和数据 157 // 指定图表的配置项和数据
147 const option = { 158 const option = {
148 159
merchant-web-master/src/views/dashboard/index.vue
  View file @d5f60c7
@@ -208,8 +208,23 @@ export default { @@ -208,8 +208,23 @@ export default {
208 208
209 myEchart.setOption(option) 209 myEchart.setOption(option)
210 }, 210 },
  211 + filterData(arr) {
  212 + const targetNames = ["加购", "支付成功"];
  213 + const result = {
  214 + names: [],
  215 + rates: []
  216 + };
  217 + for (let i = 0; i < arr.names.length; i++) {
  218 + if (targetNames.includes(arr.names[i])) {
  219 + result.names.push(arr.names[i]);
  220 + result.rates.push(arr.rates[i]);
  221 + }
  222 + }
  223 + return result;
  224 + },
  225 +
211 draws(arr) { 226 draws(arr) {
212 - console.log(arr,'arr.ratesarr.ratesarr.rates') 227 + const filteredData = this.filterData(arr);
213 const myEchart = echarts.init(this.$refs.myEcharts, 'light') 228 const myEchart = echarts.init(this.$refs.myEcharts, 'light')
214 const option = { 229 const option = {
215 color: "#3F9B6A", 230 color: "#3F9B6A",
@@ -230,7 +245,7 @@ export default { @@ -230,7 +245,7 @@ export default {
230 }, 245 },
231 xAxis: { 246 xAxis: {
232 type: 'category', 247 type: 'category',
233 - data: arr.names 248 + data: filteredData.names
234 }, 249 },
235 yAxis: { 250 yAxis: {
236 type: 'value', 251 type: 'value',
@@ -238,7 +253,7 @@ export default { @@ -238,7 +253,7 @@ export default {
238 }, 253 },
239 series: [ 254 series: [
240 { 255 {
241 - data: arr.rates, 256 + data: filteredData.rates,
242 type: 'line' 257 type: 'line'
243 } 258 }
244 ] 259 ]