修改 前端

ruoyi-admin/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: druid
   # 文件上传
   servlet:
      multipart:

ruoyi-ui/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"

ruoyi-ui/src/App.vue

@@ -1,12 +1,27 @@
 <template>
   <div id="app">
-    <router-view />
+    <!-- <div @click="shouwe"  v-if="flags"   style="background-color: #eee; width: 100vw; height: 100vh; position: fixed; z-index: 1002;">
+
+    </div> -->
+    <router-view  />
   </div>
 </template>
 
 <script>
 export default  {
-  name:  'App'
+  name:  'App',
+    data() {
+      return {
+        flags: true,
+      }
+    },
+    mounted() {
+    },
+    methods: {
+     shouwe(){
+       this.flags = false
+     }
+    }
 }
 </script>
 <style>
@@ -17,5 +32,5 @@ export default  {
     color: #343434;
     display: inline-block;
   }
-  
+
 </style>

ruoyi-ui/src/api/index.js

@@ -45,3 +45,11 @@ export function getUnitList() {
     method: 'post'
   })
 }
+
+// 首页-线索数目
+export function getUnitListNuber() {
+  return request({
+    url: '/bmProject/project/indexInfo',
+    method: 'post'
+  })
+}

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -18,7 +18,7 @@
     top: 0;
     bottom: 0;
     left: 0;
-    z-index: 1001;
+    z-index: 999;
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
     box-shadow: 2px 0 6px rgba(0,21,41,.35);

ruoyi-ui/src/components/Echarts/index.vue

@@ -1,102 +1,115 @@
 <template>
-  <div class="Echarts">
-    <div id="main" style="width:100%; height:600px;"></div>
-  </div>
+  <div class="Echarts"><div id="main" style="width:100%; height:600px;"></div></div>
 </template>
 
 <script>
