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

src/pages/home1/components/solicitopinions/index.vue

@@ -3,7 +3,7 @@
   <div class="solicitopinions">
     <ul>
       <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
-        <a class="title" :title="item.title" @click="standForComments(item)">{{ item.cname }}</a>
+        <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
         <span class="time">{{item.endTime}}</span>
       </li>
     </ul>
@@ -37,7 +37,6 @@ export default {
        this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, {
          _this: this
        }, res => {
-         console.log('41',res)
          this.domesticDynamics = res.data.records
        }, e => {
 

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2042,7 +2042,7 @@ export default {
           menuId: treeNode.id,
           idlist: this.selectedList.length ? this.selectedList : dragId
         }
-        this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, {
+        this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
           _this: this
         }, res => {
           if (res.ok) {
@@ -3172,7 +3172,7 @@ export default {
         })
       } else {
         search.idlist = this.selectConfigStand
-        this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, {
+        this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
           _this: this,
           loading: 'isSubmit'
         }, res => {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -236,7 +236,8 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
-      <table-tools-bar v-model="isAdvancedSearch">
+      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"
+                       @reset="clearAllSearch('sarStandardsSearch')">
         <div slot="content">
           <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
             <!--            标准号-->
@@ -258,39 +259,35 @@
                 :options="standSortOptions"
                 clearable/>
             </el-form-item>
-            <!--            标准状态-->
+            <!--            文本状态-->
             <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.standState" :placeholder="$t('m.lookupByStandardStatus')" clearable
+              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            代替标准号-->
             <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
+              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <search-select
-                v-model="sarStandardsSearch.applyArctic"
-                :placeholder="$t('m.searchAccordingToThApplicableModel')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="applyArcticOptions"
-                clearable/>
+              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            适用产品线（新增字段）-->
             <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
-              <search-select
-                v-model="sarStandardsSearch.category"
-                :placeholder="$t('m.searchByApplicableProductLine')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="categoryOptions"
-                clearable/>
+              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
             </el-form-item>
             <!--            关联模块（新增字段）-->
             <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.standNature" :placeholder="$t('m.SearchByAssociatedModule')" clearable
+              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
                 </el-option>
@@ -1004,7 +1001,7 @@ export default {
         standSort: '',
         standNumber: '',
         menuId: '',
-        advanceSearchVOStr: ''
+        sarStandardsSearch: ''
       },
       searching: false,
       stahndinfoList: [],
@@ -1748,9 +1745,9 @@ export default {
       this.getDomesticStandardTable()
     },
     // 搜索
-    getDomesticStandardTableBtn (advancedSearch) {
+    getDomesticStandardTableBtn (sarStandardsSearch) {
       this.standCommonlySearch.page = 1
-      this.standCommonlySearch.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
+      this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || ''
       this.getDomesticStandardTable(2)
     },
     // 清空搜索框
@@ -1979,7 +1976,7 @@ export default {
           menuId: treeNode.id,
           idlist: this.selectedList.length ? this.selectedList : dragId
         }
-        this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, {
+        this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
           _this: this
         }, res => {
           if (res.ok) {
@@ -2045,7 +2042,6 @@ export default {
             // this.$refs['sarStandardsInfoForm'].resetFields()
           })
           this.getOrgTreeSource()
-          // this.changeInlandSubclassVal()
           this.resolveFormFieldList()
           Promise.all([this.queryDisplayLocation()]).then((values) => {
             const [displayLocation] = values
@@ -2226,7 +2222,7 @@ export default {
             } else {
               this.importModalshowflag = true
               this.showUploadlist = true
-              this.importExcelUrl = '/api/lawss/sarStandardsInfo/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId
+              this.importExcelUrl = '/api/sarStandardsInfo/sar-standards-info/importZipStandardsInfo?standType=FOREIGN&menuId=' + menuId
             }
           } else {
             this.importModalshowflag = true
@@ -2417,7 +2413,7 @@ export default {
         data.standSort = ''
         data.standNumber = ''
       } else {
-        data.advanceSearchVOStr = ''
+        data.sarStandardsSearch = ''
       }
       const formData = {...data}
       formData.menuId = this.selectSarMenu.id
@@ -2441,6 +2437,7 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
+        console.log('2441',formData);
         this.isAdvancedSearch = false
         if (res.ok) {
           for (let i = 0; i < res.data.list.length; i++) {
@@ -2475,7 +2472,7 @@ export default {
       this.sarConfigStandSearch.page = this.configPage
       // this.sarConfigStandSearch.pageSize = this.configRows
       this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
         _this: this,
         loading: 'loading'
       }, res => {
@@ -2490,18 +2487,6 @@ export default {
       }, e => {
       })
     },
-    changeInlandSubclassVal () {
-      this.sarStandardsInfoEO.standSort = ''
-      this.$http.get('sys/dictype/pageStandClassify', {
-        dicTypeCode: 'CN'
-      }, {
-        _this: this
-      }, res => {
-        this.standSortOptions = res.data
-        this.standSortConfigOptions = res.data
-      }, e => {
-      })
-    },
     // 获取组织机构数据
     getOrgTreeSource () {
       this.$http.get('sys/org/getTree', {}, {
@@ -2654,7 +2639,7 @@ export default {
       //   this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
       //   (this.replaceStandNumForm.quoteIdList)
       // }
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, {
         _this: this
         // loading: 'lawsExplainQuoteFormLoading'
       }, res => {
@@ -2843,7 +2828,7 @@ export default {
       if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
         this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
       }
-      this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
         _this: this,
         loading: 'lawsExplainQuoteFormLoading'
       }, res => {
@@ -3090,7 +3075,7 @@ export default {
         })
       } else {
         search.idlist = this.selectConfigStand
-        this.$http.postData('lawss/sarStandardsInfo/saveStandardsMenu', search, {
+        this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
           _this: this,
           loading: 'isSubmit'
         }, res => {
@@ -3565,7 +3550,6 @@ export default {
       this.getGzzOption()
     }, e => {
     })
-    // this.changeInlandSubclassVal()
     this.getDomesticStandardTable()
     // 加载所有的部门
     this.getOrgTreeSource()

src/sysConfig/index.js

@@ -30,8 +30,8 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '39.98.140.126'
-const prodInterfacePORT = '10005'
+const prodIp = '101.36.227.25'
+const prodInterfacePORT = '8033'
 
 
 // 判断环境