From c716485fad914cb239bb6bd771055a114659a1d7 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 16 May 2022 18:24:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryBaseEOServiceImpl.java |  5 -----
 .../service/impl/DummyInventoryInfoEOServiceImpl.java | 11 ++++++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 0439e3de1..5fe194ce3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -336,11 +336,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                             DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
                             sameinfoCJList.add(sameInfoCJ);
                         }
-                       /* for (String sameSerialNumber : sameSerialNumberList) {
-                            //查询数据库里包含共有编号的数据
-                            DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
-                            sameinfoCJList.add(sameInfoCJ);
-                        }*/
                     }
                 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 7323668e8..5aabcb80d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -1154,10 +1154,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 			FileUnZip.deleteDir(saveDirectory);
 			throw new JeroBootException(html);
 		} else {
+			StringBuilder serialNumberBuilder = new StringBuilder();
 			if (dataList.size() != 0) {
 				this.saveBatch(dataList);
 
-				//////
+				//更新log
+				for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList){
+					serialNumberBuilder.append(dummyInventoryInfoEO.getSerialNumber()).append(",");
+				}
+				String serialNumber = serialNumberBuilder.substring(0, serialNumberBuilder.length() - 1);
+				LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				String username = sysUser.getUsername();
+				String contentLog = username+"向清单中添加了标准\""+serialNumber+"\"";
+				updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId());
 			}
 		}
 	}