-  require('echarts/lib/component/legend')
-  export default {
-    name: 'Echarts',
-    props:{
-      echartData: {
-        type: Object,
-        default: function() {
-          return {}
-        }
-      },
-      ehaersList: {
-        type: Object,
-        default: function() {
-          return {}
-        }
+import echarts from 'echarts';
+require('echarts/lib/component/legend');
+export default {
+  name: 'Echarts',
+  props: {
+    echartData: {
+      type: Object,
+      default: function() {
+        return {};
       }
     },
-    watch: {
-        ehaersLists() {
-          this.myEcharts()
-        }
-    },
-    computed: {
-      ehaersLists() {
-        return this.ehaersList
+    ehaersList: {
+      type: Object,
+      default: function() {
+        return {};
       }
-    },
-    methods: {
-      myEcharts(datas={x:'',y:''}) {
-        // 基于准备好的dom，初始化echarts实例
-        var myChart = this.$echarts.init(document.getElementById('main'));
+    }
+  },
+  watch: {
+    ehaersLists() {
+      this.myEcharts();
+    }
+  },
+  computed: {
+    ehaersLists() {
+      return this.ehaersList;
+    }
+  },
+  methods: {
+    myEcharts(datas = { x: '', y: '' }) {
+      // 基于准备好的dom，初始化echarts实例
+      var myChart = this.$echarts.init(document.getElementById('main'));
 
-        // 指定图表的配置项和数据
-        var option = {
-          title: {
-            text: this.echartData.name,
-            top: 0,
-            left: 'center',
-            subtextStyle: {
-              fontFamily: "微软雅黑",
-              fontSize: 14,
-              color: '#6c7a89',
-            }
-          },
-          tooltip: {},
-          legend: {
-            data: this.echartData.numNameArr,
-            top: 25,
-          },
-          xAxis: {
-            data: this.ehaersLists.x,
-            axisLabel : {
-              formatter: function(){
-                return "";
-              }
+      // 指定图表的配置项和数据
+      var option = {
+        title: {
+          text: this.echartData.name,
+          top: 0,
+          left: 'center',
+          subtextStyle: {
+            fontFamily: '微软雅黑',
+            fontSize: 14,
+            color: '#6c7a89'
+          }
+        },
+        tooltip: {},
+        legend: {
+          data: this.echartData.numNameArr,
+          top: 25
+        },
+        xAxis: {
+          data: this.ehaersLists.x,
+          axisLabel: {
+            formatter: function() {
+              return '';
             }
-          },
-          yAxis: {},
-          series: [{
+          }
+        },
+        yAxis: {},
+        series: [
+          {
             name: this.echartData.numName,
             type: 'bar',
             data: this.ehaersLists.y,
             itemStyle: {
               normal: {
-                color: '#1C84C6', //设置柱子颜色
+                // color: '#1C84C6', //设置柱子颜色
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: '#86C1E6'
+                  },
+                  {
+                    offset: 0.9,
+                    color: '#1C84C6'
+                  },
+                  {
+                    offset: 1,
+                    color: '#1C84C6'
+                  }
+                ]),
                 label: {
                   show: true, //柱子上显示值
                   position: 'top', //值在柱子上方显示
                   textStyle: {
-                    color: '#333' //值得颜色
+                    color: '#1C84C6' //值得颜色
                   }
                 }
               }
-            },
-          }]
-        };
+            }
+          }
+        ]
+      };
 
-        // 使用刚指定的配置项和数据显示图表。
-        myChart.setOption(option);
-        setTimeout(function (){
-        	    window.onresize = function () {
-        	    	myChart.resize();
-        	    }
-        	},200)
-      }
-    },
-    mounted() {
-      this.myEcharts();
+      // 使用刚指定的配置项和数据显示图表。
+      myChart.setOption(option);
+      setTimeout(function() {
+        window.onresize = function() {
+          myChart.resize();
+        };
+      }, 200);
     }
+  },
+  mounted() {
+    this.myEcharts();
   }
+};
 </script>
 
-<style>
-
-</style>
+<style></style>

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -324,7 +324,7 @@
       <el-row>
         <el-col :span="6">
           <el-form-item label-width="141px" label="统一社会信用代码:" class="elItem" prop="code">
-            <el-input :disabled="dis_flag" placeholder="请输入注册资本金" v-model="form.code"></el-input>
+            <el-input :disabled="dis_flag" placeholder="请输入社会信用代码" v-model="form.code"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '招商引资管理系统',
-  // urls: 'http://47.99.82.249:80',
-  urls: 'http://192.168.101.11:8010',
+  urls: 'http://47.99.82.249:80',
+  // urls: 'http://192.168.101.11:8010',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -35,6 +35,6 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  apiUrl: 'http://192.168.101.11:8010'
-  // apiUrl: 'http://47.99.82.249:80'
+  // apiUrl: 'http://192.168.101.11:8010'
+  apiUrl: 'http://47.99.82.249:80'
 }

ruoyi-ui/src/under/index.vue

@@ -675,7 +675,7 @@ export default {
     tabIndex: Number,
   },
   data() {
-    return {
+    return {
       process: process.env.VUE_APP_BASE_API,
       defaultSettings,
       disfal:false,
@@ -1307,14 +1307,18 @@ export default {
     submitCtion() {
       this.queryFormhye.code = 1;
       this.queryFormhye.bmProjectId = this.bmProjectId;
-      addConfigbout(this.queryFormhye).then((response) => {
-        console.log(response);
-        this.msgSuccess("提交成功");
-        this.$router.go(-1);
-        // 就可以回到上一页。
-        // this.open = false;
-        // this.getListtwo();
-      });
+	  console.log(this.queryFormhye)
+	  // if(){
+		  
+	  // }
+      // addConfigbout(this.queryFormhye).then((response) => {
+      //   console.log(response);
+      //   this.msgSuccess("提交成功");
+      //   this.$router.go(-1);
+      //   // 就可以回到上一页。
+      //   // this.open = false;
+      //   // this.getListtwo();
+      // });
       console.log(this.queryParams);
     },
     /** 删除按钮操作 */

ruoyi-ui/src/views/index.vue

@@ -1,99 +1,143 @@
 <template>
-  <div class="in_box">
-    <el-row>
-      <el-col :span="18">
-        <div class="in_left">
-          <div class="toReviewed">
-            <div class="rev_title">
-              待审核项目
-            </div>
-            <el-table v-loading="loading" :data="infoList">
-              <el-table-column label="项目名称" align="center" prop="name" />
-              <el-table-column label="当前状态" align="center" prop="dictLabel" />
-              <el-table-column label="时间" align="center" prop="createTime" />
-              <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:query']" @click="dec_btn(scope.row)">查看和编辑</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:pass']"
-                    @click="infoBtn(scope.row)">确认审核</el-button>
-                  <el-button size="mini" type="text" style="background: #1C84C6;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:reject']" @click="bh_brn(scope.row)">驳回</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div class="exl_box">
-            <div class="exl_title">
-              <span>招资引资项目到资金额</span>
-              <el-date-picker
-                    v-model="lb_value"
-                    style="width: 100px;"
-                    type="year"
-                    value-format="yyyy"
-                    @change="picher_fn"
-                    placeholder="选择年">
-                  </el-date-picker>
+
+  <div class="in_box" style="background-color: #eef0ff;">
+
+    <div >
+      <el-row :gutter="10" style="padding: 0 20px; height: 100px;">
+        <el-col :xs="12" :sm="12"  :lg="6" :xl="1"><div class="headerone heser" style="background-color: #fff; position: relative;">
+        <img src="../assets/images/icon_hp_ztxs.png" style="width: 68px; height: 68px;" alt="">
+        <p>
+          <span>{{nhgewo.zt}} <i style="font-style:normal;">项</i> </span>
+          <span>在谈线索数</span>
+        </p>
+        <p>
+          <span>在谈线索</span>
+
+        </p>
+         <img src="../assets/images/icon_ztsj_blue.png" style="width: 12px; height: 19px;position: absolute; right: 0; top:15px" alt="" >
+         <img src="../assets/images/pic_hthp_ztbg.png" style="width: 100%; position: absolute; right: 0; bottom: 0;" alt="" >
+        </div></el-col>
+        <el-col :xs="12" :sm="12"  :lg="6" :xl="11"><div class="headertwo heser" style="background-color: #fff; position: relative;">
+        <img src="../assets/images/icon_hp_qyxm.png" style="width: 68px; height: 68px;" alt="">
+        <p>
+          <span>{{nhgewo.qy}} <i style="font-style:normal;">项</i> </span>
+          <span>签约项目数</span>
+        </p>
+        <p>
+          <span>签约项目</span>
+
+        </p>
+         <img src="../assets/images/icon_ztsj_pink.png" style="width: 12px; height: 19px;position: absolute; right: 0; top:15px" alt="" >
+         <img src="../assets/images/pic_hthp_qybg.png" style="width: 100%; position: absolute; right: 0; bottom: 0;" alt="" >
+        </div></el-col>
+        <el-col :xs="12" :sm="12"  :lg="6" :xl="11"><div class="headerther heser" style="background-color: #fff; position: relative;">
+        <img src="../assets/images/icon_hp_zjxm.png" style="width: 68px; height: 68px;" alt="">
+        <p>
+          <span>{{nhgewo.zj}} <i style="font-style:normal;">项</i> </span>
+          <span>在建项目数</span>
+        </p>
+        <p>
+          <span>在建项目</span>
+
+        </p>
+         <img src="../assets/images/icon_ztsj_green.png" style="width: 12px; height: 19px;position: absolute; right: 0; top:15px" alt="" >
+         <img src="../assets/images/pic_hthp_zjbg.png" style="width: 100%; position: absolute; right: 0; bottom: 0;" alt="" >
+        </div></el-col>
+        <el-col :xs="12" :sm="12"  :lg="6" :xl="1"><div class="headerfour heser" style="background-color: #fff; position: relative;">
+        <img src="../assets/images/icon_hp_tcxm.png" style="width: 68px; height: 68px;" alt="">
+        <p>
+          <span>{{nhgewo.tc}} <i style="font-style:normal;">项</i> </span>
+          <span>投产项目数</span>
+        </p>
+        <p>
+          <span>投产项目</span>
+
+        </p>
+         <img src="../assets/images/icon_ztsj_yellow.png" style="width: 12px; height: 19px;position: absolute; right: 0; top:15px" alt="" >
+         <img src="../assets/images/pic_hthp_tcbg.png" style="width: 100%; position: absolute; right: 0; bottom: 0;" alt="" >
+        </div></el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="18">
+          <div class="in_left">
+            <div class="exl_box" style="background-color: #fff;">
+              <div class="exl_title" style="display: flex; align-items: center; position: relative;">
+                <img src="../assets/images/icon_ztsj_blueright.png" alt="" style="width: 12px;height: 19px; position: absolute;top: 50%;left: -20px; transform: translateY(-50%);">
+                <span>招资引资项目到资金额</span>
+                <el-date-picker
+                      v-model="lb_value"
+                      style="width: 100px;"
+                      type="year"
+                      value-format="yyyy"
+                      @change="picher_fn"
+                      placeholder="选择年">
+                    </el-date-picker>
+              </div>
+              <echarts :echartData="echartData" :ehaersList="ehaersList" v-if="flags"></echarts>
             </div>
-            <echarts :echartData="echartData" :ehaersList="ehaersList" v-if="flags"></echarts>
           </div>
-        </div>
-      </el-col>
-      <el-col :span="6" style="padding: 24px 12px 24px 0 ;">
-        <div class="in_right">
-          <div class="rig_title">
-            "两区"及乡镇
-          </div>
-          <div class="rig_tab_top">
-            <div class="rig_tab_item">
-              单位名称
-            </div>
-            <div class="rig_tab_item">
-              新签约亿元以上项目的个数
+        </el-col>
+        <el-col :span="6" style="padding: 0 12px 24px 0 ;">
+          <div class="in_right" style="background-color: #fff;">
+            <div class="rig_title" style="display: flex; align-items: center; position: relative;">
+              <img src="../assets/images/icon_ztsj_blueright.png" alt="" style="width: 12px;height: 19px; position: absolute;top: 50%;left: -20px; transform: translateY(-50%);">
+              "两区"及乡镇
             </div>
-            <div class="rig_tab_item">
-              实际利用市外资金金额
+            <div class="rig_tab_top">
+              <div class="rig_tab_item">
+                单位名称
+              </div>
+              <div class="rig_tab_item">
+                新签约亿元以上项目的个数
+              </div>
+              <div class="rig_tab_item">
+                实际利用市外资金金额
+              </div>
+              <div class="rig_tab_item">
+                入省项目个数
+              </div>
             </div>
-            <div class="rig_tab_item">
-              入省项目个数
+            <div class="rig_cont">
+              <div class="rig_items" v-for="(item,index) in unitList" :key="index">
+                <span>{{item.deptName}}</span>
+                <span>{{item.projectMillionNum?item.projectMillionNum:0}}个</span>
+                <span>{{item.projectCityMoney?item.projectCityMoney:0}}亿元</span>
+                <span>{{item.projectProNum?item.projectProNum:0}}个</span>
+              </div>
             </div>
-          </div>
-          <div class="rig_cont">
-            <div class="rig_items" v-for="(item,index) in unitList" :key="index">
-              <span>{{item.deptName}}</span>
-              <span>{{item.projectMillionNum?item.projectMillionNum:0}}个</span>
-              <span>{{item.projectCityMoney?item.projectCityMoney:0}}亿元</span>
-              <span>{{item.projectProNum?item.projectProNum:0}}个</span>
+            <div class="rig_title" style="display: flex; align-items: center; position: relative;">
+              <img src="../assets/images/icon_ztsj_blueright.png" alt="" style="width: 12px;height: 19px; position: absolute;top: 50%;left: -20px; transform: translateY(-50%);">
+              市直榜单
             </div>
-          </div>
-          <div class="rig_title">
-            市直榜单
-          </div>
-          <div class="rig_tab_top" style="background-color: #1C84C6;">
+            <div class="rig_tab_top" style="background-color: #1C84C6;">
 
-            <div class="rig_tab_item">
-              单位名称
+              <div class="rig_tab_item">
+                单位名称
+              </div>
+              <div class="rig_tab_item">
+                新签约目标金额
+              </div>
+              <div class="rig_tab_item">
+                实际到资金额
+              </div>
             </div>
-            <div class="rig_tab_item">
-              新签约目标金额
-            </div>
-            <div class="rig_tab_item">
-              实际到资金额
-            </div>
-          </div>
-          <div class="rig_cont">
-            <div class="rig_items" v-for="(item,index) in zjList" :key="index">
-              <span>{{item.deptName}}</span>
-              <span>{{item.targetArrivalAmount?item.targetArrivalAmount:0}}万元</span>
-              <span>{{item.targetcAontractAmount?item.targetcAontractAmount:0}}万元</span>
+            <div class="rig_cont">
+              <div class="rig_items" v-for="(item,index) in zjList" :key="index">
+                <span>{{item.deptName}}</span>
+                <span>{{item.targetArrivalAmount?item.targetArrivalAmount:0}}万元</span>
+                <span>{{item.targetcAontractAmount?item.targetcAontractAmount:0}}万元</span>
+              </div>
             </div>
           </div>
-        </div>
-      </el-col>
-    </el-row>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 <script>
-  import echarts from '@/components/Echarts/index.vue'
-  import {toBeReviewedList,setExamine,setReject,getUnitList,getUnitAmountList,getIndexEharts} from '@/api/index.js'
+import echarts from '@/components/Echarts/index.vue'
+import {toBeReviewedList,setExamine,setReject,getUnitList,getUnitAmountList,getIndexEharts,getUnitListNuber} from '@/api/index.js'
   export default {
     data() {
       return {
@@ -109,6 +153,7 @@
         unitList: [],
         flags: false,
         lb_value: '2021', // 柱状图类别
+        nhgewo:{}
       }
     },
     components: {
@@ -119,6 +164,7 @@
       this.bd_btn()
       this.zj_btn()
       this.eharts_fn()
+      this.getListyhte()
     },
     methods: {
       picher_fn() {
@@ -201,10 +247,61 @@
           this.infoList = res.rows
         })
       },
+      getListyhte() {
+        getUnitListNuber().then(res => {
+          console.log(res)
+          this.nhgewo = res.data
+        })
+      }
+
     }
   }
 </script>
 <style lang="scss" scoped>
+  .heser{
+    background-color: #fff;
+    height: 100px;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    display: flex;
+    align-items: center;
+    padding-left: 10px;
+    box-shadow: 0px 1px 4px 0px rgba(47, 47, 47, 0.35);
+    p{
+      flex: 1;
+    }
+    p:nth-child(3){
+     height: 100%;
+     margin: 0;
+     padding-top: 15px;
+     box-sizing: border-box;
+     font-size: 17px;
+     font-family: PingFang SC;
+     font-weight: 800;
+     color: #343434;
+     position: relative;
+    }
+    p:nth-child(2){
+      display: flex;
+      flex-direction: column;
+      span{
+        font-size: 14px;
+        color: #666666;
+        padding-left: 10px;
+      }
+      span:nth-child(1){
+        font-size: 17px;
+        color: #343434;
+        font-weight: 700;
+        i{
+          font-size: 14px;
+          color: #666666;
+        }
+      }
+    }
+
+
+  }
   .rig_tab_top{
     display: flex;
     background: #6DCEF6;
@@ -246,7 +343,7 @@
     }
   }
   .in_right{
-    padding: 15px 15px 0;
+    padding: 15px 20px 0;
     border: 1px solid #DADADA;
     box-shadow: 0px 7px 9px 2px rgba(201, 201, 201, 0.36);
     .rig_title{
@@ -257,7 +354,7 @@
     }
   }
   .in_left {
-    padding: 24px 20px 40px;
+    padding: 0 20px 40px;
 
     .toReviewed {
       padding: 19px 16px;
@@ -281,7 +378,7 @@
         justify-content: space-between;
 
         span {
-          color: #1C84C6;
+          color: #343434;
           font-size: 18px;
           line-height: 36px;
         }
@@ -289,4 +386,5 @@
       }
     }
   }
