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

src/assets/styles/drawer.less

@@ -14,13 +14,14 @@
     }
     .el-drawer__body{
       height: 100%;
-      overflow-y: auto;
+      //overflow-y: auto;
       display: flex;
       flex-direction: column;
       // 底部带 提交、取消按钮
       .demo-drawer-content{
         padding: 0 19px;
         //height: calc(~'100% - 50px');
+        height: 85%;
         overflow-y: auto;
         flex: auto;
         display: flex;
@@ -98,7 +99,7 @@
       //bottom: 0;
       //left: 0;
       padding: 0 20px;
-      height: 50px;
+      height: 13%;
       line-height: 50px;
       border-top: 1px solid #e8e8e8;
       text-align: right;

src/common/axiosV2/index.js

@@ -63,7 +63,7 @@ service.interceptors.response.use(
                 // ignored
             }
         }
-        if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
+        if(res.data && res.data.respCode !== undefined && res.data.respCode === 'LE505'){
             if (isMobile()) {
                 localStorage.removeItem('token')
                 return router.push('/phoneIndex')

src/main.js

@@ -179,7 +179,13 @@ router.beforeEach(function (to, from, next) {
             }
           }
         }else {
-          next()
+          // 区分手机端首页 单独逻辑处理 token 为空 跳回验证页面重新验证
+          if(fromName === 'databaseSearch' || fromName === 'standDynamics' ||
+             fromName === 'domesticStand' || fromName === 'domesticDetails'){
+            next('/loginVerifyPhone')
+          }else {
+            next()
+          }
         }
       } else {
         if (toName.slice(0,5) !== 'phone') {

src/pages/config/pages/operationLog/index.vue

@@ -72,6 +72,14 @@
                                 v-btn-permission="'c8605037fd040fd480b052d6e9dd8d13'"
                         >清空</el-button>
                     </el-form-item>
+                    <el-form-item label="" class="search-item btn-box">
+                        <el-button class="common-button-default"
+                                   @click="exportStandard()"
+                                   size="mini"
+                                   v-btn-permission="''"
+                                   title="导出1年内的操作日志">导出
+                        </el-button>
+                    </el-form-item>
                 </el-form>
             </div>
         </div>
@@ -118,14 +126,32 @@
                 @checkedRole="checkedRole"
                 :nodeList="nodeList"
         ></Role-tree>
+        <!--导出文件改名字模态框-->
+        <el-dialog :visible.sync="exportModelFlag" class="export-dialog" title="导出文件" width="300px">
+            <el-form :inline="true" class="label-input-form search-area">
+                <el-form-item label="导出名称" class="search-item">
+                    <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="demo-drawer-footer">
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancal">取消</el-button>
+          <el-button size="mini" type="primary" class="common-button-primary" icon="el-icon-check"
+                     :loading="exportLoading"
+                     @click="exportTestItem">提交</el-button>
+        </span>
+        </el-dialog>
     </div>
 </template>
 <script>
+    import {interfaceUrl} from '@/sysConfig'
     export default {
         name: "OperationLog",
         data () {
             return {
                 dataLoading: false,
+                exportModelFlag: false,
+                exportLoading: false,
+                exportName: '',
                 total: 0,
                 data: [],
                 typeList: [],
@@ -150,6 +176,20 @@
             }
         },
         methods: {
+            // 导出取消按钮关闭模态、置空
+            cancal() {
+                this.exportModelFlag = false
+            },
+            exportTestItem() {
+                this.exportLoading = true
+                this.searchForm.exportType = ""
+                this.searchForm.exportName = this.exportName
+                this.searchForm.userId = this.$store.getters.userInfo.userId
+                const exportJson = JSON.stringify(this.searchForm);
+                window.open(interfaceUrl + 'sysLog/sys-log/exportSysLogExcelVOExcelData?exportJson='+exportJson)
+                this.$message.success('导出信息成功')
+                this.exportLoading = false
+            },
             checkedRole (data) {
                 this.searchForm.account = data[0].id
                 this.searchForm.accountName = data[0].name
@@ -195,6 +235,10 @@
                 this.searchForm.content = ''
                 this.getData()
             },
+            exportStandard() {
+                this.exportName = ''
+                this.exportModelFlag = true
+            },
         },
         mounted () {
             this.getData()

src/pages/personal/pages/my-questions/index.vue

@@ -334,7 +334,7 @@
                                 </template>
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
-                              <div class="info-answer" v-if="answerList && answerList.length > 0">
+                              <div class="info-answer">
                                 <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
@@ -395,7 +395,7 @@
                                 </template>
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
-                              <div class="info-answer" v-if="answerList && answerList.length > 0">
+                              <div class="info-answer">
                                 <answer-item @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
@@ -456,7 +456,7 @@
                                 </template>
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
-                              <div class="info-answer" v-if="answerList && answerList.length > 0">
+                              <div class="info-answer">
                                 <answer-item @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>
@@ -519,7 +519,7 @@
                                 </template>
                                 <loading :loading="dataLoading">正在加载数据</loading>
                               </div>
-                              <div class="info-answer" v-if="answerList && answerList.length > 0">
+                              <div class="info-answer">
                                 <answer-item   @emitInsState="emitInsState"></answer-item>
                               </div>
                             </el-tab-pane>

src/pages/phone/databaseSearch.vue

@@ -237,6 +237,7 @@ export default {
     box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
     .standTitle{
       .title{
+        font-size: 3.4vw;
         color: #333333;
         font-weight: 600;
         height: auto;
@@ -247,6 +248,7 @@ export default {
       }
     }
     .standContent{
+      font-size: 3.4vw;
       color: #555555;
       font-weight: 450;
       margin-top: 5px;
@@ -256,6 +258,7 @@ export default {
         line-height: 35px;
       }
       .standSubTime{
+        font-size: 3.4vw;
         padding-left: 10px;
         height: 35px;
         line-height: 35px;

src/pages/phone/domesticDetails.vue

@@ -1,6 +1,6 @@
 <!--国内标准法规详情页-->
 <template>
-  <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
+  <div class="other-standard-details v-class" :style="'width:' + (500) + 'px;'+'height:' + (screenHeight) + 'px'">
     <!--title 标题-->
     <div class="details-header">
       <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
@@ -58,10 +58,10 @@
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                      <div style="position: relative;margin-left: 214px; line-height: 32px">
+                      <div style="position: relative;margin-left: 19em; line-height: 32px">
                         <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
+                            <a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
@@ -69,7 +69,7 @@
                           <!--                          多个文件时-->
                           <div v-else-if="child.value && child.value.length > 0">
                             <span style="display: flex; align-items: center;">
-                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                              <a style="ffont-size:0.2rem;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             </span>
@@ -172,7 +172,7 @@
                       }}</span>
                     </p>
                     <p class="half">
-                      <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
+                      <label style=" margin-right: 11em;">是否纳入认证清单</label><span>{{
                         sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
                       }}</span>
                     </p>
@@ -1516,6 +1516,8 @@ export default {
   },
   data() {
     return {
+      screenWidth: document.body.offsetWidth - 141,
+      screenHeight: document.documentElement.clientHeight,
       externalStatus:'',
       handleList: [],
       CycxOptions: [],
@@ -3439,6 +3441,18 @@ export default {
     })
   },*/
   async mounted() {
+    const that = this
+    window.onresize = () => {
+      return (() => {
+        window.screenWidth = document.body.offsetWidth
+        that.$store.commit('width', window.screenWidth)
+        that.screenWidth = window.screenWidth - 141
+        window.screenHeight = document.documentElement.clientHeight
+        that.$store.commit('height', window.screenHeight)
+        that.screenHeight = window.screenHeight
+        that.objs.bodyWidth = window.screenWidth
+      })()
+    }
     let external = localStorage.getItem("external");
     if(external !== undefined && external !== null){
       this.externalStatus = external
@@ -3740,6 +3754,7 @@ export default {
   overflow: auto;
   height: 100%;
   background: #FFFFFF;
+  overflow: auto;
 
   .itemsTextBox {
     min-height: 300px;
@@ -3846,7 +3861,7 @@ export default {
 
   .details-header {
     padding: 34px 0;
-    font-size: 20px;
+    font-size: 0.3rem;
     font-weight: bold;
     color: #555555;
     text-align: center;
@@ -3869,7 +3884,7 @@ export default {
         border-bottom: 1px solid #E5E5E5;
 
         .modular-header-title {
-          font-size: 18px;
+          font-size: 0.25rem;
           font-weight: bold;
           color: #3B424C;
 
@@ -3946,7 +3961,7 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 16px;
+        font-size: 0.2rem;
         /*font-weight: 400;*/
 
         .standard-text {
@@ -3998,7 +4013,7 @@ export default {
             width: 213px;
             height: 43px;
             line-height: 43px;
-            font-size: 16px;
+            font-size: 0.2rem;
             color: #333333;
             vertical-align: top;
             overflow: hidden;
@@ -4010,6 +4025,7 @@ export default {
             line-height: 32px;
             display: inline-block;
             width: calc(~'100% - 225px');
+            font-size: 0.2rem;
             //min-height: 50px;
             //line-height: 50px;
             //font-size: 16px;
@@ -4021,6 +4037,7 @@ export default {
           }
 
           .modular-content-p-flies {
+            font-size: 0.2rem;
             line-height: 32px;
             //position: relative;
             display: inline-block;

src/pages/phone/domesticStand.vue

@@ -29,16 +29,16 @@
        </div>
        <div class="standContent">
          <div class="standState">{{item.standName}}</div>
-         <div class="standSubTime">标准性质:
-           <span v-if="natureMap[item.standNature] === '强制性' "
-                 style="color: #F56C6C; padding-left: 5px;">
-                     {{ natureMap[item.standNature] }}
-         </span>
-           <span v-if="natureMap[item.standNature] === '推荐性' "
-                 style="color: #E57800; padding-left: 5px;">
-                     {{ natureMap[item.standNature] }}
-         </span>
-         </div>
+<!--         <div class="standSubTime">标准性质:-->
+<!--           <span v-if="natureMap[item.standNature] === '强制性' "-->
+<!--                 style="color: #F56C6C; padding-left: 5px;">-->
+<!--                     {{ natureMap[item.standNature] }}-->
+<!--         </span>-->
+<!--           <span v-if="natureMap[item.standNature] === '推荐性' "-->
+<!--                 style="color: #E57800; padding-left: 5px;">-->
+<!--                     {{ natureMap[item.standNature] }}-->
+<!--         </span>-->
+<!--         </div>-->
          <div class="standSubTime" v-if="titleType === 'POLICY'">标准状态:
            <span v-if="lawsMap[item.lawsTextState] === '作废' || lawsMap[item.lawsTextState] === '被代替'"
                  style="color: #F56C6C; padding-left: 5px;">
@@ -57,7 +57,7 @@
                  style="color: #F56C6C; padding-left: 5px;">
                       {{ textStatusMap[item.textStatus] }}
          </span>
-           <span v-else-if="textStatusMap[item.textStatus] === '参考' || textStatusMap[item.textStatus] === '现行有效'"
+           <span v-else-if="textStatusMap[item.textStatus] === '参考'"
                  style="color: #98E165; padding-left: 5px;">
                       {{ textStatusMap[item.textStatus] }}
          </span>
@@ -525,7 +525,6 @@ export default {
 #domestic-stand{
   width: 100%;
   height: 100%;
-  overflow: auto;
   margin: 0;
   padding: 0;
   background: #F6F6F6;
@@ -574,6 +573,7 @@ export default {
     box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
     .standTitle{
       .title{
+        font-size: 3.4vw;
         color: #333333;
         font-weight: 600;
         height: auto;
@@ -584,6 +584,7 @@ export default {
       }
     }
     .standContent{
+      font-size: 3.4vw;
       color: #333333;
       font-weight: 500;
       margin-top: 5px;
@@ -599,6 +600,7 @@ export default {
       }
     }
     .content-time{
+       font-size: 3.4vw;
        width: 100%;
        height: 35px;
        margin-top: 5px;

src/pages/phone/phoneHome.vue

@@ -1,5 +1,6 @@
 <template>
-  <div id="phone-home">
+  <div id="phone-home" :style="'height:' + (screenHeight) + 'px'">
+    <!-- 内容 -->
     <div class="search-top">
       <div class="top-title">
       </div>
@@ -7,10 +8,10 @@
     </div>
     <div class="search-head">
       <van-search
-        v-model="searchKey"
-        show-action
-        placeholder="请输入搜索关键词"
-        @search="onSearch"
+              v-model="searchKey"
+              show-action
+              placeholder="请输入搜索关键词"
+              @search="onSearch"
       >
         <template #action>
           <div @click="onSearch">搜索</div>
@@ -39,11 +40,23 @@
 </template>
 
 <script>
+import vueCustomScrollbar from 'vue-custom-scrollbar'
+
 export default {
   name: "phoneHome",
+  components: {
+    vueCustomScrollbar
+  },
   data() {
     return {
+      settings: {
+        suppressScrollY: false,
+        suppressScrollX: false,
+        wheelPropagation: false
+      },
       searchKey: "",
+      screenWidth: document.body.offsetWidth - 141,
+      screenHeight: document.documentElement.clientHeight,
     };
   },
   methods: {
@@ -70,37 +83,60 @@ export default {
         })
       }
     },
-  }
+  },
+  mounted() {
+    const that = this
+    window.onresize = () => {
+      return (() => {
+        window.screenWidth = document.body.offsetWidth
+        that.$store.commit('width', window.screenWidth)
+        that.screenWidth = window.screenWidth - 141
+        window.screenHeight = document.documentElement.clientHeight
+        that.$store.commit('height', window.screenHeight)
+        that.screenHeight = window.screenHeight
+        that.objs.bodyWidth = window.screenWidth
+      })()
+    }
+  },
 };
 </script>
 
 <style lang="less" scoped>
+/deep/ .scroll-area {
+  position: relative;
+  margin: auto;
+  width: 100%;
+  height: 100%;
+}
+
 #phone-home {
   width: 100%;
   height: 100%;
   background: #F6F6F6;
+  overflow: auto;
   .van-search .van-cell {
     padding: 10px;
   }
   .search-top{
-     height: 200px;
-     width: 100%;
-     background: url("../../assets/images/phone/homeTop.png");
-     background-size:100% 100%;
+     height: 4rem;
+     width: 100vw;
+     background: url("../../assets/images/phone/homeTop.png") no-repeat center;
+     background-size:100vw 40vh;
+     position: relative;
     .top-title{
       position: absolute;
       top: 15px;
       left: 15px;
-      width: 30%;
-      height: 5%;
+      width: 23vw;
+      height: 0.8rem;
       background: url("../../assets/images/phone/phoneTitle.png") no-repeat;
       background-size: 100% 100%;
     }
     .home-title{
       color: #FFFFFF;
       position: absolute;
-      top: 12%;
-      left: 25%
+      top: 1.5rem;
+      left: 17.3vw;
     }
   }
   .search-head{
@@ -112,6 +148,7 @@ export default {
     flex-wrap: wrap;
     background: #F6F6F6;
     .content-top {
+      position: relative;
       width: 47%;
       height: 150px;
       line-height: 230px;
@@ -123,34 +160,38 @@ export default {
     }
     .content-box{
       display: inline-block;
-      width: 50px;
-      height: 50px;
+      width: 1rem;
+      height: 1rem;
       position: absolute;
       background-size: 100% 100%;
     }
-    .content-box{
-      top: 39%;
-      left: 20%;
+    .content-box1{
+      top: 0.7rem;
+      margin-left: 1.4em;
+      /*left: 16.3vw;*/
       background: url("../../assets/images/phone/domesticStand.png");
     }
     .content-box2{
-      top: 39%;
-      left: 65%;
+      top: 0.7rem;
+      margin-left: 1.4em;
+      /*left: 16.3vw;*/
       background: url("../../assets/images/phone/overseasStand.png");
     }
     .content-box3{
-      top: 58%;
-      left: 20%;
+      top: 0.7rem;
+      margin-left: 0.9em;
+      /*left: 16.3vw;*/
       background: url("../../assets/images/phone/policyStand.png");
     }
     .content-box4{
-      top: 58%;
-      left: 65%;
+      top: 0.7rem;
+      margin-left: 0.9em;
+      /*left: 16.3vw;*/
       background: url("../../assets/images/phone/dynamicsStand.png");
     }
     .content-span{
       color: #000000;
-      font-size: 16px;
+      font-size: 0.3rem;
       font-weight: 500;
     }
   }

src/pages/phone/standDynamics.vue

@@ -268,6 +268,7 @@ export default {
 
     .standTitle {
       .title {
+        font-size: 3.4vw;
         color: #333333;
         font-weight: 600;
         height: auto;
@@ -279,6 +280,7 @@ export default {
     }
 
     .standContent {
+      font-size: 3.4vw;
       color: #555555;
       font-weight: 450;
       margin-top: 5px;
@@ -290,6 +292,7 @@ export default {
       }
 
       .standSubTime {
+        font-size: 3.4vw;
         padding-left: 10px;
         height: 35px;
         line-height: 35px;

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -6118,7 +6118,7 @@ export default {
   display: inline-block;
   width: 15px;
   height: 15px;
-  background: url('~@/assets/images/shangqi/img/none-file.png');
+  background: url('~@/assets/images/shangqi/img/none-file-new.png');
   background-size: 100% 100%;
 }
 

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -5325,7 +5325,7 @@ export default {
   display: inline-block;
   width: 15px;
   height: 15px;
-  background: url('~@/assets/images/shangqi/img/none-file.png');
+  background: url('~@/assets/images/shangqi/img/none-file-new.png');
   background-size: 100% 100%;
 }
 

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -4489,7 +4489,7 @@
     display: inline-block;
     width: 15px;
     height: 15px;
-    background:url('~@/assets/images/shangqi/img/none-file.png');
+    background: url('~@/assets/images/shangqi/img/none-file-new.png');
     background-size:100% 100%;
   }
   /deep/ .is-show{

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -5400,7 +5400,7 @@ export default {
   display: inline-block;
   width: 15px;
   height: 15px;
-  background: url('~@/assets/images/shangqi/img/none-file.png');
+  background: url('~@/assets/images/shangqi/img/none-file-new.png');
   background-size: 100% 100%;
 }
 

src/pages/searchCenter/pages/standardSearch.vue

@@ -2765,9 +2765,18 @@
         background-color: #E6A23C !important;
     }
 
+    /deep/ .greenEsClass{
+        background-color: #98E165 !important;
+    }
+
     /deep/ .redEsClass{
         background-color: #F56C6C !important;
     }
+
+    /deep/ .greenClass{
+        color: #98E165 !important;
+    }
+
     /deep/ .yellowClass{
         color: #E6A23C !important;
     }