合规认证计划增加字段

jero-web/src/common/lang/en-us.js

@@ -1825,4 +1825,5 @@ module.exports = {
   parameterCollectionProgress:'Parameter Collection Progress',
   proportion:'Proportion',
   projectProgressStatistics:'Project Progress Statistics',
+  GRPSystemProjectProgressStatistics:'GRP system project progress statistics',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1927,4 +1927,5 @@ module.exports = {
   parameterCollectionProgress:'参数收集进度',
   proportion:'占比',
   projectProgressStatistics:'项目进度统计',
+  GRPSystemProjectProgressStatistics:'GRP系统项目进度统计',
 }

jero-web/src/views/projectManagement/components/settingList.vue

@@ -165,6 +165,150 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G0">
+                G0</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gZero">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G0'"
+                               @change="dateChange({db_field_name:'gZero'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gZero"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G1">
+                G1</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gOne">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G1'"
+                               @change="dateChange({db_field_name:'gOne'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gOne"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G2">
+                G2</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gTwo">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G2'"
+                               @change="dateChange({db_field_name:'gTwo'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gTwo"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G3">
+                G3</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gThree">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G3'"
+                               @change="dateChange({db_field_name:'gThree'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gThree"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G4">
+                G4</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gFour">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G4'"
+                               @change="dateChange({db_field_name:'gFour'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gFour"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G5">
+                G5</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gFive">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G5'"
+                               @change="dateChange({db_field_name:'gFive'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gFive"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G6">
+                G6</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gSix">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G6'"
+                               @change="dateChange({db_field_name:'gSix'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gSix"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" title="G7">
+                G7</span>
+              </div>
+              <a-form-model-item class="itemModel" prop="gSeven">
+                <a-date-picker class="box-input"
+                               :placeholder="$t('PleaseSelect')+'G7'"
+                               @change="dateChange({db_field_name:'gSeven'})"
+                               format="YYYY-MM-DD"
+                               :getCalendarContainer="(trigger) => trigger.parentNode"
+                               v-model="formInline.gSeven"
+                               :disabled="false"
+                               style="width: 100%"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
         </a-row>
       </a-form-model>
     </a-spin>

jero-web/src/views/projectManagement/projectStatusBoard/index.vue

@@ -71,8 +71,9 @@
     <div class="box-top">
       <!--      <span class="box-top-text">{{ $t('regulatoryCertificationTaskPlan') }}</span>-->
       <!--      <span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{ $t('fullScreenView') }}</span>-->
-      <span style="float: right" class="box-top-text-right">
+      <span style="float: right" @click="handleExport" class="box-top-text-right">
-
+              <a-icon type="export" :rotate="-90"/>
+                {{ $t('export') }}
       </span>
       <div class="box-top-content" style="position: relative">
         <!--        <div id="main"></div>-->
@@ -483,7 +484,7 @@
           for (let i = 0; i < timeData.length; i++) {
             for (let j = 0; j < timeData[i].data[0].length; j++) {
               for (let k = 0; k < dataList.length; k++) {
-                let num = (Math.floor(clientWidth / 30 * 10000)/10000) * parseInt(timeData[i].data[0][j].time.slice(8, 10))
+                let num = (Math.floor(clientWidth / 30 * 10000) / 10000) * parseInt(timeData[i].data[0][j].time.slice(8, 10))
                 timeList.forEach((res, index) => {
                   if (timeData[i].data[0][j].time.slice(0, 7) == res.slice(0, 7)) {
                     timeData[i].data[0][j].left = 'left:' + ((clientWidth * index + num) - 10) + 'px'
@@ -496,15 +497,15 @@
           contentRightXian[0].style = 'display:none'
           let clientWidthOne = dataList[0].clientWidth
           clientWidthOne = clientWidthOne / length
-          let num = (Math.floor(clientWidthOne / 30 * 10000)/10000) * parseInt(this.handlingTime.slice(8, 10))
+          let num = (Math.floor(clientWidthOne / 30 * 10000) / 10000) * parseInt(this.handlingTime.slice(8, 10))
           timeList.forEach((res, index) => {
             if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) {
               if (timeList.length - 1 == index) {
-                contentRightText[0].style = 'left:' + ((clientWidthOne * index + num)-84) + 'px;' + 'display:block;border-radius: 2px 0 2px 2px;'
+                contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 84) + 'px;' + 'display:block;border-radius: 2px 0 2px 2px;'
-              }else{
+              } else {
-                contentRightText[0].style = 'left:' + ((clientWidthOne * index + num)+2) + 'px;' + 'display:block;border-radius: 2px 2px 2px 0;'
+                contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) + 2) + 'px;' + 'display:block;border-radius: 2px 2px 2px 0;'
               }
-              contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num)+2) + 'px;' + 'display:block'
+              contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 2) + 'px;' + 'display:block'
             }
           })
 
@@ -558,6 +559,15 @@
           query: item
         })
         window.open(newUrl.href, '_blank')
+      },
+      //导出
+      handleExport() {
+        let query = {
+          ...this.queryParam,
+          startTime: this.startTime || this.getNewDate('before', 6),
+          endTime: this.endTime || this.getNewDate('after', 5)
+        }
+        downloadFile(this.url.exportData, this.$t('GRPSystemProjectProgressStatistics') + '.xls', query, this.Deselect)
       }
     }
   }
@@ -657,9 +667,11 @@
   .box-top-text-right {
     display: inline-block;
     float: right;
-    height: 10px;
+    height: 30px;
-    width: 300px;
+    text-align: right;
+    margin-right: 16px;
     margin-top: -4px;
+    cursor: pointer;
   }
 
   .fullScreenView {
@@ -874,7 +886,8 @@
       position: absolute;
       top: 48px;
     }
-    .process-content-right-xian-color{
+
+    .process-content-right-xian-color {
       height: 28px;
       width: 100%;
       position: absolute;
@@ -882,6 +895,7 @@
       background: linear-gradient(90deg, rgba(0, 179, 190, 0.12) 0%, rgba(4, 11, 41, 0.02) 100%);
       transform: matrix(-1, 0, 0, 1, 0, 0);
     }
+
     .process-content-right-xian-one {
       height: 1px;
       width: 100%;