yrik 4 роки тому
батько
коміт
d8a13bf373

+ 35 - 19
ruoyi-ui/src/views/area/index.vue

@@ -80,7 +80,7 @@
       <el-table-column label="15亿元以上" align="center" prop="projectFourNum" />
       <el-table-column label="20亿元以上" align="center" prop="projectFiveNum" />
       </el-table-column >
-      <el-table-column label="实际利用市外资金" align="center" prop="projectCityMoney" />
+      <el-table-column label="实际利用市外资金(亿元)" align="center" prop="projectCityMoney" />
       <el-table-column label="入省库项目(个数)" align="center" prop="projectProNum" />
       <el-table-column label="其中" align="center">
       <el-table-column label="十大新兴产业项目数(个数)" align="center" prop="projectRisNum" />
@@ -126,56 +126,63 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="200px">
         <el-form-item label="年份" prop="year">
-          <el-input v-model="form.year" placeholder="请输入年份" />
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            value-format="yyyy"
+            placeholder="选择年"
+            style="width: 100%;"
+          >
+          </el-date-picker>
         </el-form-item>
-        <el-form-item  label="新签约亿元以上项目数" prop="projectMillionNum">
+        <el-form-item  label="新签约亿元以上项目数(个数)" prop="projectMillionNum">
           <el-input v-model="form.projectMillionNum" placeholder="请输入新签约亿元以上项目数" />
         </el-form-item>
 
-        <el-form-item label="工业项目数" prop="projectIndustryNum">
+        <el-form-item label="工业项目数(个数)" prop="projectIndustryNum">
           <el-input v-model="form.projectIndustryNum" placeholder="请输入工业项目数" />
         </el-form-item>
-        <el-form-item label="1~5亿元项目" prop="projectOneNum">
+        <el-form-item label="1~5亿元项目(个数)" prop="projectOneNum">
           <el-input v-model="form.projectOneNum" placeholder="请输入1~5亿元项目" />
         </el-form-item>
-        <el-form-item label="5~10亿元项目" prop="projectTwoNum">
+        <el-form-item label="5~10亿元项目(个数)" prop="projectTwoNum">
           <el-input v-model="form.projectTwoNum" placeholder="请输入5~10亿元项目" />
         </el-form-item>
-        <el-form-item label="10亿元以上" prop="projectThrNum">
+        <el-form-item label="10亿元以上(个数)" prop="projectThrNum">
           <el-input v-model="form.projectThrNum" placeholder="请输入10亿元以上" />
         </el-form-item>
-        <el-form-item label="15亿元以上" prop="projectFourNum">
+        <el-form-item label="15亿元以上(个数)" prop="projectFourNum">
           <el-input v-model="form.projectFourNum" placeholder="请输入15亿元以上" />
         </el-form-item>
-        <el-form-item label="20亿元以上" prop="projectFiveNum">
+        <el-form-item label="20亿元以上(个数)" prop="projectFiveNum">
           <el-input v-model="form.projectFiveNum" placeholder="请输入20亿元以上" />
         </el-form-item>
 
-        <el-form-item label="实际利用市外资金" prop="projectCityMoney">
+        <el-form-item label="实际利用市外资金(亿元)" prop="projectCityMoney">
           <el-input v-model="form.projectCityMoney" placeholder="请输入实际利用市外资金" />
         </el-form-item>
-        <el-form-item label="入省库项目(个)" prop="projectProNum">
+        <el-form-item label="入省库项目(个)" prop="projectProNum">
           <el-input v-model="form.projectProNum" placeholder="请输入入省库项目(个数)" />
         </el-form-item>
-        <el-form-item label="十大新兴产业项目数(个)" prop="projectRisNum">
+        <el-form-item label="十大新兴产业项目数(个)" prop="projectRisNum">
           <el-input v-model="form.projectRisNum" placeholder="请输入十大新兴产业项目数(个数)" />
         </el-form-item>
-        <el-form-item label="现代服务业项目数(个)" prop="projectSerNum">
+        <el-form-item label="现代服务业项目数(个)" prop="projectSerNum">
           <el-input v-model="form.projectSerNum" placeholder="请输入现代服务业项目数(个数)" />
         </el-form-item>
-        <el-form-item label="15亿元以上项目数(个)" prop="projectProFiveNum">
+        <el-form-item label="15亿元以上项目数(个)" prop="projectProFiveNum">
           <el-input v-model="form.projectProFiveNum" placeholder="请输入15亿元以上项目数(个数)" />
         </el-form-item>
-        <el-form-item label="500强投资新注册公司数(个)" prop="projectInvestmentNum">
-          <el-input v-model="form.projectInvestmentNum" placeholder="请输入500强投资新注册公司数(个)" />
+        <el-form-item label="500强投资新注册公司数(个)" prop="projectInvestmentNum">
+          <el-input v-model="form.projectInvestmentNum" placeholder="请输入500强投资新注册公司数(个)" />
         </el-form-item>
-        <el-form-item label="入统(个)" prop="projectIntegrationNum">
+        <el-form-item label="入统(个)" prop="projectIntegrationNum">
           <el-input v-model="form.projectIntegrationNum" placeholder="请输入入统(个数)" />
         </el-form-item>
-        <el-form-item label="小升规(个)" prop="projectSmallNum">
+        <el-form-item label="小升规(个)" prop="projectSmallNum">
           <el-input v-model="form.projectSmallNum" placeholder="请输入小升规(个数)" />
         </el-form-item>
-        <el-form-item label="新入规(个)" prop="projectNewNum">
+        <el-form-item label="新入规(个)" prop="projectNewNum">
           <el-input v-model="form.projectNewNum" placeholder="请输入新入规(个数)" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -250,6 +257,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        projectMillionNum:[
+                  { required: true, message: '请输入新签约亿元以上项目', trigger: 'change' }
+                ],
+        targetArrivalAmount:[
+                  { required: true, message: '请输入当年新签约金额目标任务(万元)', trigger: 'change' }
+                ],
+        year: [
+                    { type: 'string', required: true, message: '请选择年份', trigger: 'change' }
+                  ],
       }
     };
   },

+ 3 - 0
ruoyi-ui/src/views/index.vue

@@ -210,6 +210,9 @@
       font-size: 14px;
       flex: 1;
       text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
   .rig_cont{

+ 3 - 0
ruoyi-ui/src/views/statistical/clue/index.vue

@@ -175,6 +175,9 @@
       font-size: 14px;
       flex: 1;
       text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 

+ 3 - 0
ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -170,6 +170,9 @@
       font-size: 14px;
       flex: 1;
       text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 

+ 3 - 0
ruoyi-ui/src/views/statistical/sign/index.vue

@@ -213,6 +213,9 @@
       font-size: 14px;
       flex: 1;
       text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 

+ 3 - 0
ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -173,6 +173,9 @@
       font-size: 14px;
       flex: 1;
       text-align: center;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }