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

src/App.vue

@@ -215,7 +215,7 @@ export default {
     height: 100%;
     overflow-y: auto;
     background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
-    background-size: 100%;
+    background-size: 100% 100%;
     & > div{
       position: absolute;
       top: 0;

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -542,14 +542,10 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        // region: '', // 区域
         countryArea: '', // 国家
         keywords: '', // 关键字
         detailedListName: '', //清单名称
         applyArctic: '', // 能源种类
-        // category: '', // 所属专业领域
-        // applyArctic: '', // 适用车型
-        // applyAuth: '', // 认证类型
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         accessSarType: 'SKILL', // 清单类型
@@ -1502,6 +1498,7 @@ export default {
     // 查询数据搜索 table 数据
     selectLawsStands () {
       if (this.isListType) {
+        console.log('1505');
         this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, {
           _this: this,
           loading: 'dataLoading'
@@ -1511,10 +1508,11 @@ export default {
         }, e => {
         })
       } else {
-        this.$http.get('lawss/sarSarAccess/page', this.sarAccessInfoSearch, {
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
           _this: this,
           loading: 'dataLoading'
         }, res => {
+          console.log(res.data.list);
           res.data.list[0].list.map(item => {
             item.newPutTextTime = null
             item.prodPutTextTime = null

src/sysConfig/index.js

@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.178'
+const devIp = '192.168.10.29'
-const devInterfacePORT = '9998'
+const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'