提交

ruoyi-ui/src/api/index.js

@@ -62,12 +62,13 @@ export function fcyjcb(data) {
 export function getUnitListNuber(data) {
   return request({
     url: '/projectV2/common/census',
-    method: 'get'
+    method: 'post',
+    data: data
   })
 }
-export function listleida() {
+export function listleida(data) {
   return request({
-    url: '/projectV2/common/censusXy',
+    url: '/projectV2/common/censusXy/' + data ,
     method: 'get'
   })
 }

ruoyi-ui/src/api/projectInfo/info.js

@@ -191,3 +191,12 @@ export function listConfigxmps(query) {
     params: query
   })
 }
+
+// 到处
+export function exportf(data) {
+  return request({
+    url: '/projectV2/sbbzb/export',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -1110,14 +1110,7 @@
       };
     },
     created(){
-      // this.queryParams.xmId = localStorage.getItem('xmId')
+
-      // this.queryParams.xmbh = localStorage.getItem('xmbh')
-      // this.queryParams.xmmc = localStorage.getItem('xmxsmc')
-      // this.bmProjectId.xmId = localStorage.getItem('xmId')
-      // this.bmProjectId.xmbh = localStorage.getItem('xmbh')
-      // this.bmProjectId.xmmc = localStorage.getItem('xmxsmc')
-      // this.form.xmId = localStorage.getItem('xmId')
-      // this.form.xmbh = localStorage.getItem('xmbh')
 
     },
     mounted() {
@@ -1734,7 +1727,7 @@ console.log(56986256)
             // data.leasePlantDoc = data.leasePlantDoc.join(",");
             // data.circulationPhoto = data.circulationPhoto.join(",");
 
-            if (this.form.id!=-1) {
+            if (this.form.id !=-1) {
               // 修改
               setOrderinfo(this.form).then((res) => {
                 this.msgSuccess("修改成功");
@@ -1743,7 +1736,6 @@ console.log(56986256)
                   path: "/management/management/info/index",
                 });
               });
-
             } else {
               this.form.id = undefined
               // 新增
@@ -1834,7 +1826,7 @@ console.log(56986256)
             // this.form.xmId = localStorage.getItem('xmbh')
             console.log(this.form,91)
           }else{
-            this.form.id = -1
+              this.form.id = -1
               this.queryParams.xmId = localStorage.getItem('xmId')
                   this.queryParams.xmbh = localStorage.getItem('xmbh')
                   this.queryParams.xmmc = localStorage.getItem('xmxsmc')

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

@@ -1608,14 +1608,54 @@ console.log(56986256)
         //   return  false
         // }
         if(this.form.xytzely == undefined){
-          this.msgError("请选择协议投资额");
+            this.msgError("请选择协议投资额");
-            return  false
-        }
-        if(this.form.xytze == '内资(市外省内)'){
-          if(this.form.swzj == '' || this.form.swzj == undefined){
-            this.msgError("请填写市外资金");
               return  false
           }
+
+          if(this.form.xytzely == '内资(市外省内)'){
+            if(this.form.swzj == undefined || this.form.swzj == null){
+              this.msgError("请填写市外资金");
+                return  false
+            }
+          }
+
+        console.log(this.form.zlcf,this.form.gdmj)
+
+        if(this.form.zlcf == undefined && this.form.gdmj == undefined){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == null && this.form.gdmj == undefined){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == undefined && this.form.gdmj == null){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == null && this.form.gdmj == null){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == '' && this.form.gdmj == ''){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == undefined && this.form.gdmj == ''){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == '' && this.form.gdmj == undefined){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == '' && this.form.gdmj == null){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
+        }
+        if(this.form.zlcf == null && this.form.gdmj == ''){
+          this.msgError("供地面积，租赁厂房必填一项");
+            return  false
         }
         this.form.xmId = localStorage.getItem('xmId')
         this.form.xmbh = localStorage.getItem('xmbh')
@@ -1661,8 +1701,6 @@ console.log(56986256)
                 });
               });
             }
-
-
           }
         });
       },
