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

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue

@@ -234,7 +234,7 @@
               url = this.url.edit
               this.dataList.forEach(res => {
                 content.push({
-                  countryCardTempId: res.id,
+                  countryCardTempId: res.countryCardTempId,
                   description: res.description,
                   content: res.content,
                   id: res.id

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -57,7 +57,7 @@
       </li>
     </div>
     <div class="noData" v-else>
-      暂无数据
+      {{$t('noData')}}
     </div>
     <div class="page" v-if="conList.length > 0">
       <a-pagination

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue

@@ -3,7 +3,7 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
+           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">
              <a-icon type="arrow-left" style="margin-right: 6px;"/>
            </span>
           {{$t('managePublishing')}}
@@ -46,26 +46,26 @@
               </div>
             </div>
           </div>
-            <div class="noData" v-else>
+          <div class="noData" v-else>
-              暂无数据
+            {{$t('noData')}}
-            </div>
+          </div>
-            <div class="page" v-if="conList.length > 0">
+          <div class="page" v-if="conList.length > 0">
-              <a-pagination
+            <a-pagination
-                :show-total="total => $t('total')+` ${total} `+$t('strip')"
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
-                show-quick-jumper
+              show-quick-jumper
-                show-size-changer
+              show-size-changer
-                :page-size.sync="pageSize"
+              :page-size.sync="pageSize"
-                :total="total"
+              :total="total"
-                :current="pageNo"
+              :current="pageNo"
-                @change="pageOnChange"
+              @change="pageOnChange"
-                @showSizeChange="SizeChange"
+              @showSizeChange="SizeChange"
-              />
+            />
-            </div>
           </div>
         </div>
-        <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
       </div>
+      <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
     </div>
+  </div>
 </template>
 
 <script>
@@ -132,6 +132,11 @@
           }
         })
       },
+      backClick() {
+        this.$router.push({
+          path: '/problemknowledgeBase'
+        })
+      },
       titleClick(item) {
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',