+
 </style>

ruoyi-ui/src/views/index_v1.vue

@@ -1,98 +1,292 @@
 <template>
-  <div class="dashboard-editor-container">
-
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
+  <div class="in_box">
+    <el-row>
+      <el-col :span="18">
+        <div class="in_left">
+          <div class="toReviewed">
+            <div class="rev_title">
+              待审核项目
+            </div>
+            <el-table v-loading="loading" :data="infoList">
+              <el-table-column label="项目名称" align="center" prop="name" />
+              <el-table-column label="当前状态" align="center" prop="dictLabel" />
+              <el-table-column label="时间" align="center" prop="createTime" />
+              <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:query']" @click="dec_btn(scope.row)">查看和编辑</el-button>
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:pass']"
+                    @click="infoBtn(scope.row)">确认审核</el-button>
+                  <el-button size="mini" type="text" style="background: #1C84C6;color: #FFF;padding: 7px;" v-hasPermi="['bmProject:project:reject']" @click="bh_brn(scope.row)">驳回</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="exl_box">
+            <div class="exl_title">
+              <span>招资引资项目到资金额</span>
+              <el-date-picker
+                    v-model="lb_value"
+                    style="width: 100px;"
+                    type="year"
+                    value-format="yyyy"
+                    @change="picher_fn"
+                    placeholder="选择年">
+                  </el-date-picker>
+            </div>
+            <echarts :echartData="echartData" :ehaersList="ehaersList" v-if="flags"></echarts>
+          </div>
         </div>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
