Merge remote-tracking branch 'origin/fix_20230508' into fix_20230508

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

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

@@ -1830,4 +1830,5 @@ module.exports = {
   statisticalNodes:'Statistical Nodes',
   proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility',
   contentsearch:'Content Search',
+  masterProject:'Master Project',
 }

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

@@ -1931,4 +1931,5 @@ module.exports = {
   statisticalNodes:'统计节点',
   proportionWithInTheAreaOfResponsibility:'责任领域内占比',
   contentsearch:'内容搜索',
+  masterProject:'主项目',
 }

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -43,40 +43,39 @@
               </a-select>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <template v-if="toggleSearchStatus">
-            <div class="box-title-text">
+            <a-col :md="6" :sm="8">
-              <div class="title-text" :title="$t('standardNo')">
+              <div class="box-title-text">
-                <span>{{ $t('standardNo') }}</span>
+                <div class="title-text" :title="$t('standardNo')">
+                  <span>{{ $t('standardNo') }}</span>
+                </div>
+                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
+                         v-model="queryParam.serialNumber"></j-input>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
+            </a-col>
-                       v-model="queryParam.serialNumber"></j-input>
+            <a-col :md="6" :sm="8">
-            </div>
+              <div class="box-title-text">
-          </a-col>
+                <div class="title-text" :title="$t('statisticalNodes')">
-          <a-col :md="6" :sm="8">
+                  <span>{{ $t('statisticalNodes') }}</span>
-            <div class="box-title-text">
+                </div>
-              <div class="title-text" :title="$t('statisticalNodes')">
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                <span>{{ $t('statisticalNodes') }}</span>
+                          allowClear
-              </div>
+                          class="box-input"
-              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                          show-search
-                        allowClear
+                          optionFilterProp="label"
-                        class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        show-search
+                          v-model="queryParam.firstLevelDutyTerritory">
-                        optionFilterProp="label"
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                   :key="key"
-                        v-model="queryParam.firstLevelDutyTerritory">
+                                   :label="item.key"
-                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                   :value="item.key">
-                                 :key="key"
-                                 :label="item.key"
-                                 :value="item.key">
                                <span style="display: inline-block;width: 100%" :title=" item.key ">
                                      {{ item.key }}
                                </span>
-                </a-select-option>
+                  </a-select-option>
-              </a-select>
+                </a-select>
-            </div>
+              </div>
-          </a-col>
+            </a-col>
-          <template v-if="toggleSearchStatus">
-
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -85,10 +84,10 @@
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
                                        @handleSuperQuery="handleSuperQuery"
                                        :fieldList="fieldList"/>
-                 <!--                 <a @click="handleToggleSearch" style="margin-left: 8px">-->
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
-                 <!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+                    {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                 <!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 <!--                 </a>-->
+                  </a>
                </a-col>
             </span>
         </a-row>

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

@@ -68,29 +68,31 @@
               </a-input-group>
             </div>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <template v-if="toggleSearchStatus">
-            <div class="box-title-text">
+            <a-col :md="6" :sm="8">
-              <div class="title-text" :title="$t('statisticalNodes')">
+              <div class="box-title-text">
-                <span>{{ $t('statisticalNodes') }}</span>
+                <div class="title-text" :title="$t('statisticalNodes')">
-              </div>
+                  <span>{{ $t('statisticalNodes') }}</span>
-              <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                </div>
-                        allowClear
+                <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                        show-search
+                          allowClear
-                        class="box-input"
+                          show-search
-                        optionFilterProp="label"
+                          class="box-input"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          optionFilterProp="label"
-                        v-model="queryParam.firstLevelDutyTerritory">
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                          v-model="queryParam.firstLevelDutyTerritory">
-                                 :key="key"
+                  <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
-                                 :label="item.key"
+                                   :key="key"
-                                 :value="item.key">
+                                   :label="item.key"
+                                   :value="item.key">
                                <span style="display: inline-block;width: 100%" :title=" item.key ">
                                      {{ item.key }}
                                </span>
-                </a-select-option>
+                  </a-select-option>
-              </a-select>
+                </a-select>
-            </div>
+              </div>
-          </a-col>
+            </a-col>
+          </template>
           <!--          <template v-if="toggleSearchStatus">-->
           <!--            <a-col :md="6" :sm="8">-->
           <!--              <div class="box-title-text">-->
@@ -120,10 +122,10 @@
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"
                                        @handleSuperQuery="handleSuperQuery"
                                        :fieldList="fieldList"/>
-                 <!--                                  <a @click="handleToggleSearch" style="margin-left: 8px">-->
+                                                   <a @click="handleToggleSearch" style="margin-left: 8px">
-                 <!--                                             {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+                                                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                 <!--                                             <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+                                                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                 <!--                                  </a>-->
+                                                   </a>
                </a-col>
             </span>
         </a-row>
@@ -2860,12 +2862,16 @@
           }
           if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') {
             if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
-              this.requestsNum++
+              if (dataList[i].designDeliverableType == '1645667531513237506'){
-              this.startProcessList.push({
+
-                dataList: dataList[i],
+              }else{
-                type: 2,
+                this.requestsNum++
-                requestsNum: this.requestsNum
+                this.startProcessList.push({
-              })
+                  dataList: dataList[i],
+                  type: 2,
+                  requestsNum: this.requestsNum
+                })
+              }
               // _this.startProcess(dataList[i], 2, this.requestsNum)
             }
           } else {
@@ -2874,12 +2880,16 @@
           }
           if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
             if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