From 4ed972b0f805cdf7ffa26b3bcbb438cf377e341b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 17 May 2022 09:27:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../views/documentManage/library/index.vue    |   2 +-
 .../documentManage/tags/tabs/TagContent.vue   |   2 +-
 .../documentManage/tags/tabs/TagItem.vue      |   2 +-
 .../views/documentTools/virtualList/index.vue |   2 +-
 .../projectLibrary/index.vue                  |   2 +-
 .../projectStatusBoard/index.vue              | 132 ++++++++++++++++--
 8 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 98b8dcebb..68886a566 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -832,4 +832,5 @@ module.exports = {
   preHomeConfirmProgress:'Pre-Home confirm progress',
   verificationComplianceConfirmationProgress:'Verification compliance confirmation progress',
   totalTable:'Total',
+  newlyAdded:'Newly Added',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index b85da3a08..2c8d7d0d5 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -56,6 +56,7 @@ module.exports = {
   no: '没有任何',
   click: '点击',
   add: '添加',
+  newlyAdded:'新增',
   FilterMatching: '过滤条件匹配',
   AllMatching: '（所有条件都要求匹配）',
   AnyOneMatches: '（条件中的任意一个匹配）',
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index c6e4c4b0d..fcc51ac14 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -29,7 +29,7 @@
       </div>
       <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
         <a-icon type="plus"/>
-        {{$t('add')}}
+        {{$t('newlyAdded')}}
       </div>
     </div>
     <div>
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
index df330eb61..a260dd7c8 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue
@@ -20,7 +20,7 @@
       <div class="table-operator">
         <div class="operator-text" @click="handleAdd" v-has="'dict:add'">
           <a-icon type="plus" />
-          {{$t('add')}}
+          {{$t('newlyAdded')}}
         </div>
         <div class="operator-text" @click="batDelete" v-has="'dict:logicDeleteBatch'">
           <a-icon type="delete" />
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
index b76aeb093..fcd00fd36 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
@@ -32,7 +32,7 @@
     <div class="table-operator">
       <div class="operator-text" @click="handleAddPop" v-has="'tag:add'">
           <a-icon type="plus" />
-          {{$t('add')}}
+          {{$t('newlyAdded')}}
       </div>
       <div class="operator-text" @click="handleShow" v-if="key=='1'">
         <a-icon type="rocket" :rotate="45" />
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue
index d4200ae46..95e35e94f 100644
--- a/jero-web/src/views/documentTools/virtualList/index.vue
+++ b/jero-web/src/views/documentTools/virtualList/index.vue
@@ -33,7 +33,7 @@
     <div class="table-operator">
       <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
         <a-icon type="plus"/>
-        {{$t('add')}}
+        {{$t('newlyAdded')}}
       </div>
       <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
         <a-icon type="delete"/>
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 8726d8987..743c8f69e 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -98,7 +98,7 @@
     <div class="table-operator">
       <div @click="handleAdd" class="operator-text" v-has="'document:getInfoById'">
         <a-icon type="plus"/>
-        {{$t('add')}}
+        {{$t('newlyAdded')}}
       </div>
       <div @click="handleDel" class="operator-text" v-has="'document:deleteBatch'">
         <a-icon type="delete"/>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index 472613501..c72ba24cc 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -4,22 +4,22 @@
       <a-row :gutter="24">
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('standard')">
-              <span>{{$t('standard')}}</span>
+            <div class="title-text" :title="$t('entryName')">
+              <span>{{$t('entryName')}}</span>
             </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.serialNumber"></j-input>
+            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
+                     v-model="queryParam.projectName"></j-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
-              <span>{{$t('areaOfResponsibility')}}</span>
+            <div class="title-text" :title="$t('targetMarket')">
+              <span>{{$t('targetMarket')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                               :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+            <j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
+                               :placeholder="$t('PleaseSelect')+$t('targetMarket')"
                                :type="'select'"
-                               :triggerChange="false" :dictCode="'duty_territory'"/>
+                               :triggerChange="false" :dictCode="'region'"/>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -33,7 +33,9 @@
     <div class="box-top">
       <span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span>
       <div class="box-top-content">
+        <div id="main">
 
+        </div>
       </div>
     </div>
     <div class="box-bottom">
@@ -84,6 +86,7 @@
 
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import * as echarts from 'echarts'
 
   export default {
     name: 'index',
@@ -156,22 +159,114 @@
     },
     mounted() {
       this.getList()
+      this.getEcharts()
     },
     methods: {
       searchQuery() {
-
+        this.getList()
       },
       searchReset() {
-
+        this.queryParam = {}
+        this.getList()
       },
       getList() {
-        getAction(this.url.list, {}).then((res) => {
+        this.loading = true
+        getAction(this.url.list, this.queryParam).then((res) => {
           if (res.success) {
+            this.loading = false
             this.dataSource = res.result || []
           } else {
+            this.loading = false
             this.dataSource = []
           }
         })
+      },
+      getEcharts() {
+        var chartDom = document.getElementById('main')
+        var myChart = echarts.init(chartDom)
+        var option
+
+// prettier-ignore
+        const hours = [
+          '12a', '1a', '2a', '3a', '4a', '5a', '6a',
+          '7a', '8a', '9a', '10a', '11a',
+          '12p', '1p', '2p', '3p', '4p', '5p',
+          '6p', '7p', '8p', '9p', '10p', '11p'
+        ]
+// prettier-ignore
+        const days = [
+          'Saturday', 'Friday', 'Thursday',
+          'Wednesday', 'Tuesday', 'Monday', 'Sunday'
+        ]
+// prettier-ignore
+        const data = [[0, 5, 2], [0, 1, 1], [0, 2, 0], [0, 3, 0], [0, 4, 0],
+          [0, 5, 0], [0, 6, 0], [0, 7, 0], [0, 8, 0], [0, 9, 0], [0, 10, 0],
+          [0, 11, 2], [0, 12, 4], [0, 13, 1], [0, 14, 1], [0, 15, 3],
+          [0, 16, 4], [0, 17, 6], [0, 18, 4], [0, 19, 4], [0, 20, 3], [0, 21, 3],
+          [0, 22, 2], [0, 23, 5], [1, 0, 7], [1, 1, 0], [1, 2, 0],
+          [1, 3, 0], [1, 4, 0], [1, 5, 0], [1, 6, 0], [1, 7, 0], [1, 8, 0], [1, 9, 0],
+          [1, 10, 5], [1, 11, 2], [1, 12, 2], [1, 13, 6], [1, 14, 9],
+          [1, 15, 11], [1, 16, 6], [1, 17, 7], [1, 18, 8], [1, 19, 12], [1, 20, 5],
+          [1, 21, 5], [1, 22, 7], [1, 23, 2], [2, 0, 1], [2, 1, 1], [2, 2, 0],
+          [2, 3, 0], [2, 4, 0], [2, 5, 0], [2, 6, 0], [2, 7, 0], [2, 8, 0], [2, 9, 0],
+          [2, 10, 3], [2, 11, 2], [2, 12, 1], [2, 13, 9], [2, 14, 8], [2, 15, 10], [2, 16, 6],
+          [2, 17, 5], [2, 18, 5], [2, 19, 5], [2, 20, 7], [2, 21, 4], [2, 22, 2], [2, 23, 4],
+          [3, 0, 7], [3, 1, 3], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [3, 6, 0], [3, 7, 0],
+          [3, 8, 1], [3, 9, 0], [3, 10, 5], [3, 11, 4], [3, 12, 7], [3, 13, 14], [3, 14, 13],
+          [3, 15, 12], [3, 16, 9], [3, 17, 5], [3, 18, 5], [3, 19, 10], [3, 20, 6], [3, 21, 4],
+          [3, 22, 4], [3, 23, 1], [4, 0, 1], [4, 1, 3], [4, 2, 0], [4, 3, 0], [4, 4, 0],
+          [4, 5, 1], [4, 6, 0], [4, 7, 0], [4, 8, 0], [4, 9, 2], [4, 10, 4], [4, 11, 4],
+          [4, 12, 2], [4, 13, 4], [4, 14, 4], [4, 15, 14], [4, 16, 12], [4, 17, 1], [4, 18, 8],
+          [4, 19, 5], [4, 20, 3], [4, 21, 7], [4, 22, 3], [4, 23, 0], [5, 0, 2], [5, 1, 1],
+          [5, 2, 0], [5, 3, 3], [5, 4, 0], [5, 5, 0], [5, 6, 0], [5, 7, 0], [5, 8, 2], [5, 9, 0],
+          [5, 10, 4], [5, 11, 1], [5, 12, 5], [5, 13, 10], [5, 14, 5], [5, 15, 7], [5, 16, 11],
+          [5, 17, 6], [5, 18, 0], [5, 19, 5], [5, 20, 3], [5, 21, 4], [5, 22, 2], [5, 23, 0],
+          [6, 0, 1], [6, 1, 0], [6, 2, 0], [6, 3, 0], [6, 4, 0], [6, 5, 0], [6, 6, 0], [6, 7, 0],
+          [6, 8, 0], [6, 9, 0], [6, 10, 1], [6, 11, 0], [6, 12, 2], [6, 13, 1], [6, 14, 3], [6, 15, 4],
+          [6, 16, 0], [6, 17, 0], [6, 18, 0], [6, 19, 0], [6, 20, 1], [6, 21, 2], [6, 22, 2], [6, 23, 6]]
+        const title = []
+        const singleAxis = []
+        const series = []
+        days.forEach(function(day, idx) {
+          title.push({
+            textBaseline: 'middle',
+            top: ((idx + 0.5) * 100) / 7 + '%',
+            text: day
+          })
+          singleAxis.push({
+            left: 150,
+            type: 'category',
+            boundaryGap: false,
+            data: hours,
+            top: (idx * 100) / 7 + 5 + '%',
+            height: 100 / 7 - 10 + '%',
+            axisLabel: {
+              interval: 2
+            }
+          })
+          series.push({
+            singleAxisIndex: idx,
+            coordinateSystem: 'singleAxis',
+            type: 'scatter',
+            data: [],
+            symbolSize: function(dataItem) {
+              return dataItem[1] * 4
+            }
+          })
+        })
+        data.forEach(function(dataItem) {
+          series[dataItem[0]].data.push([dataItem[1], dataItem[2]])
+        })
+        option = {
+          tooltip: {
+            position: 'top'
+          },
+          title: title,
+          singleAxis: singleAxis,
+          series: series
+        }
+
+        option && myChart.setOption(option)
       }
     }
   }
@@ -188,7 +283,7 @@
   }
 
   .title-text {
-    width: 32px;
+    width: 70px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
@@ -219,7 +314,16 @@
   .box-top-content {
     width: 100%;
     height: 400px;
-    background: #9e9e9e;
     margin-bottom: 20px;
+    overflow: auto;
+  }
+
+  .box-button {
+    height: 38px;
+  }
+
+  #main {
+    width: 100%;
+    height: 200%;
   }
 </style>
\ No newline at end of file