@@ -1730,9 +1768,23 @@ console.log(56986256)
             // console.log(data.circulationPhoto,defaultSettings.urls + this.process,654)
             this.form = data;
             localStorage.setItem('xmmc',this.form.xmmc)
+            this.queryParams.xmId = this.form.xmId
+            this.queryParams.xmbh = this.form.xmbh
+            this.queryParams.xmmc = this.form.xmxsmc
+            this.bmProjectId.xmId = this.form.xmId
+            this.bmProjectId.xmbh = this.form.xmbh
+            this.bmProjectId.xmmc = this.form.xmxsmc
             console.log(this.form,91)
           }else{
             this.form.id = -1
+            this.queryParams.xmId = localStorage.getItem('xmId')
+                this.queryParams.xmbh = localStorage.getItem('xmbh')
+                this.queryParams.xmmc = localStorage.getItem('xmxsmc')
+                this.bmProjectId.xmId = localStorage.getItem('xmId')
+                this.bmProjectId.xmbh = localStorage.getItem('xmbh')
+                this.bmProjectId.xmmc = localStorage.getItem('xmxsmc')
+                this.form.xmId = localStorage.getItem('xmId')
+                this.form.xmbh = localStorage.getItem('xmbh')
           }
         });
       },

ruoyi-ui/src/settings.js

@@ -1,8 +1,8 @@
 module.exports = {
   title: '项目管理系统',
-  urls: 'https://qszs.qs163.cn/prod-api',
+  // urls: 'https://qszs.qs163.cn/prod-api',
-  // urls: 'http://192.168.101.168:8010',
+  urls: 'http://192.168.101.168:8010',
-  // http://192.168.101.168:8010
+
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -36,6 +36,7 @@ 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://192.168.3.86:8010'
-  apiUrl: 'http://47.99.82.249:80'
+  apiUrl: 'http://192.168.101.168:8010'
+  // apiUrl: 'https://qszs.qs163.cn/prod-api'
 }

ruoyi-ui/src/utils/request.js

@@ -10,17 +10,17 @@ import { saveAs } from 'file-saver'
 let downloadLoadingInstance;
 // 是否显示重新登录
 export let isRelogin = { show: false };
-
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // http://47.99.82.249:80/prod-api
-  
+
-  baseURL: 'https://qszs.qs163.cn/prod-api',
+  // baseURL: 'https://qszs.qs163.cn/prod-api',
-  // baseURL: 'http://192.168.101.168:8010',
+  // baseURL: 'http://192.168.3.86:8010',
+  baseURL: 'http://192.168.101.168:8010',
   // 超时
-  timeout: 60000
+  timeout: 320000
 })
 
 // request拦截器

ruoyi-ui/src/views/index.vue

@@ -1,7 +1,6 @@
 <template>
-
   <div class="in_box" style="background-color: #eef0ff;">
-    <div >
+    <div>
       <div class="indes_fag">
         <div>
           <p @click="nhl(1)" :class="jk == false ? 'lo' : ''">招商首页</p>
@@ -79,8 +78,8 @@
            </div>
          </div>
         </el-col>
-        
+
-        
+
         <!-- <el-col :xs="24" :sm="24"  :lg="12" :xl="12">
           <div class="fgw_index" style="height: 460px;">
             <el-col :xs="12" :sm="12"  :lg="17" :xl="16">
@@ -184,7 +183,16 @@
       </el-row>
 
       <el-row :gutter="20" style="padding: 0 20px; " v-if="jk == false">
-        <el-col :xs="12" :sm="12"  :lg="8" :xl="8" ><div @click="pkue(0)" class="headerone heser" style="background-color: #fff; position: relative;">
+        <div style="background-color: #fff;  padding: 10px 0; margin: 10px; margin-bottom: 0; border-radius: 15px;">
+          <div style="padding-left: 10px; display: flex; justify-content: flex-start; align-items: center;">
+            年度:<el-input type="number"  v-model="conversion_time1" placeholder="请输入年度" clearable size="small" style="width: 250px; margin-left: 20px; margin-right: 10px;"  />
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin-right: 20px;">搜索</el-button>
+            按年份统计，默认本年度
+            <p style="margin: 0;padding: 0; margin-left: 10px;">项目总数: <span style="color: #2529EA;">{{nhgewo.all}}</span>个 </p>
+          </div>
+        </div>
+        <el-col :xs="12" :sm="12"  :lg="8" :xl="8" >
+          <div @click="pkue(0)" 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.st}} <i style="font-style:normal;">项</i> </span>
@@ -358,7 +366,7 @@
         </el-col>
       </el-row> -->
       <el-dialog :show-close="false" :close-on-click-modal="false" title="督办信息" :visible.sync="opensh" width="1200px" append-to-body>
