Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -20,7 +20,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
- * 
+ *
  * @author ruoyi
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -31,7 +31,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -55,7 +55,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private CorsFilter corsFilter;
-    
+
     /**
      * 解决 无法直接注入 AuthenticationManager
      *
@@ -114,6 +114,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
                 .antMatchers("/common/upload").anonymous()
+                /*以下为测试新增,上线删除*/
+
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()
@@ -126,7 +128,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
         httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
     }
 
-    
+
     /**
      * 强散列哈希加密实现
      */

ruoyi-ui/src/views/deptplan/index.vue

@@ -42,7 +42,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['deptplan:Plan:add']"
+          v-hasPermi="['deptPlan:Plan:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['deptplan:Plan:edit']"
+          v-hasPermi="['deptPlan:Plan:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -64,7 +64,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['deptplan:Plan:remove']"
+          v-hasPermi="['deptPlan:Plan:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -74,7 +74,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['deptplan:Plan:export']"
+          v-hasPermi="['deptPlan:Plan:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -96,14 +96,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['deptplan:Plan:edit']"
+            v-hasPermi="['deptPlan:Plan:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['deptplan:Plan:remove']"
+            v-hasPermi="['deptPlan:Plan:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

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

@@ -5,7 +5,7 @@
         <el-button
           type="primary"
           @click="handleAudit"
-          v-hasPermi="['projectConstruction:construction:add']"
+          v-hasPermi="['bmProject:project:examine']"
           >提交</el-button
         >
         <el-button
@@ -661,7 +661,7 @@
         <el-form-item label="图片" prop="photo">
           <el-upload
             class="upload-demo"
-            ref="upload"
+            ref="uploadty"
             :action="defaultSettings.urls + process+'/common/upload'"
             :on-preview="handlePreviewther"
             :on-remove="handleRemovether"
@@ -681,7 +681,7 @@
               size="small"
               type="success"
               :disabled = "disfal"
-              @click="submitUploadther"
+              @click="submitUploadthers"
               >上传到服务器</el-button
             >
             <div slot="tip" class="el-upload__tip">
@@ -858,6 +858,10 @@ export default {
       queryFormhye: {},
       udgment: 0, //项目入统判断是新增  还是修改   新增0   修改1
       udgmentList: [],
+      hfeiteka:false,//判断新增点击
+      ixndgh:false,
+      nbjieug:false,
+      remou:[]
     };
   },
   created() {
@@ -955,7 +959,21 @@ export default {
     },
     handleChange(file, fileList){
       console.log(file, fileList)
+      if(fileList.length > 1){
+         // this.imagese  = []
+        this.ixndgh = true
+        this.hfeiteka = true
+      }else{
+        // this.imagese  = []
+        this.ixndgh = false
+        this.hfeiteka = false
+      }
+      console.log(986)
     },
+    clearFiles () {
+      console.log(123)
+                this.$refs['uploadty'].clearFiles();
+            },
     beforeAvatarUpload(file) {
       console.log(file);
     },
@@ -1019,13 +1037,22 @@ export default {
       );
     },
     beforeRemovetwo(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+      // return this.$confirm(`确定移除 ${file.name}？`);
     },
     submitUploadther() {
       this.$refs.upload.submit();
     },