-              this.requestsNum++
+              if (dataList[i].verifyDeliverableType == '1645667531513237506'){
-              this.startProcessList.push({
+
-                dataList: dataList[i],
+              }else{
-                type: 4,
+                this.requestsNum++
-                requestsNum: this.requestsNum
+                this.startProcessList.push({
-              })
+                  dataList: dataList[i],
+                  type: 4,
+                  requestsNum: this.requestsNum
+                })
+              }
               // _this.startProcess(dataList[i], 4, this.requestsNum)
             }
           } else {

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

@@ -68,13 +68,21 @@
         </a-row>
       </a-form>
     </div>
-    <div class="box-top">
+    <div class="box-top" style="position: relative">
       <!--      <span class="box-top-text">{{ $t('regulatoryCertificationTaskPlan') }}</span>-->
       <!--      <span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{ $t('fullScreenView') }}</span>-->
       <span style="float: right" @click="handleExport" class="box-top-text-right">
               <a-icon type="export" :rotate="-90"/>
                 {{ $t('export') }}
       </span>
+      <div class="box-header-text">
+        <div class="box-header-text-text" @click="boxContentClick(0)">
+          {{$t('whole')}}
+        </div>
+        <div class="box-header-text-text" @click="boxContentClick(1)">
+          {{$t('masterProject')}}
+        </div>
+      </div>
       <div class="box-top-content" style="position: relative">
         <!--        <div id="main"></div>-->
         <!--        <div class="axis-tip"></div>-->
@@ -127,7 +135,7 @@
                      v-if="!val.g"
                      v-for="(val,indexTwo) in item.data[0]">
                   <!--                  <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{ val.name }}</div>-->
-                  <div class="process-content-right-button" :title="val.name">{{ val.name }}
+                  <div @click="statusClick(val)" class="process-content-right-button" :title="val.name">{{ val.name }}
                   </div>
                   <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
                     <template slot="title">
@@ -309,10 +317,19 @@
         ],
         startTime: undefined,
         endTime: undefined,
-        handlingTime: ''
+        handlingTime: '',
+        num:0,
       }
     },
     mounted() {
+      let boxContentTextColor = document.getElementsByClassName('box-header-text-color')
+      if (boxContentTextColor && boxContentTextColor.length > 0) {
+        boxContentTextColor[0].classList.remove('box-header-text-color')
+      }
+      let boxContentTextText = document.getElementsByClassName('box-header-text-text')
+      if (boxContentTextText && boxContentTextText.length > 0) {
+        boxContentTextText[0].classList.add('box-header-text-color')
+      }
       this.getList()
       this.getTimeline()
       this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
@@ -581,6 +598,17 @@
       },
       statusClick(val) {
         this.$refs.statisticsRef.getData(val)
+      },
+      boxContentClick(num) {
+        let boxContentTextColor = document.getElementsByClassName('box-header-text-color')
+        if (boxContentTextColor && boxContentTextColor.length > 0) {
+          boxContentTextColor[0].classList.remove('box-header-text-color')
+        }
+        let boxContentTextText = document.getElementsByClassName('box-header-text-text')
+        if (boxContentTextText && boxContentTextText.length > 0) {
+          boxContentTextText[num].classList.add('box-header-text-color')
+        }
+        this.num = num
       }
     }
   }
@@ -876,6 +904,7 @@
         font-weight: 400;
         color: #6F7385;
         position: absolute;
+        cursor: pointer;
         background: #fff;
         left: 50%;
         top: 36px;
@@ -950,4 +979,38 @@
     margin-top: 8px !important;
   }
 
+  .box-header-text {
+    height: 30px;
+    background: #F5F6F7;
+    border-radius: 4px;
+    position: absolute;
+    right: 88px;
+    top: -9px;
+    display: flex;
+    z-index: 116;
+    justify-content: space-between;
+    padding: 0 2px 0 2px;
+
+    .box-header-text-text {
+      display: inline-block;
+      font-size: 12px;
+      color: #6F7385;
+      line-height: 30px;
+      margin-right: 10px;
+      cursor: pointer;
+      margin-left: 10px;
+    }
+
+    .box-header-text-color {
+      box-shadow: 0px 1px 2px rgba(0, 0, 60, 0.01), 0px 2px 4px rgba(0, 22, 60, 0.02), 0px 4px 6px rgba(0, 22, 60, 0.0229458);
+      border-radius: 4px;
+      padding: 4px 6px;
+      background: #FFFFFF;
+      border: 1px solid #E6E7EC;
+      color: #01A0AC;
+      line-height: normal;
+      margin-right: 0;
+      margin-left: 0;
+    }
+  }
 </style>