+      <el-col :span="6" style="padding: 24px 12px 24px 0 ;">
+        <div class="in_right">
+          <div class="rig_title">
+            "两区"及乡镇
+          </div>
+          <div class="rig_tab_top">
+            <div class="rig_tab_item">
+              单位名称
+            </div>
+            <div class="rig_tab_item">
+              新签约亿元以上项目的个数
+            </div>
+            <div class="rig_tab_item">
+              实际利用市外资金金额
+            </div>
+            <div class="rig_tab_item">
+              入省项目个数
+            </div>
+          </div>
+          <div class="rig_cont">
+            <div class="rig_items" v-for="(item,index) in unitList" :key="index">
+              <span>{{item.deptName}}</span>
+              <span>{{item.projectMillionNum?item.projectMillionNum:0}}个</span>
+              <span>{{item.projectCityMoney?item.projectCityMoney:0}}亿元</span>
+              <span>{{item.projectProNum?item.projectProNum:0}}个</span>
+            </div>
+          </div>
+          <div class="rig_title">
+            市直榜单
+          </div>
+          <div class="rig_tab_top" style="background-color: #1C84C6;">
+
+            <div class="rig_tab_item">
+              单位名称
+            </div>
+            <div class="rig_tab_item">
+              新签约目标金额
+            </div>
+            <div class="rig_tab_item">
+              实际到资金额
+            </div>
+          </div>
+          <div class="rig_cont">
+            <div class="rig_items" v-for="(item,index) in zjList" :key="index">
+              <span>{{item.deptName}}</span>
+              <span>{{item.targetArrivalAmount?item.targetArrivalAmount:0}}万元</span>
+              <span>{{item.targetcAontractAmount?item.targetcAontractAmount:0}}万元</span>
+            </div>
+          </div>
         </div>
       </el-col>
     </el-row>