+    submitUploadthers(){
+      this.$refs.uploadty.submit();
+    },
     handleRemovether(file, fileList) {
-      // console.log(file, fileList);
+      console.log(file, fileList);
+      if(fileList.length > 1){
+        this.nbjieug = true
+      }else{
+        this.nbjieug = false
+      }
+      console.log(6554)
     },
     handlePreviewther(file) {
       console.log(file, 45);
@@ -1034,6 +1061,13 @@ export default {
     handleSuccther(response, file, fileList) {
       // let imges = []
 
+      // if( this.hfeiteka == false   ){
+      //   this.imagese  = []
+      //   console.log(this.imagese,9876)
+      // }
+      // if(!this.ixndgh){
+      //   this.imagese  = []
+      // }
       this.imagese.push(file.response.url);
       console.log(this.imagese.join(","), 345);
       if (this.numhu == 0) {
@@ -1041,10 +1075,11 @@ export default {
       } else if (this.numhu == 1) {
         this.formtwo.photo = this.imagese.join(",");
       } else if (this.numhu == 2) {
+        this.formther.photo = ''
         this.formther.photo = this.imagese.join(",");
       }
 
-      console.log(this.form.photo);
+      console.log(this.imagese,34567);
       if (file.response.code == 200) {
         this.msgSuccess("上传成功");
       }
@@ -1155,6 +1190,7 @@ export default {
         this.configLisfour.filter((route) => {
           if (route.photo !== null) {
             let poku = [];
+            this.imagese = []
             poku = route.photo.split(",");
             route.photo = route.photo.split(",");
             route.phototwo = route.photo[0];
@@ -1214,6 +1250,7 @@ export default {
       this.open = false;
       this.opentwo = false;
       this.openther = false;
+      this.hfeiteka  = false
       this.reset();
     },
     // 表单重置
@@ -1229,16 +1266,27 @@ export default {
       this.resetForm("form");
     },
     resettwo() {
-      this.form = {
+      this.formtwo = {
         // configId: undefined,
         // configName: undefined,
         // configKey: undefined,
         // configValue: undefined,
         // configType: "Y",
-        // remark: undefined
+        photo: undefined
       };
       this.resetForm("formtwo");
     },
+    resetther() {
+      this.formther = {
+        // configId: undefined,
+        // configName: undefined,
+        // configKey: undefined,
+        // configValue: undefined,
+        // configType: "Y",
+        photo: undefined
+      };
+      this.resetForm("formther");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1254,10 +1302,14 @@ export default {
     handleAdd(index) {
       this.numhu = index;
       this.reset();
+
+      // this.hfeiteka = true
       this.fileListtherrt = []
       if (this.numhu == 0) {
         this.open = true;
       } else if (this.numhu == 2) {
+        this.formther.photo = ''
+        this.resetther()
         this.openther = true;
       }
 
@@ -1296,9 +1348,11 @@ export default {
               this.msgSuccess("请上传照片");
               return  false
             }
+            this.imagese = []
             addConfigther(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
+              this.hfeiteka   = false
               this.getListtoi();
             });
           }
@@ -1314,9 +1368,11 @@ export default {
               this.msgSuccess("请上传照片");
               return  false
             }
+            this.imagese = []
             addConfigfour(this.formtwo).then((response) => {
               this.msgSuccess("新增成功");
               this.opentwo = false;
+              this.hfeiteka   = false
               this.getListther();
             });
           }
@@ -1337,9 +1393,12 @@ export default {
               this.msgSuccess("请上传照片");
               return  false
             }
+            this.imagese = []
             addConfigfiv(this.formther).then((response) => {
               this.msgSuccess("新增成功");
               this.openther = false;
+              this.hfeiteka   = false
+              // this.clearFiles()
               this.getListfour();
               this.getListfive()
             });
@@ -1571,6 +1630,7 @@ export default {
       this.numhu = index;
       this.fileListtherrt = []
       this.opentwo = true;
+      this.hfeiteka   = true
       this.titletwo = "添加参数";
     },
     //取消

ruoyi-ui/src/views/statistical/clue/index.vue

@@ -1,123 +1,123 @@
-<template>
-  <div class="in_box">
-    <el-row>
-      <el-col :span="18">
-        <div class="in_left">
-          <div class="toReviewed">
-            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
-              <el-table-column label="项目名称" align="center" prop="name" />
-              <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="['project:statistics:query']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                <!--  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
-              目标任务
-            </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.plan?item.plan:0}}个</span>
-              <span>{{item.successMission?item.successMission:0}}个</span>
-            </div>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-  import echarts from '@/components/Echarts/index.vue'
-  import {
-    getStatisticst,
-    delProject,
-    toBeReviewedList,
-    setExamine,
-    setReject,
+<template>
+  <div class="in_box">
+    <el-row>
+      <el-col :span="18">
+        <div class="in_left">
+          <div class="toReviewed">
+            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
+              <el-table-column label="项目名称" align="center" prop="name" />
+              <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="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看详情</el-button>
+                <!--  <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
+              目标任务
+            </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.plan?item.plan:0}}个</span>
+              <span>{{item.successMission?item.successMission:0}}个</span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+  import echarts from '@/components/Echarts/index.vue'
+  import {
+    getStatisticst,
+    delProject,
+    toBeReviewedList,
+    setExamine,
+    setReject,
     getUnitAmountList,
-    setPass,
-    getIndexEharts
-  } from '@/api/statistical'
-  export default {
-    data() {
-      return {
-        infoList: [],
-        zjList: [],
-        ehaersList: {},
-        echartData: {
-          name: '在谈项目个数柱状图',
+    setPass,
+    getIndexEharts
+  } from '@/api/statistical'
+  export default {
+    data() {
+      return {
+        infoList: [],
+        zjList: [],
+        ehaersList: {},
+        echartData: {
+          name: '在谈项目个数柱状图',
           numName: '项目个数',
-          numNameArr: ['项目个数']
-        },
-        loading: false,
-        unitList: [],
-        flags: false,
-        lb_value: '2021', // 柱状图类别
-      }
-    },
-    components: {
-      echarts
-    },
-    mounted() {
-      this.getList()
-      this.bd_btn()
-      this.zht_fn()
-      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
-        })
-      },
-      zht_fn() {
-
-      },
+          numNameArr: ['项目个数']
+        },
+        loading: false,
+        unitList: [],
+        flags: false,
+        lb_value: '2021', // 柱状图类别
+      }
+    },
+    components: {
+      echarts
+    },
+    mounted() {
+      this.getList()
+      this.bd_btn()
+      this.zht_fn()
+      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
+        })
+      },
+      zht_fn() {
+
+      },
       bd_btn() {
-        console.log(222)
-        getUnitAmountList().then(res => {
-          this.unitList = res.rows
-        })
-      },
-      dec_btn(row) {
+        console.log(222)
+        getUnitAmountList().then(res => {
+          this.unitList = res.rows
+        })
+      },
+      dec_btn(row) {
         this.$router.push({
           path: '/management/row/index',
           query: {
@@ -125,64 +125,64 @@
             setrd: row.projectStatus,
             tabIndex: 1,
           },
-        })
-      },
+        })
+      },
       bh_brn(scope) {
-        const _this = this
-        this.$confirm('是否确认销号', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          delProject(scope.id).then(() => {
-            _this.getList();
-            _this.msgSuccess("提交成功");
-          })
-        })
-      },
+        const _this = this
+        this.$confirm('是否确认销号', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          delProject(scope.id).then(() => {
+            _this.getList();
+            _this.msgSuccess("提交成功");
+          })
+        })
+      },
       infoBtn(scope) {
-        const _this = this
-        this.$confirm('是否确认提交申请', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          setExamine({
-            code: 1,
-            bmProjectId: scope.id
-          });
-        }).then(() => {
-          _this.getList();
-          _this.msgSuccess("提交成功");
-        })
-      },
-      getList() {
-        getStatisticst('1,2,3').then(res => {
-          this.infoList = res.rows
-        })
-      },
-    }
-  }
-</script>
-<style lang="scss" scoped>
-  .rig_tab_top {
-    display: flex;
-    background: #6DCEF6;
-    line-height: 36px;
-    color: #fff;
-
-    .rig_tab_item {
-      font-size: 14px;
-      flex: 1;
-      text-align: center;
-    }
-  }
-
-  .rig_cont {
-    border: 1px solid #CDCDCD;
-    box-sizing: border-box;
-    margin-bottom: 31px;
-    max-height: 270px;
+        const _this = this
+        this.$confirm('是否确认提交申请', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          setExamine({
+            code: 1,
+            bmProjectId: scope.id
+          });
+        }).then(() => {
+          _this.getList();
+          _this.msgSuccess("提交成功");
+        })
+      },
+      getList() {
+        getStatisticst('1,2,3').then(res => {
+          this.infoList = res.rows
+        })
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .rig_tab_top {
+    display: flex;
+    background: #6DCEF6;
+    line-height: 36px;
+    color: #fff;
+
+    .rig_tab_item {
+      font-size: 14px;
+      flex: 1;
+      text-align: center;
+    }
+  }
+
+  .rig_cont {
+    border: 1px solid #CDCDCD;
+    box-sizing: border-box;
+    margin-bottom: 31px;
+    max-height: 270px;
     overflow-y: auto;
     scrollbar-width: none;
     /* firefox */
@@ -192,65 +192,65 @@
     &::-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;
-
-      .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;
-        }
-
-      }
-    }
-  }
+    }
+
+    .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;
+
+      .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/statistical/putProduction/index.vue

