From f6be00c6538860811ba50ff968f94add8149fe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 9 Aug 2021 09:29:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sysConfig/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 8571d2d34..efe1b4c11 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = 'localhost'
+const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'

From 57bfa01e4453e3cf5efd72656e73ca53d995650d Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 9 Aug 2021 11:06:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/pages/details.vue            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index ffaa965d6..2c68a966a 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -30,7 +30,7 @@
             <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
           </el-row>
           <el-row style="margin-top: 10px">
-            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
+            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span
                 class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
             <el-col :span="5" :push="2">项目计划完成时间: <span
@@ -599,6 +599,7 @@ export default {
     showLocalProductData(item) {
       console.log(item)
       this.localProEO = JSON.parse(JSON.stringify(item))
+      console.log(this.localProEO)
       this.proId = this.localProEO.id
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfo', {

From f9f7715ce08db5a14ec73c0f3ad7d95a0ee3da4e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 9 Aug 2021 14:09:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84--=E5=AE=9E=E6=96=BD?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=9B=9E=E6=98=BE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 28e1db059..0201692f1 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -190,12 +190,14 @@
               </template>
             </el-table-column>
             <el-table-column
-                prop="XCXSSRQ"
-                sortable="putTime"
+                prop="SSRQ"
+                sortable="custom"
                 width="150px"
                 label="实施日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.putTime) }}
+<!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+
               </template>
             </el-table-column>
 
@@ -3509,6 +3511,10 @@ export default {
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
               res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
             }
+            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
+              res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
+              console.log(res.data.list[i].SSRQ);
+            }
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count