-        <el-table v-loading="loading" :data="xmList" @selection-change="handleSelectionChange" >
+        <el-table v-if="bgtesde" v-loading="loading" :data="xmList" @selection-change="handleSelectionChange" >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="项目编号" align="center" prop="xmbh" width="128"/>
           <el-table-column label="项目名称" align="center" prop="xmmc" />
@@ -472,10 +480,17 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
         jk:false,
         nhg:false,
         mjieus:{},
-        fgwcbs:false
+        fgwcbs:false,
+        bgtesde:true,
+        conversion_time1:'',
+        kngegs:{
+
+        }
       }
     },
     created() {
+      var tempDate = new Date() // 获取今天的日期
+      this.gettime(tempDate)
       console.log(this.$store.getters,34)
       let nhue = []
       nhue = this.$store.getters.userType.split(',')
@@ -547,6 +562,29 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
       // this.zhuzhList()
     },
     methods: {
+      handleQuery(){
+       this.getListyhte()
+       this.leidaList()
+      },
+      gettime(date){
+                      var date = date;
+                      var y = date.getFullYear();
+                      var m = date.getMonth() + 1;
+                      m = m < 10 ? ('0' + m) : m;
+                      var d = date.getDate();
+                      d = d < 10 ? ('0' + d) : d;
+                      var h = date.getHours();
+                      h = h < 10 ? ('0' + h) : h;
+                      var min = date.getMinutes();
+                      min = min < 10 ? ('0' + min) : min;
+                      var s = date.getSeconds();
+                      s = s < 10 ? ('0' + s) : s;
+                      this.conversion_time1 = y  ;
+      					  return  y + '-' + m + '-' + d + '/' +h +':' + min + ':' + s
+      					  // this.njdes = parseInt(new Date().getTime() / 1000) + ''
+      					  console.log()
+      					  // 转换时间戳
+                  },
       nhl(val){
         if(this.nhg == false){
           return
@@ -588,6 +626,7 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
         })
       },
       bd_btn(row) {
+        this.bgtesde = false
         getUnitList(this.queryParamss).then(res =>{
           console.log(res)
           if(res.rows != null){
@@ -595,15 +634,18 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
               this.xmList = res.rows
               this.totals = res.total
               this.opensh = true
-              if(res.total == 0 && row == 3){
+              if(res.total == 0 ){
-                this.flags = false;
+                if(row == 3){
-                this.opensh = false
+                  this.flags = false;
+                  this.opensh = false
+                }
+
               }
             }
           }
 
 
-
+          this.bgtesde = true
           // if(res.rows == null){
           //   this.unitList = []
           // }else{
@@ -635,6 +677,7 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
           path: '/management/management/info/index',
           query: {
             tz: row,
+            time:this.conversion_time1
           },
         })
       },