-
-    
   </div>
 </template>
-
 <script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
+  import echarts from '@/components/Echarts/index.vue'
+  import {toBeReviewedList,setExamine,setReject,getUnitList,getUnitAmountList,getIndexEharts} from '@/api/index.js'
+  export default {
+    data() {
+      return {
+        infoList: [],
+        echartData: {
+          name: '到资金额柱状图',
+          numName: '到资金额',
+          numNameArr: ['到资金额']
+        },
+        zjList: [],
+        ehaersList: {},
+        loading: false,
+        unitList: [],
+        flags: false,
+        lb_value: '2021', // 柱状图类别
+      }
+    },
+    components: {
+      echarts
+    },
+    mounted() {
+      this.getList()
+      this.bd_btn()
+      this.zj_btn()
+      this.eharts_fn()
+    },
+    methods: {
+      picher_fn() {
+        this.eharts_fn()
+      },
+      eharts_fn(val) {
+        getIndexEharts({
+          year: this.lb_value
+        }).then(res => {
+          this.ehaersList = res.data
+          this.flags = true
+        })
+      },
+      zj_btn() {
+        getUnitAmountList().then(res => {
+          if(res.rows == null){
+            this.zjList = []
+          }else{
+            this.zjList = res.rows
+          }
 
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
+        })
+      },
+      bd_btn() {
+        getUnitList().then(res =>{
+          console.log(res)
+          this.unitList = res.rows
+          if(res.rows == null){
+            this.unitList = []
+          }else{
+            this.unitList = res.rows
+          }
 
-export default {
-  name: 'Index',
-  components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis
-    }
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
+        })
+      },
+      dec_btn(row){
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+          },
+        })
+      },
+      bh_brn(scope) {
+        const _this = this
+        this.$confirm('是否确认驳回审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setReject({
+            code: 2,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          _this.getList();
+          _this.msgSuccess("提交成功");
+        })
+      },
+      infoBtn(scope) {
+        const _this = this
+        this.$confirm('是否确认提交审核', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return setExamine({
+            code: 1,
+            bmProjectId: scrop.id
+          });
+        }).then(() => {
+          _this.getList();
+          _this.msgSuccess("提交成功");
+        })
+        },
+      getList() {
+        toBeReviewedList().then(res => {
+          console.log(res)
+          this.infoList = res.rows
+        })
+      },
     }
   }
