修改

src/views/mxgl/mxclydy/fzjcgxlfx.vue

@@ -91,6 +91,11 @@
     },
     data() {
       return {
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+        },
         selectedId:[],
         loading: false,
         value1: [],
@@ -98,7 +103,7 @@
         dwss: "",
         page: 1,
         limit: 5,
-        pflx: 1,
+        pflx: 2,
         tableDataLength: 0,
         tableData1: [
           {
@@ -261,6 +266,7 @@
         },
         fileArr: [],
         zdXxzjbh: "",
+        gllx: "",
       };
     },
     created() {
@@ -269,7 +275,6 @@
     methods: {
       getDate(){
         this.DBFX(1,this.DBFXSHOWTITLE )
-        console.log(this.value1);
       },
       selectionChange(row){
         this.selectedId = [];
@@ -283,7 +288,7 @@
         let fxFlag='';
         if(t==='阶段性对比分析'){fxFlag=1} else {fxFlag=2};
         let kssj,jssj,xxzjbhList;
-        if(this.value1.length){kssj=this.value1[0];jssj=this.value1[1];}
+        if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
         if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
         queryJdswjpj({
           pflx:this.cxFormData.pflx,
@@ -336,6 +341,7 @@
       toXq(scope) {
         this.dialogFormVisible = true;
         this.dwss = scope.row.sfmc;
+        this.gllx = scope.row.gllx;
         this.getZbzzList();
       },
       getZbzzList() {
@@ -345,6 +351,7 @@
           page: this.page,
           limit: this.limit,
           pflx: this.pflx,
+          gllx: this.gllx,
         }).then((res) => {
           this.tableData = res.data.rows;
           this.loading = false;

src/views/mxgl/mxclydy/ywgxlfx.vue

@@ -7,8 +7,14 @@
                 :cxQueryField="cxQueryField"
                 :cxDefaultFormThead="cxDefaultFormThead"
                 :cxUrl="cxUrl"
+                :tableOperation="true"
+                @selectionChange="selectionChange"
                 ref="rightContent"
         >
+            <template #listOperation="scope">
+                <el-button size="small" @click="DBFX(scope.scope,'阶段性对比分析')">阶段性对比分析</el-button>
+                <el-button size="small" @click="DBFX(scope.scope,'单位对比分析')">单位对比分析</el-button>
+            </template>
             <template #btnGroup="scope">
                 <span class="hbyp" @click="toXq(scope.scope)">查看详情</span>
                 <!-- <span class="hbyp" @click="toWjpj(scope.scope)">微决评价</span> -->
@@ -57,12 +63,28 @@
                 </div>
             </div>
         </el-dialog>
+        <el-dialog :title="DBFXSHOWTITLE" :visible.sync="DBFXSHOW" width="60%">
+            <div class="block_fzjcgxlfx" style="width: 400px;margin: 20px;display: flex;justify-content: space-between">
+                <el-date-picker
+                        v-model="value1"
+                        :picker-options="pickerOptions"
+                        type="daterange"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期">
+                </el-date-picker>
+                <el-button size="mini" style="margin-left: 20px;" @click="getDate">查询</el-button>
+            </div>
+            <div v-if="DBFXSHOW" id="charts" ref="charts" ></div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
   import rightContent from "@c/ptCxForm_components.vue";
-  import { pageTbYwWjpjckxq } from "@/api/fzjc.js";
+  import { pageTbYwWjpjckxq,queryJdswjpj } from "@/api/fzjc.js";
   export default {
     name: "queryHbyp",
     components: {
@@ -70,7 +92,14 @@
     },
     data() {
       return {
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+        },
+        selectedId:[],
         loading: false,
+        value1: [],
         tableData: [],
         dwss: "",
         page: 1,
@@ -139,6 +168,8 @@
         pjForm: {},
         value: 0,
         dialogFormVisible: false,
+        DBFXSHOW: false,
+        DBFXSHOWTITLE: '',
         colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
         dialogFormVisiblePj: false,
         formLabelWidth: "130px",
@@ -161,11 +192,11 @@
           },
         ],
         header: "微决评价完善中心",
-        pageBs: "queryWjpj",
+        pageBs: "fzjcgxlfx",
         cxFormData: {
           limit: 10,
           page: 1,
-          mxmc: "",
+          sfmc: "",
           dw: "",
           pflx:'1'
         },
@@ -177,7 +208,7 @@
             value: "",
             placeholder: "请输入",
             col: "3",
-          }
+          },
         ],
         cxDefaultFormThead: [
           {
@@ -236,12 +267,70 @@
         },
         fileArr: [],
         zdXxzjbh: "",
+        gllx: "",
       };
     },
     created() {
       this.$store.commit("user/SET_Menu", this.Menu);
     },
     methods: {
+      getDate(){
+        this.DBFX(1,this.DBFXSHOWTITLE )
+        console.log(this.value1);
+      },
+      selectionChange(row){
+        this.selectedId = [];
+        row.forEach((item) => {
+          this.selectedId.push(item.xxzjbh);
+        });
+      },
+      DBFX(i,t){
+        this.DBFXSHOWTITLE =t;
+        this.DBFXSHOW = true;
+        let fxFlag='';
+        if(t==='阶段性对比分析'){fxFlag=1} else {fxFlag=2};
+        let kssj,jssj,xxzjbhList;
+        if(this.value1){kssj=this.value1[0];jssj=this.value1[1];}
+        if(this.selectedId.length){xxzjbhList = this.selectedId.toString()}
+        queryJdswjpj({
+          pflx:this.cxFormData.pflx,
+          fxFlag:fxFlag,kssj,jssj,xxzjbhList})
+          .then(res=>{
+            if( res.code===200){
+              let rows  = res.data.rows;
+              let jdPjf = [];
+              let mxmc = [];
+              rows.find((v)=>{
+                jdPjf.push(v['jdPjf']);
+                mxmc.push(v['mxmc'])
+              })
+              let myChart = this.$echarts.init(this.$refs.charts);
+              let option = {
+                xAxis: {
+                  type: 'category',
+                  data: mxmc
+                },
+                yAxis: {
+                  type: 'value'
+                },
+                series: [
+                  {
+                    data: jdPjf,
+                    type: 'bar',
+                    showBackground: true,
+                    backgroundStyle: {
+                      color: 'rgba(180, 180, 180, 0.2)'
+                    }
+                  }
+                ]
+              };
+              myChart.setOption(option)
+
+            }
+
+          })
+
+      },
       handleSizeChange(val) {
         this.limit = val;
         this.getZbzzList();
@@ -253,16 +342,18 @@
       // 详情
       toXq(scope) {
         this.dialogFormVisible = true;
-        this.dwss = scope.row.mxmc;
+        this.dwss = scope.row.sfmc;
+        this.gllx = scope.row.gllx;
         this.getZbzzList();
       },
       getZbzzList() {
         this.loading = true;
         pageTbYwWjpjckxq({
-          mxmc: this.dwss,
+          sfmc: this.dwss,
           page: this.page,
           limit: this.limit,
           pflx: this.pflx,
+          gllx: this.gllx,
         }).then((res) => {
           this.tableData = res.data.rows;
           this.loading = false;
@@ -337,6 +428,11 @@
     .Content .el-date-editor--daterange.el-input__inner {
         width: 100% !important;
     }
+    .rightContent .el-input__icon, #formCommonPage .el-input__icon, .el-input__suffix-inner{
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+    }
 </style>
 <style scoped lang="scss">
     .el-form-item {
@@ -375,4 +471,9 @@
     /deep/.el-select.el-select--mini {
         width: 100px;
     }
+    #charts {
+        background-color: #fff;
+        width: 100%;
+        height: 400px;
+    }
 </style>