@@ -685,9 +728,13 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
         })
       },
       getListyhte() {
-        getUnitListNuber().then(res => {
+        let nhg = { params:{} }
+        nhg.params.year =  this.conversion_time1
+         this.ndhw = false
+        getUnitListNuber(nhg).then(res => {
           console.log(res)
           this.nhgewo = res.data
+           this.ndhw = true
         })
       },
       // fgwcb
@@ -710,8 +757,8 @@ import {listleida,toBeReviewedList,setExamine,getfgwcb,fcyjcb,setReject,getUnitL
       // panelChartDataleidfgw
       // 雷达图
       leidaList(){
-        listleida().then(response => {
+        this.ndhw = false
-
+        listleida(this.conversion_time1).then(response => {
           if(response.data.y.st.length == 0){
             // response.data.y.xs = [17,36,59,28]
           }

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

@@ -1,5 +1,7 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"  v-loading="loadinggt"  element-loading-text="拼命加载中,请耐心等待一下."
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <!-- <el-form-item label="填报单位" prop="deptName">
         <el-input v-model="queryParams.deptName" placeholder="请输入填报单位" clearable size="small" @keyup.enter.native="handleQuery" />
@@ -72,17 +74,19 @@
                 </el-select>
               </el-form-item>
           </el-col>
-          <el-col :span="8">
+           <el-col :span="8">
-              <el-form-item>
+            <el-form-item label="年度" prop="year">
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-input type="number" v-model="queryParams.params.year" placeholder="请输入年度" clearable size="small"   />
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
-                <el-button type="warning" icon="el-icon-d-arrow-right" size="mini" @click="handleQuerys">更多</el-button>
-              </el-form-item>
-          </el-col>
-          <el-col :span="8">
-
           </el-col>
         </el-col>
+        <el-col :span="8">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button type="warning" icon="el-icon-d-arrow-right" size="mini" @click="handleQuerys">更多</el-button>
+            </el-form-item>
+        </el-col>
       </el-row>
 
 
@@ -762,7 +766,8 @@
     lshzhip,
     addps,
     listConfigxmps,
-    setBack
+    setBack,
+    exportf
   } from "@/api/projectInfo/info";
   const defaultSettings = require("@/settings.js");
   import {addXm} from "@/api/system/xm";
@@ -787,7 +792,8 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
         defaultSettings,
         queryParamss:{
           pageNum: 1,
-          pageSize: 10
+          pageSize: 10,
+
           },
           nhdevf:{
             pageNum: 1,
@@ -858,7 +864,10 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
           attachment: null,
           description: null,
           deptName: undefined,
-          deptList: []
+          deptList: [],
+          params:{
+            year:''
+          }
         },
         // 表单参数
         form: {},
@@ -920,9 +929,18 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
         bskeaae:'0',
         ksled:false,
         baksead:false,
+        loadinggt:false
       };
     },
     created() {
+      var tempDate = new Date() // 获取今天的日期
+
+      if(this.$route.query.time != undefined){
+        this.queryParams.params.year = this.$route.query.time
+      }else{
+        this.gettime(tempDate)
+      }
+
       if(this.$route.query.tz !== undefined){
         if(this.$route.query.tz == 0){
           // 再谈
@@ -1042,6 +1060,25 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
       }
     },
     methods: {
+      gettime(date){
+                      var date = date;
+                      var y = date.getFullYear();
+                      var m = date.getMonth() + 1;
+                      m = m < 10 ? ('0' + m) : m;
+                      var d = date.getDate();
+                      d = d < 10 ? ('0' + d) : d;
+                      var h = date.getHours();
+                      h = h < 10 ? ('0' + h) : h;
+                      var min = date.getMinutes();
+                      min = min < 10 ? ('0' + min) : min;
+                      var s = date.getSeconds();
+                      s = s < 10 ? ('0' + s) : s;
+                      this.queryParams.params.year = y + ''  ;
+      					  return  y + '-' + m + '-' + d + '/' +h +':' + min + ':' + s
+      					  // this.njdes = parseInt(new Date().getTime() / 1000) + ''
+      					  console.log()
+      					  // 转换时间戳
+                  },
       handleQuerys(){
         this.mse = !this.mse
       },
@@ -1476,6 +1513,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
       handleExport() {
         const queryParams = this.queryParams;
         queryParams.exportType = 1
+
         this.$confirm('是否确认导出列表数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -1483,9 +1521,20 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
         }).then(function() {
           // return exportInfo(queryParams);
         }).then(response => {
-          this.download('projectV2/sbbzb/export', {
+          this.loadinggt= true
-            ...this.queryParams
+          exportf(this.queryParams).then(response => {
-          }, '填报信息.xlsx')
+            this.loadinggt= false
+            // console.log(response.msg,3)
+            window.location.href = 'http://192.168.101.168:8010' + response.msg;
+            // window.open('http://192.168.101.168:8010' + response.msg );
+            // this.msgSuccess("新增成功");
+            // this.opentime = false;
+            // this.getList();
+            this.loadinggt= false
+          });
+          // this.download('projectV2/sbbzb/export',{
+          //   ...this.queryParams
+          // }, '填报信息.xlsx')
         })
       },
       handleExports(){
@@ -1498,14 +1547,25 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
         }).then(function() {
           // return exportInfo(queryParams);
         }).then(response => {
-          this.download('projectV2/sbbzb/export', {
+          this.loadinggt= true
-            ...this.queryParams
+          exportf(this.queryParams).then(response => {
-          }, '填报信息.xlsx')
+            this.loadinggt= false
+            // console.log('http://192.168.101.168:8010' + response.msg,3)
+             window.location.href = 'http://192.168.101.168:8010' + response.msg;
+            // window.open('http://192.168.101.168:8010' + response.msg );
+            // this.msgSuccess("新增成功");
+            // this.opentime = false;
+            // this.getList();
+
+          });
+          // this.download('projectV2/sbbzb/export', {
+          //   ...this.queryParams
+          // }, '填报信息.xlsx')
         })
       },
       //查看
       chei(row) {
-        // localStorage.setItem('xmId',row.id)
+        localStorage.setItem('xmId',row.id)
         localStorage.setItem('xmbh',row.xmbh)
         this.$router.push({
           path: '/management/management/row/index',
@@ -1799,6 +1859,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
         this.dhesd()
       },
       dhesd(){
+        this.queryParamss.xmmc = undefined
         listConfigfieujind(this.queryParamss).then((response) => {
           console.log(response);
           this.xmList = response.rows;

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

@@ -1372,6 +1372,8 @@ const defaultSettings = require("@/settings.js");
       },
       //查看
       chei(row) {
+        localStorage.setItem('xmId',row.id)
+        localStorage.setItem('xmbh',row.xmbh)
         this.$router.push({
           path: '/management/management/rows',
           query: {

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

@@ -1717,7 +1717,6 @@ export default {
        // console.log(this.tab,this.modify)
       // this.queryParamstwr.id = localStorage.getItem('xmId')
       // this.queryParamstwr
-      // this.queryParamstwr.xmbh = localStorage.getItem('xmbh')
       // this.queryParamstwr.xmmc = localStorage.getItem('xmmc')
       // this.queryParamstwr.xmxsmc = localStorage.getItem('xmxsmc')
       // if(this.queryParamstwr.zsyzFjList ==undefined){

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

@@ -865,6 +865,25 @@ export default {
     lk:1
     };
   },
+  watch: {
+      '$route' () {
+        console.log(55)
+        this.queryParams.bmProjectId = this.$route.query.setid;
+        this.queryParamstwr.xmId = localStorage.getItem('xmId')
+        this.queryParamstwr.xmbh = localStorage.getItem('xmbh')
+        console.log(localStorage.getItem('xmId'),localStorage.getItem('xmbh'),864)
+        if(localStorage.getItem('xmmc') == null){
+          this.queryParamstwr.xmmc = localStorage.getItem('xmxsmc')
+        }else{
+          this.queryParamstwr.xmmc = localStorage.getItem('xmmc')
+        }
+  
+        // if (this.setrd !=0){
+        //  this.getList();
+        //  // this.getListtoi();
+        // }
+      }
+    },
   created() {
     // this.headers = {
     //     'token': "Bearer " + getToken(),
@@ -1278,7 +1297,7 @@ export default {
       // this.queryParamstwrction.bmProjectId = this.bmProjectId
       this.queryParamstwrction.xmId  = this.bmProjectId
       this.queryParamstwrction.xmbh  = this.queryParamstwr.xmbh
-      this.queryParamstwrction.xmmc  = this.queryParamstwr.xmxsmc
+      this.queryParamstwrction.xmbh = localStorage.getItem('xmbh')
       listConfigsixs(this.queryParamstwrction).then((response) => {
         this.configList = response.rows;
         let poku = [];