@@ -1,118 +1,118 @@
-<template>
-  <div class="in_box">
-    <el-row>
-      <el-col :span="18">
-        <div class="in_left">
-          <div class="toReviewed">
-            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
-              <el-table-column label="项目名称" align="center" prop="name" />
-              <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="['statistics:statistics:query']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                 <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
-              入规目标
-            </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.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
-              <span>{{item.successMission?item.successMission:0}}个</span>
-            </div>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-  import echarts from '@/components/Echarts/index.vue'
-  import {
-    getStatisticst,
-    delProject,
-    toBeReviewedList,
-    setExamine,
-    setReject,
-    setInvestmentList,
-    getProjectInvestmentEharts
-  } from '@/api/statistical'
-  export default {
-    data() {
-      return {
-        infoList: [],
-        zjList: [],
-        ehaersList: {},
-        echartData: {
-          name: '投产项目个数柱状图',
+<template>
+  <div class="in_box">
+    <el-row>
+      <el-col :span="18">
+        <div class="in_left">
+          <div class="toReviewed">
+            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
+              <el-table-column label="项目名称" align="center" prop="name" />
+              <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="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看详情</el-button>
+                 <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
+              入规目标
+            </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.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
+              <span>{{item.successMission?item.successMission:0}}个</span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+  import echarts from '@/components/Echarts/index.vue'
+  import {
+    getStatisticst,
+    delProject,
+    toBeReviewedList,
+    setExamine,
+    setReject,
+    setInvestmentList,
+    getProjectInvestmentEharts
+  } from '@/api/statistical'
+  export default {
+    data() {
+      return {
+        infoList: [],
+        zjList: [],
+        ehaersList: {},
+        echartData: {
+          name: '投产项目个数柱状图',
           numName: '投产项目个数',
-          numNameArr: ['投产项目个数']
-        },
-        loading: false,
-        unitList: [],
-        flags: false,
-        lb_value: '2021', // 柱状图类别
-      }
-    },
-    components: {
-      echarts
-    },
-    mounted() {
-      this.getList()
-      this.bd_btn()
-      this.eharts_fn()
-    },
-    methods: {
-      picher_fn() {
-        this.eharts_fn()
-      },
-      eharts_fn(val) {
-        getProjectInvestmentEharts({
-          year: this.lb_value
-        }).then(res => {
-          this.ehaersList = res.data
-          this.flags = true
-        })
-      },
+          numNameArr: ['投产项目个数']
+        },
+        loading: false,
+        unitList: [],
+        flags: false,
+        lb_value: '2021', // 柱状图类别
+      }
+    },
+    components: {
+      echarts
+    },
+    mounted() {
+      this.getList()
+      this.bd_btn()
+      this.eharts_fn()
+    },
+    methods: {
+      picher_fn() {
+        this.eharts_fn()
+      },
+      eharts_fn(val) {
+        getProjectInvestmentEharts({
+          year: this.lb_value
+        }).then(res => {
+          this.ehaersList = res.data
+          this.flags = true
+        })
+      },
       bd_btn() {
-        console.log(222)
-        setInvestmentList().then(res => {
-          this.unitList = res.rows
-        })
-      },
-      dec_btn(row) {
+        console.log(222)
+        setInvestmentList().then(res => {
+          this.unitList = res.rows
+        })
+      },
+      dec_btn(row) {
         this.$router.push({
           path: '/management/row/index',
           query: {
@@ -120,64 +120,64 @@
             setrd: row.projectStatus,
             tabIndex: 4,
           },
-        })
-      },
+        })
+      },
       bh_brn(scope) {
-        const _this =  this
-        this.$confirm('是否确认销号', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          delProject(scope.id).then(() => {
-            _this.getList();
-            _this.msgSuccess("提交成功");
-          })
-        })
-      },
+        const _this =  this
+        this.$confirm('是否确认销号', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          delProject(scope.id).then(() => {
+            _this.getList();
+            _this.msgSuccess("提交成功");
+          })
+        })
+      },
       infoBtn(scope) {
-        const _this = this
-        this.$confirm('是否确认提交申请', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          setExamine({
-            code: 1,
-            bmProjectId: scope.id
-          });
-        }).then(() => {
-          _this.getList();
-          _this.msgSuccess("提交成功");
-        })
-      },
-      getList() {
-        getStatisticst('8,9').then(res => {
-          this.infoList = res.rows
-        })
-      },
-    }
-  }
-</script>
-<style lang="scss" scoped>
-  .rig_tab_top {
-    display: flex;
-    background: #6DCEF6;
-    line-height: 36px;
-    color: #fff;
-
-    .rig_tab_item {
-      font-size: 14px;
-      flex: 1;
-      text-align: center;
-    }
-  }
-
-  .rig_cont {
-    border: 1px solid #CDCDCD;
-    box-sizing: border-box;
-    margin-bottom: 31px;
-    max-height: 270px;
+        const _this = this
+        this.$confirm('是否确认提交申请', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          setExamine({
+            code: 1,
+            bmProjectId: scope.id
+          });
+        }).then(() => {
+          _this.getList();
+          _this.msgSuccess("提交成功");
+        })
+      },
+      getList() {
+        getStatisticst('8,9').then(res => {
+          this.infoList = res.rows
+        })
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .rig_tab_top {
+    display: flex;
+    background: #6DCEF6;
+    line-height: 36px;
+    color: #fff;
+
+    .rig_tab_item {
+      font-size: 14px;
+      flex: 1;
+      text-align: center;
+    }
+  }
+
+  .rig_cont {
+    border: 1px solid #CDCDCD;
+    box-sizing: border-box;
+    margin-bottom: 31px;
+    max-height: 270px;
     overflow-y: auto;
     scrollbar-width: none;
     /* firefox */
@@ -187,65 +187,65 @@
     &::-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;
-
-      .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;
-        }
-
-      }
-    }
-  }
+    }
+
+    .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;
+
+      .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/statistical/sign/index.vue

