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

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

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', {

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'