-}
 </script>
-
 <style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
+  .rig_tab_top{
+    display: flex;
+    background: #6DCEF6;
+    line-height: 36px;
+    color: #fff;
+    .rig_tab_item{
+      font-size: 14px;
+      flex: 1;
+      text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+  }
+  .rig_cont{
+    border: 1px solid #CDCDCD;
+    box-sizing: border-box;
+    margin-bottom: 31px;
+    max-height: 270px;
+    overflow-y: auto;
+    scrollbar-width: none;
+/* firefox */
+    -ms-overflow-style: none;
 
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
+    /* IE 10+ */
+    &::-webkit-scrollbar {
+      display: none;
+      /* Chrome Safari */
+    }
+    .rig_items{
+      line-height: 36px;
+      color: #343434;
+      font-size: 12px;
+      display: flex;
+      span{
+        flex: 1;
+        text-align: center;
+      }
+    }
   }
-}
+  .in_right{
+    padding: 15px 15px 0;
+    border: 1px solid #DADADA;
+    box-shadow: 0px 7px 9px 2px rgba(201, 201, 201, 0.36);
+    .rig_title{
+      color: #1C84C6;
+      font-size: 18px;
+      line-height: 36px;
+      margin-bottom: 15px;
+    }
+  }
+  .in_left {
+    padding: 24px 20px 40px;
+
+    .toReviewed {
+      padding: 19px 16px;
+      border: 1px solid #DADADA;
+      box-shadow: 0px 7px 9px 2px rgba(201, 201, 201, 0.36);
+      margin-bottom: 38px;
 
-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
+      .rev_title {
+        margin-bottom: 23px;
+      }
+    }
+
+    .exl_box {
+      border: 1px solid #DADADA;
+      box-shadow: 0px 7px 9px 2px rgba(201, 201, 201, 0.36);
+      padding: 20px;
+      box-sizing: border-box;
+
+      .exl_title {
+        display: flex;
+        justify-content: space-between;
+
+        span {
+          color: #1C84C6;
+          font-size: 18px;
+          line-height: 36px;
+        }
+
+      }
+    }
   }
-}
 </style>

ruoyi-ui/src/views/management/report/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.projectName"

ruoyi-ui/src/views/management/roduction/index.vue

@@ -8,7 +8,7 @@
           v-hasPermi="['bmProject:project:examine']"
           >提交</el-button
         >
-        <!-- <el-button
+       <!-- <el-button
           type="primary"
           @click="submitForm"
           v-hasPermi="['bmProject:project:add']"