From 448dab48dc26d10d06a12b1f144c259bc60daf78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Jun 2021 13:39:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=99=BB=E5=BD=9539?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/axios/index.js                     | 13 +--
 .../components/conferenceMaterials/index.vue  | 80 +++++++++++++++++++
 .../components/noticeOfMeeting/index.vue      | 23 ++++++
 src/pages/home1/index.vue                     | 12 ++-
 src/pages/login/index.vue                     | 14 +++-
 .../domesticStandardsAndRegulations/index.vue |  3 +-
 vue.config.js                                 |  7 ++
 7 files changed, 141 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/home1/components/conferenceMaterials/index.vue
 create mode 100644 src/pages/home1/components/noticeOfMeeting/index.vue

diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index bd1faa601..47a084bf8 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -89,7 +89,8 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    _axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => {
+    const prefix = config.prefix || '/api/'
+    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), _formData).then(res => {
       if (_this && loading) { _this[loading] = false }
       if (res.data.ok !== undefined && showTips) {
         let type = res.data.ok ? 'success' : 'warning'
@@ -131,7 +132,8 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    _axios.post(api() + url + '?' + new Date().getTime(), param).then(res => {
+    const prefix = config.prefix || '/api/'
+    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), param).then(res => {
       if (_this && loading) { _this[loading] = false }
       if (res.data.ok !== undefined && showTips) {
         let type = res.data.ok ? 'success' : 'warning'
@@ -170,7 +172,8 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    _axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => {
+    const prefix = config.prefix || '/api/'
+    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), _formData).then(res => {
       if (_this && loading) { _this[loading] = false }
       thenFun.call(this, res.data)
     }).catch(err => {
@@ -202,8 +205,8 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-
-    _axios.get(api() + url + '?_t=' + new Date().getTime(), { params: param, cancelToken: config.cancelToken }).then(res => {
+    const prefix = config.prefix || '/api/'
+    _axios.get(prefix + '/'  + url + '?_t=' + new Date().getTime(), { params: param, cancelToken: config.cancelToken }).then(res => {
       if (_this && loading) { _this[loading] = false }
       // 返回data对象
       if (res.ok !== undefined) {
diff --git a/src/pages/home1/components/conferenceMaterials/index.vue b/src/pages/home1/components/conferenceMaterials/index.vue
new file mode 100644
index 000000000..6b19ee5b2
--- /dev/null
+++ b/src/pages/home1/components/conferenceMaterials/index.vue
@@ -0,0 +1,80 @@
+<!--外部会议资料-->
+<template>
+  <div class="conference-materials">
+     <ul>
+       <li v-for="item in materialsList" :key="item.id"  class="time-title">
+         <a class="title" :title="item.title">{{item.name}}</a>
+         <span class="time">{{putTime}}</span>
+       </li>
+     </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ConferenceMaterials",
+  data () {
+    return {
+      putTime: '',
+      materialsList: [
+        {
+          id: 1,
+          name: '外部会议资料1',
+        },
+        {
+          id: 2,
+          name: '外部会议资料2',
+        },{
+          id: 3,
+          name: '外部会议资料3',
+        },
+        {
+          id: 4,
+          name: '外部会议资料4',
+        },
+
+      ], //会议资料数据
+    }
+  },
+  methods: {
+    //获取当前时间
+    getDate () {
+      var date = new Date()
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      var day = date.getDate()
+      if (month < 10) {
+        month = '0' + month
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      var nowDate = year + '-' + month + '-' + day
+      this.putTime = nowDate
+    }
+
+  },
+  mounted() {
+      this.getDate()
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.conference-materials {
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#FFFFFF;
+    }
+    a {
+      color: #FFFFFF;
+      &:hover {
+        color: #e9c851;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/home1/components/noticeOfMeeting/index.vue b/src/pages/home1/components/noticeOfMeeting/index.vue
new file mode 100644
index 000000000..9010bcc2d
--- /dev/null
+++ b/src/pages/home1/components/noticeOfMeeting/index.vue
@@ -0,0 +1,23 @@
+<!--会议通知-->
+<template>
+   <div class="notice-of-meeting">
+
+   </div>
+</template>
+
+<script>
+export default {
+  name: "NoticeOfMeeting",
+  data () {
+    return {
+
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+ .notice-of-meeting {
+
+ }
+</style>
diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue
index e0612529d..e7aa380ab 100644
--- a/src/pages/home1/index.vue
+++ b/src/pages/home1/index.vue
@@ -21,13 +21,19 @@
               class="home-tabs"
               @tab-click="handleTabClick"
             >
+              <el-tab-pane label="外部会议资料" name="conferenceMaterials">
+                <conference-materials></conference-materials>
+              </el-tab-pane>
+              <el-tab-pane label="会议通知" name="noticeOfMeeting">
+               <notice-of-meeting></notice-of-meeting>
+              </el-tab-pane>
               <el-tab-pane label="标准征求意见" name="solicitOpinions">
                 <solicitOpinions></solicitOpinions>
               </el-tab-pane>
               <el-tab-pane label="标准发布" name="release">
                 <release></release>
               </el-tab-pane>
-              <el-tab-pane label="资讯" name="realTimeInfo">
+              <el-tab-pane label="外部资讯" name="realTimeInfo">
                 <realTimeInfo></realTimeInfo>
               </el-tab-pane>
             </el-tabs>
@@ -55,6 +61,8 @@ import navMenu from './components/navMenu'
 import solicitOpinions from './components/solicitopinions'
 import todoList from './components/todoList'
 import Empennage from "./components/empennage"
+import noticeOfMeeting from "./components/noticeOfMeeting"
+import conferenceMaterials from "./components/conferenceMaterials"
 
 export default {
   name: 'Home',
@@ -66,6 +74,8 @@ export default {
     release,
     navMenu,
     todoList,
+    noticeOfMeeting,
+    conferenceMaterials,
   },
   mixins: [],
   data() {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 53de8eff5..16cf584c9 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -75,7 +75,8 @@ export default {
           password: PWD
         }, {
           _this: this,
-          loading: 'loading'
+          loading: 'loading',
+          prefix: '/foton'
         }, res => {
           if (res.ok) {
             const JSESSIONID = document.cookie
@@ -240,7 +241,8 @@ export default {
       return new Promise((resolve, reject) => {
         this.$http.get('person/userInfo/getByUserInfoCode', {
         }, {
-          _this: this
+          _this: this,
+          prefix: '/foton'
         }, res => {
           if (true) {
             resolve(res.data)
@@ -255,7 +257,10 @@ export default {
     // 获取用户头像
     getUserPic (attId) {
       return new Promise((resolve, reject) => {
-        this.$http.get('/att/attFile/' + attId, {}, {_this: this}, res => {
+        this.$http.get('/att/attFile/' + attId, {}, {
+          _this: this,
+          prefix: '/foton'
+        }, res => {
           resolve(res.data)
         }, e => {
           reject(e)
@@ -270,7 +275,8 @@ export default {
     getMenu () {
       return new Promise((resolve, reject) => {
         this.$http.get('userMenu', {}, {
-          _this: this
+          _this: this,
+          prefix: '/foton'
         }, res => {
           if (res.ok) {
             resolve(res.data)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index bda33b3c6..644b79a8e 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1878,7 +1878,8 @@ export default {
               this.sarMenu.parentIds = this.selectSarMenu.id
             }
             this.$http.post('lawss/sarMenu/addSarMenu', this.sarMenu, {
-              _this: this
+              _this: this,
+              prefix: '/foton'
             }, res => {
               this.selectMenu() // 新增成功后，更新二级菜单
               this.menuModalFlag = false
diff --git a/vue.config.js b/vue.config.js
index 40b40d896..762e30e77 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -91,6 +91,13 @@ module.exports = {
         pathRewrite: {
           '^/onlyOffice': '/api'
         }
+      },
+      '/foton': {
+        target: 'http://39.98.140.126:10005',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/foton': '/api'
+        }
       }
     }
   }

From fc66a89e5b60adb94f880308c4fa908997a5f04d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Jun 2021 13:44:27 +0800
Subject: [PATCH 2/4] commit

---
 src/common/axios/index.js                           | 13 +++++--------
 .../domesticStandardsAndRegulations/index.vue       |  3 +--
 vue.config.js                                       |  7 -------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 47a084bf8..bd1faa601 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -89,8 +89,7 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    const prefix = config.prefix || '/api/'
-    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), _formData).then(res => {
+    _axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => {
       if (_this && loading) { _this[loading] = false }
       if (res.data.ok !== undefined && showTips) {
         let type = res.data.ok ? 'success' : 'warning'
@@ -132,8 +131,7 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    const prefix = config.prefix || '/api/'
-    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), param).then(res => {
+    _axios.post(api() + url + '?' + new Date().getTime(), param).then(res => {
       if (_this && loading) { _this[loading] = false }
       if (res.data.ok !== undefined && showTips) {
         let type = res.data.ok ? 'success' : 'warning'
@@ -172,8 +170,7 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    const prefix = config.prefix || '/api/'
-    _axios.post(prefix + '/' + url + '?' + new Date().getTime(), _formData).then(res => {
+    _axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => {
       if (_this && loading) { _this[loading] = false }
       thenFun.call(this, res.data)
     }).catch(err => {
@@ -205,8 +202,8 @@ export default {
     if (_this) {
       _this[loading] = true
     }
-    const prefix = config.prefix || '/api/'
-    _axios.get(prefix + '/'  + url + '?_t=' + new Date().getTime(), { params: param, cancelToken: config.cancelToken }).then(res => {
+
+    _axios.get(api() + url + '?_t=' + new Date().getTime(), { params: param, cancelToken: config.cancelToken }).then(res => {
       if (_this && loading) { _this[loading] = false }
       // 返回data对象
       if (res.ok !== undefined) {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 644b79a8e..bda33b3c6 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1878,8 +1878,7 @@ export default {
               this.sarMenu.parentIds = this.selectSarMenu.id
             }
             this.$http.post('lawss/sarMenu/addSarMenu', this.sarMenu, {
-              _this: this,
-              prefix: '/foton'
+              _this: this
             }, res => {
               this.selectMenu() // 新增成功后，更新二级菜单
               this.menuModalFlag = false
diff --git a/vue.config.js b/vue.config.js
index 762e30e77..40b40d896 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -91,13 +91,6 @@ module.exports = {
         pathRewrite: {
           '^/onlyOffice': '/api'
         }
-      },
-      '/foton': {
-        target: 'http://39.98.140.126:10005',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/foton': '/api'
-        }
       }
     }
   }

From 44a3d0cd6351ce22a071949d807d927f5cafc64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Jun 2021 17:57:04 +0800
Subject: [PATCH 3/4] commit

---
 src/assets/languages/cn.js                    |  2 +-
 .../details/otherStandardDetails/index.vue    | 26 ++---
 .../home1/components/empennage/index.vue      | 57 +++++++++--
 .../domesticStandardsAndRegulations/index.vue | 97 ++++++++++---------
 4 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js
index 5e38c6dea..ce849b0be 100644
--- a/src/assets/languages/cn.js
+++ b/src/assets/languages/cn.js
@@ -63,7 +63,7 @@ export const m = {
   issueTime: '发布日期',
   putTime: '实施日期',
   standNatureShow: '标准性质',
-  standStateShow: '标准状态',
+  standStateShow: '文本状态',
   action: '操作',
   see: '查看',
   stand: '标准/文件性质',
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index a88f1d77d..1e9df0481 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -5,9 +5,6 @@
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
     </div>
-    <div class="details-fraction">
-      <span>9.5分</span>
-    </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
@@ -34,12 +31,12 @@
             <label
               title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
             >标准状态<i class="el-icon-warning-outline"></i>：</label>
-            <span style="color: #409EFF;">{{ sarStandardsInfoEO.standStateShow || '-' }}</span>
+            <span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
           </p>
           <p><label>标准发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>
-          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>
-          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>
+<!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
+<!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
+<!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
         </div>
       </div>
       <div
@@ -2378,6 +2375,8 @@ export default {
               // const { data: { STAND: data } } = res
               const { data = {} } = res
               this.formFieldListData = data[this.$route.params.pageType]
+              console.log('this.formFieldListData')
+              console.log(this.formFieldListData);
               // this.resolveFormFieldList()
               resolve(data[this.$route.params.pageType])
             } else {
@@ -2610,6 +2609,8 @@ export default {
         if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
           return
         }
+        console.log("displayLocation");
+        console.log(displayLocation);
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
           if (dynamicFormField) {
@@ -2801,17 +2802,6 @@ export default {
         width: 100%;
       }
     }
-    .details-fraction{
-      float: right;
-      width:270px;
-      height:80px;
-      line-height: 80px;
-      text-align: center;
-      font-size: 30px;
-      font-weight: bold;
-      color: #e88218;
-      margin-top: -80px;
-    }
     /deep/.details-content{
       /*padding: 0 67px;*/
       .details-content-modular{
diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue
index ed62d26ff..61bc7037d 100644
--- a/src/pages/home1/components/empennage/index.vue
+++ b/src/pages/home1/components/empennage/index.vue
@@ -2,14 +2,9 @@
 <template>
   <div class="link">
     <ul>
-      <li><a href="http://www.sac.gov.cn/">国家标准化管理委员会</a></li>
-      <li><a href="http://www.sac.gov.cn/">全国标准公共服务平台</a></li>
-      <li><a href="http://www.sac.gov.cn/">国家标准全文公开</a></li>
-      <li><a href="http://www.sac.gov.cn/">全国汽车标准化技术委员会</a></li>
-      <li><a href="http://www.sac.gov.cn/">交通运输标准化信息平台</a></li>
-      <li><a href="http://www.sac.gov.cn/">工信部装备工业发展中心</a></li>
-      <li><a href="http://www.sac.gov.cn/">中华人民共和国生态环境部</a></li>
-      <li><a href="">更多链接></a></li>
+      <li v-for="(link, index) in linkList" :key="index">
+        <a @click="openLinkUrl(link.newWebSite)" v-html="link.webName"></a>
+      </li>
     </ul>
   </div>
 </template>
@@ -20,12 +15,54 @@ export default {
   components: {},
   mixins: [],
   data() {
-    return {}
+    return {
+      linkList: [
+        {
+          newWebSite: 'http://www.sac.gov.cn/',
+          webName: '国家标准化管理委员会'
+        },
+        {
+          newWebSite: 'http://std.samr.gov.cn/',
+          webName: '全国标准公共服务平台'
+        },
+        {
+          newWebSite: 'http://www.catarc.org.cn/',
+          webName: '全国汽车标准化技术委员会'
+        },
+        {
+          newWebSite: 'http://jtst.mot.gov.cn/news/',
+          webName: '交通运输标准化信息平台'
+        },
+        {
+          newWebSite: 'http://www.miit-eidc.org.cn/',
+          webName: '工信部装备工业发展中心'
+        },
+        {
+          newWebSite: 'http://www.mee.gov.cn/',
+          webName: '中华人民共和国生态环境部'
+        },
+        {
+          newWebSite: '',
+          webName: '更多链接>'
+        }
+      ]
+    }
   },
   computed: {},
   watch: {},
   mounted() {},
-  methods: {},
+  methods: {
+    // 跳转链接
+    openLinkUrl (linkUri) {
+      let getHttp = linkUri.substring(0, 7)
+      let getHttps = linkUri.substring(0, 8)
+      if (getHttp === 'http://' || getHttps === 'https://') {
+        window.open(linkUri)
+      } else {
+        window.open('https://' + linkUri)
+      }
+    },
+  },
 }
 </script>
 
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index bda33b3c6..4a3275424 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -164,7 +164,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="XCXSSRQ"
+              prop="xcxssrq"
               sortable="custom"
               width="150px"
               label="新车型实施日期">
@@ -173,7 +173,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="ZCCSSRQ"
+              prop="zccssrq"
               sortable="custom"
               width="150px"
               label="在产车实施日期">
@@ -183,13 +183,13 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="standStateShow"
+              prop="textStatus"
               sortable="custom"
               width="120px"
-              label="标准状态">
+              label="文本状态">
               <template slot="header" slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
-                  <span>标准状态 <i class="el-icon-warning-outline"></i></span>
+                  <span>文本状态<i class="el-icon-warning-outline"></i></span>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -304,9 +304,9 @@
             </el-form-item>
             <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                           prop="standState" label-width="150px" class="add-form-item">
-              <template slot="label">标准状态<i class="el-icon-warning-outline"></i></template>
-              <el-select v-model="sarStandardsInfoEO.standState"
-                         placeholder="请选择标准状态"
+              <template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
+              <el-select v-model="sarStandardsInfoEO.textStatus"
+                         placeholder="请选择文本状态"
                          clearable>
                 <el-option
                   v-for="opt in standStateOptions"
@@ -559,8 +559,8 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standStateShow"
-            label="标准状态"
+            prop="textStatus"
+            label="文本状态"
             width="130"
             align="center">
           </el-table-column>
@@ -758,8 +758,8 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="standStateShow"
-                label="标准状态"
+                prop="textStatus"
+                label="文本状态"
                 width="200"
                 align="center">
               </el-table-column>
@@ -840,7 +840,8 @@
           <el-button size="mini" type="primary"  class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
         </div>
       </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">
 <!--            标准号-->
@@ -862,39 +863,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>
@@ -1012,7 +1009,7 @@ export default {
       standSortOptions: [], // 标准类别下拉框
       standSortConfigOptions: [], // 标准类别下拉框
       applyArcticOptions: [], // 适用车型下拉框
-      standStateOptions: [], // 标准状态下拉框
+      standStateOptions: [], // 文本状态下拉框
       standNatureOptions: [], // 标准性质下拉框
       adoptExtentOptions: [], // 采标程度下拉框
       emergyKindOptions: [], // 能源种类下拉框
@@ -1517,7 +1514,7 @@ export default {
         this.threeOptions = this.countryOptions
       } else if (val === 'stand_sort') {
         this.threeOptions = this.standSortOptions
-      } else if (val === 'stand_state') {
+      } else if (val === 'stand_state_show') {
         this.threeOptions = this.standStateOptions
       } else if (val === 'stand_nature') {
         this.threeOptions = this.standNatureOptions
@@ -1633,7 +1630,6 @@ export default {
       this.modalshowtitle = '编辑国内标准'
       this.modalshowflag = true
       this.resolveFormFieldList(item.isRelateAccess)
-
       this.$nextTick(() => {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
@@ -1799,13 +1795,19 @@ export default {
       this.getDomesticStandardTable(item)
     },
     // 搜索
-    getDomesticStandardTableBtn (advancedSearch) {
-      let item = {}
-      item.page = 1
-      item.advanceSearchStr = ''
-      item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
-      this.getDomesticStandardTable(item)
+    getDomesticStandardTableBtn (item) {
+       this.tableFlag = item
+       item.page = 1
+       item.sarStandardsSearch = ''
+       this.getDomesticStandardTable(item)
     },
+    // getDomesticStandardTableBtn (advancedSearch) {
+    //   let item = {}
+    //   item.page = 1
+    //   item.advanceSearchStr = ''
+    //   item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
+    //   this.getDomesticStandardTable(item)
+    // },
     // 清空搜索框
     clearAllSearch (flag) {
       if (flag === 'sarStandardsSearch') {
@@ -1849,9 +1851,8 @@ export default {
     },
     // 高级检索
     selectMoreBtn () {
-     console.log('检索窗口')
       this.isAdvancedSearch = true
-      this.threeOptions = []
+      this.sarStandardsSearch = []
     },
     treeCollapse () {
       this.sideClose = !this.sideClose
@@ -2389,7 +2390,7 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-              this.$http.postData(this.addOrUPdateFlag === 1 ? 'lawss/sarStandardsInfo/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, {
+              this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
                 this.isSubmit = false
@@ -2508,7 +2509,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 => {
@@ -2675,7 +2676,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 => {
@@ -2907,7 +2908,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 => {
@@ -3208,8 +3209,8 @@ export default {
                 disabled: false
               },
               {
-                label: '标准状态',
-                value: 'stand_state',
+                label: '文本状态',
+                value: 'stand_state_show',
                 type: 'SEL_OPTION',
                 disabled: false
               },
@@ -3283,7 +3284,7 @@ export default {
      */
     queryDisplayLocation () {
       return new Promise((resolve, reject) => {
-        this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', {
+        this.$http.get('lawssBase/utArea/getAreaList', {
           sarType: this.sarType
         }, {
           _this: this
@@ -3342,7 +3343,7 @@ export default {
         }
         // isEdit 为0 标准状态不是必填
         if (isEdit === '0') {
-          rules.standState = [{required: false, message: '标准状态不能为空', trigger: 'change'}]
+          rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}]
           rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
         }
         if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {

From 1811bd75124fe8d1974b6761965b2e8b73a41869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 16 Jun 2021 17:59:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/conferenceMaterials/index.vue | 1 +
 src/pages/home1/components/realtimeinfo/index.vue        | 1 +
 src/pages/home1/components/release/index.vue             | 1 +
 src/pages/home1/components/solicitopinions/index.vue     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/pages/home1/components/conferenceMaterials/index.vue b/src/pages/home1/components/conferenceMaterials/index.vue
index 6b19ee5b2..d00a6394c 100644
--- a/src/pages/home1/components/conferenceMaterials/index.vue
+++ b/src/pages/home1/components/conferenceMaterials/index.vue
@@ -72,6 +72,7 @@ export default {
       color: #FFFFFF;
       &:hover {
         color: #e9c851;
+        cursor:pointer;
         text-decoration: underline;
       }
     }
diff --git a/src/pages/home1/components/realtimeinfo/index.vue b/src/pages/home1/components/realtimeinfo/index.vue
index 94f315cdc..ccfcc8ccf 100644
--- a/src/pages/home1/components/realtimeinfo/index.vue
+++ b/src/pages/home1/components/realtimeinfo/index.vue
@@ -60,6 +60,7 @@ export default {
       color: #ffffff;
       &:hover {
         color: #e9c851;
+        cursor:pointer;
         text-decoration: underline;
       }
     }
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 11e76a840..ec4dd0162 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -61,6 +61,7 @@ export default {
       color: #ffffff;
       &:hover {
         color: #e9c851;
+        cursor:pointer;
         text-decoration: underline;
       }
     }
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 347efcbb6..65245e048 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -67,6 +67,7 @@ export default {
       color: #ffffff;
       &:hover {
         color: #e9c851;
+        cursor:pointer;
         text-decoration: underline;
       }
     }