@@ -9,7 +9,7 @@
               <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="['project:statistics:query']"
+                  <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:query']"
                     @click="dec_btn(scope.row)">查看详情</el-button>
                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
                     @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交':'驳回'}}</el-button>

ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -1,122 +1,122 @@
-<template>
-  <div class="in_box">
-    <el-row>
-      <el-col :span="18">
-        <div class="in_left">
-          <div class="toReviewed">
-            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
-              <el-table-column label="项目名称" align="center" prop="name" />
-              <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="['project:statistics:query']"
-                    @click="dec_btn(scope.row)">查看详情</el-button>
-                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
-                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
-                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
-              目标任务
-            </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.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
-              <span>{{item.successMission?item.successMission:0}}个</span>
-            </div>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-  import echarts from '@/components/Echarts/index.vue'
-  import {
-    getStatisticst,
-    delProject,
-    toBeReviewedList,
-    setExamine,
-    setReject,
-    setUnitAmountList,
-    getProjectUnitAmountEharts
-  } from '@/api/statistical'
-  export default {
-    data() {
-      return {
-        infoList: [],
-        zjList: [],
-        ehaersList: {},
-        echartData: {
-          name: '到资金额柱状图',
+<template>
+  <div class="in_box">
+    <el-row>
+      <el-col :span="18">
+        <div class="in_left">
+          <div class="toReviewed">
+            <el-table v-loading="loading" style="max-height: 695px;overflow-y: auto;" :data="infoList">
+              <el-table-column label="项目名称" align="center" prop="name" />
+              <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="['projectInfo:info:query']"
+                    @click="dec_btn(scope.row)">查看详情</el-button>
+                  <!-- <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @click="infoBtn(scope.row)" v-if="scope.row.projectStatus%2==1">提交</el-button>
+                  <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+                    @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 :ehaersList="ehaersList" :echartData="echartData" 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">
+              目标任务
+            </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.targetInvestmentNum?item.targetInvestmentNum:0}}个</span>
+              <span>{{item.successMission?item.successMission:0}}个</span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+  import echarts from '@/components/Echarts/index.vue'
+  import {
+    getStatisticst,
+    delProject,
+    toBeReviewedList,
+    setExamine,
+    setReject,
+    setUnitAmountList,
+    getProjectUnitAmountEharts
+  } from '@/api/statistical'
+  export default {
+    data() {
+      return {
+        infoList: [],
+        zjList: [],
+        ehaersList: {},
+        echartData: {
+          name: '到资金额柱状图',
           numName: '到资金额',
-          numNameArr: ['到资金额']
-        },
-        loading: false,
-        unitList: [],
-        flags: false,
-        lb_value: '2021', // 柱状图类别
-      }
-    },
-    components: {
-      echarts
-    },
-    mounted() {
-      this.getList()
-      this.bd_btn()
-      this.zht_fn()
-      this.eharts_fn()
-    },
-    methods: {
-      picher_fn() {
-        this.eharts_fn()
-      },
-      eharts_fn(val) {
-        getProjectUnitAmountEharts({
-          year: this.lb_value
-        }).then(res => {
-          this.ehaersList = res.data
-          this.flags = true
-        })
-      },
-      zht_fn() {
-
-      },
+          numNameArr: ['到资金额']
+        },
+        loading: false,
+        unitList: [],
+        flags: false,
+        lb_value: '2021', // 柱状图类别
+      }
+    },
+    components: {
+      echarts
+    },
+    mounted() {
+      this.getList()
+      this.bd_btn()
+      this.zht_fn()
+      this.eharts_fn()
+    },
+    methods: {
+      picher_fn() {
+        this.eharts_fn()
+      },
+      eharts_fn(val) {
+        getProjectUnitAmountEharts({
+          year: this.lb_value
+        }).then(res => {
+          this.ehaersList = res.data
+          this.flags = true
+        })
+      },
+      zht_fn() {
+
+      },
       bd_btn() {
-        console.log(222)
-        setUnitAmountList().then(res => {
-          this.unitList = res.rows
-        })
-      },
-      dec_btn(row) {
+        console.log(222)
+        setUnitAmountList().then(res => {
+          this.unitList = res.rows
+        })
+      },
+      dec_btn(row) {
         this.$router.push({
           path: '/management/row/index',
           query: {
@@ -124,64 +124,64 @@
             setrd: row.projectStatus,
             tabIndex: 3,
           },
-        })
-      },
+        })
+      },
       bh_brn(scope) {
-        const _this = this
-        this.$confirm('是否确认销号', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          delProject(scope.id).then(() => {
-            _this.getList();
-            _this.msgSuccess("提交成功");
-          })
-        })
-      },
+        const _this = this
+        this.$confirm('是否确认销号', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          delProject(scope.id).then(() => {
+            _this.getList();
+            _this.msgSuccess("提交成功");
+          })
+        })
+      },
       infoBtn(scope) {
-        const _this = this
-        this.$confirm('是否确认提交申请', "提醒", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          setExamine({
-            code: 1,
-            bmProjectId: scope.id
-          });
-        }).then(() => {
-          _this.getList();
-          _this.msgSuccess("提交成功");
-        })
-      },
-      getList() {
-        getStatisticst('6,7').then(res => {
-          this.infoList = res.rows
-        })
-      },
-    }
-  }
-</script>
-<style lang="scss" scoped>
-  .rig_tab_top {
-    display: flex;
-    background: #6DCEF6;
-    line-height: 36px;
-    color: #fff;
-
-    .rig_tab_item {
-      font-size: 14px;
-      flex: 1;
-      text-align: center;
-    }
-  }
-
-  .rig_cont {
-    border: 1px solid #CDCDCD;
-    box-sizing: border-box;
-    margin-bottom: 31px;
-    max-height: 270px;
+        const _this = this
+        this.$confirm('是否确认提交申请', "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          setExamine({
+            code: 1,
+            bmProjectId: scope.id
+          });
+        }).then(() => {
+          _this.getList();
+          _this.msgSuccess("提交成功");
+        })
+      },
+      getList() {
+        getStatisticst('6,7').then(res => {
+          this.infoList = res.rows
+        })
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .rig_tab_top {
+    display: flex;
+    background: #6DCEF6;
+    line-height: 36px;
+    color: #fff;
+
+    .rig_tab_item {
+      font-size: 14px;
+      flex: 1;
+      text-align: center;
+    }
+  }
+
+  .rig_cont {
+    border: 1px solid #CDCDCD;
+    box-sizing: border-box;
+    margin-bottom: 31px;
+    max-height: 270px;
     overflow-y: auto;
     scrollbar-width: none;
     /* firefox */
@@ -191,65 +191,65 @@
     &::-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;
-
-      .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;
-        }
-
-      }
-    }
-  }
+    }
+
+    .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;
+
+      .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>