diff --git a/ruoyi-ui/src/views/project/projectPlan/index copy.vue b/ruoyi-ui/src/views/project/projectPlan/index copy.vue
new file mode 100644
index 00000000..295eb1ff
--- /dev/null
+++ b/ruoyi-ui/src/views/project/projectPlan/index copy.vue	
@@ -0,0 +1,360 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="包抓部门" prop="dept">
+        <el-input
+          v-model="queryParams.dept"
+          placeholder="请输入包抓部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开工日期" prop="startDate">
+        <el-date-picker clearable
+          v-model="queryParams.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择开工日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="完工日期" prop="endDate">
+        <el-date-picker clearable
+          v-model="queryParams.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择完工日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总投资" prop="totalInvestment">
+        <el-input
+          v-model="queryParams.totalInvestment"
+          placeholder="请输入总投资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年度投资" prop="yearInvestment">
+        <el-input
+          v-model="queryParams.yearInvestment"
+          placeholder="请输入年度投资"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否删除" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          placeholder="请输入是否删除"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['project:projectPlan:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['project:projectPlan:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['project:projectPlan:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['project:projectPlan:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="projectPlanList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="建设规模及主要建设内容" align="center" prop="content" />
+      <el-table-column label="建设性质" align="center" prop="buildType" />
+      <el-table-column label="包抓部门" align="center" prop="dept" />
+      <el-table-column label="开工日期" align="center" prop="startDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="完工日期" align="center" prop="endDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总投资" align="center" prop="totalInvestment" />
+      <el-table-column label="年度投资" align="center" prop="yearInvestment" />
+      <el-table-column label="0-城建项目计划,1-重点项目计划" align="center" prop="planType" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="是否删除" align="center" prop="isDel" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['project:projectPlan:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['project:projectPlan:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目跟进计划对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目名称" prop="projectName">
+          <el-input v-model="form.projectName" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="建设规模及主要建设内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="包抓部门" prop="dept">
+          <el-input v-model="form.dept" placeholder="请输入包抓部门" />
+        </el-form-item>
+        <el-form-item label="开工日期" prop="startDate">
+          <el-date-picker clearable
+            v-model="form.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择开工日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="完工日期" prop="endDate">
+          <el-date-picker clearable
+            v-model="form.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择完工日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总投资" prop="totalInvestment">
+          <el-input v-model="form.totalInvestment" placeholder="请输入总投资" />
+        </el-form-item>
+        <el-form-item label="年度投资" prop="yearInvestment">
+          <el-input v-model="form.yearInvestment" placeholder="请输入年度投资" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="是否删除" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入是否删除" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listProjectPlan, getProjectPlan, delProjectPlan, addProjectPlan, updateProjectPlan } from "@/api/project/projectPlan";
+
+export default {
+  name: "ProjectPlan",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目跟进计划表格数据
+      projectPlanList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectName: null,
+        content: null,
+        buildType: null,
+        dept: null,
+        startDate: null,
+        endDate: null,
+        totalInvestment: null,
+        yearInvestment: null,
+        planType: null,
+        isDel: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目跟进计划列表 */
+    getList() {
+      this.loading = true;
+      listProjectPlan(this.queryParams).then(response => {
+        this.projectPlanList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        projectName: null,
+        content: null,
+        buildType: null,
+        dept: null,
+        startDate: null,
+        endDate: null,
+        totalInvestment: null,
+        yearInvestment: null,
+        planType: null,
+        remark: null,
+        isDel: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目跟进计划";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getProjectPlan(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目跟进计划";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateProjectPlan(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProjectPlan(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除项目跟进计划编号为"' + ids + '"的数据项？').then(function() {
+        return delProjectPlan(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('project/projectPlan/export', {
+        ...this.queryParams
+      }, `projectPlan_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/project/projectPlan/index.vue b/ruoyi-ui/src/views/project/projectPlan/index.vue
index 2482f43c..6b3d5ceb 100644
--- a/ruoyi-ui/src/views/project/projectPlan/index.vue
+++ b/ruoyi-ui/src/views/project/projectPlan/index.vue
@@ -37,7 +37,7 @@
       <el-table-column :label="activeName == 'f' ? '年度投资(万元)' : '年度计划投资(万元)'"  min-width="150" align="center" prop="yearInvestment" />
     </el-table>
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="600px" :close-on-click-modal="false" :key="activeName"
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="600px" :close-on-click-modal="false" v-if="upload.open"
       :close-on-press-escape="false" append-to-body :custom-class="'proj-plan-import-dlg file-' + upload.files.length">      
       <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :multiple="false"
         :on-change="uploadChange" :action="upload.url + '?updateSupport=' + upload.updateSupport"
diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPlanController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPlanController.java
new file mode 100644
index 00000000..ffeaf6df
--- /dev/null
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectPlanController.java
@@ -0,0 +1,53 @@
+package com.yanzhu.jh.bigscreen.web.controller;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.yanzhu.jh.project.domain.SurProjectPlan;
+import com.yanzhu.jh.project.service.ISurProjectPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@RestController
+@RequestMapping("/bgscreen/projectPlan")
+public class ProjectPlanController {
+
+    @Autowired
+    ISurProjectPlanService surProjectPlanService;
+    @Autowired
+    private RedisCache redisCache;
+    @GetMapping("/listAll/{type}")
+    public AjaxResult listAll(@PathVariable("type") Long type){
+        String key="bgscreen_projectPlan_listAll_"+type;
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+
+        SurProjectPlan where=new SurProjectPlan();
+        where.setPlanType(type);
+        where.setIsDel(0l);
+        List<SurProjectPlan> list = surProjectPlanService.selectSurProjectPlanList(where);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
+
+    @GetMapping("/listAllTop3")
+    public AjaxResult listAllTop3(){
+        String key="bgscreen_projectPlan_listAll_";
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+
+        List<SurProjectPlan> list = surProjectPlanService.selectSurProjectPlanListTop3();
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
+}
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java
index f23f6d89..f6f1564f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectPlanMapper.java
@@ -58,4 +58,6 @@ public interface SurProjectPlanMapper
      * @return 结果
      */
     public int deleteSurProjectPlanByIds(Long[] ids);
+
+    public List<SurProjectPlan> selectSurProjectPlanListTop3();
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java
index d35cf8e8..a9f5e4c5 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectPlanService.java
@@ -64,4 +64,6 @@ public interface ISurProjectPlanService
     public int importUrbanPlan(List<UrbanPlanExport> list);
 
     public int importMajorPlan(List<MajorPlanExport> list);
+
+    public List<SurProjectPlan> selectSurProjectPlanListTop3();
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java
index 43d959da..fcff9ce7 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectPlanServiceImpl.java
@@ -109,14 +109,17 @@ public class SurProjectPlanServiceImpl implements ISurProjectPlanService
             if(i<oldList.size()){
                 SurProjectPlan it=oldList.get(i);
                 item.setValue(it);
+                it.setPlanType(0l);
                 this.updateSurProjectPlan(it);
             }else{
                 SurProjectPlan it=item.toPlan();
+                it.setPlanType(0l);
                 this.insertSurProjectPlan(it);
             }
         }
         for(;i<oldList.size();i++){
             SurProjectPlan it=oldList.get(i);
+            it.setPlanType(0l);
             it.setIsDel(1l);
             this.updateSurProjectPlan(it);
         }
@@ -134,17 +137,25 @@ public class SurProjectPlanServiceImpl implements ISurProjectPlanService
             if(i<oldList.size()){
                 SurProjectPlan it=oldList.get(i);
                 item.setValue(it);
+                it.setPlanType(1l);
                 this.updateSurProjectPlan(it);
             }else{
                 SurProjectPlan it=item.toPlan();
+                it.setPlanType(1l);
                 this.insertSurProjectPlan(it);
             }
         }
         for(;i<oldList.size();i++){
             SurProjectPlan it=oldList.get(i);
+            it.setPlanType(1l);
             it.setIsDel(1l);
             this.updateSurProjectPlan(it);
         }
         return 0;
     }
+
+    @Override
+    public List<SurProjectPlan> selectSurProjectPlanListTop3() {
+        return surProjectPlanMapper.selectSurProjectPlanListTop3();
+    }
 }
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml
index b474e418..1c7ec3c9 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectPlanMapper.xml
@@ -118,4 +118,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <select id="selectSurProjectPlanListTop3"  resultMap="SurProjectPlanResult">
+        SELECT * FROM (
+                          SELECT * FROM sur_project_plan WHERE IF(is_del,is_del,0)=0 AND plan_type=0 LIMIT 0,3 ) a
+        UNION
+        SELECT * FROM (
+                          SELECT * FROM sur_project_plan WHERE IF(is_del,is_del,0)=0 AND plan_type=1 LIMIT 0,3 ) b
+    </select>
 </mapper>
\ No newline at end of file