Merge branch 'fix_1104' into debug

src/main.js

@@ -203,7 +203,7 @@ router.beforeEach(async(to, from, next) => {
   } */
 
   let auth = localStorage.getItem("auth") || false;
-  if(!auth && storage.getCookie('ai_user')) {
+  if(!auth && (storage.getCookie('ai_user')||storage.getCookie('ai_token'))) {
     transferLoginByCookie();
     return
   }

src/utils/loginTransfer.js

@@ -5,7 +5,8 @@ import {router} from '../main'
 
 // 有cookie换token免登录
 export async function transferLoginByCookie() {
-  const res = await loginTransferByCookie({AdminName: storage.getCookie('ai_user')})
+  let AdminName = storage.getCookie('ai_user') || storage.getCookie('ai_token');
+  const res = await loginTransferByCookie({AdminName})
   if(res.Ret !== 200) return
   setLoginCookieInfo(res.Data)
 }

src/views/Home.vue

@@ -632,7 +632,7 @@ export default {
     
     // 跳转数据节点
     handleGoSJJD(){
-      let path = `${location.origin}/space/`
+      let path = `${location.origin}/space/#/preview`
       window.open(path, '_blank')
     },
 

src/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue

@@ -30,9 +30,9 @@
       </el-table-column>
       <el-table-column :label="$t('Table.column_operations')" key="Copy" align="center" width="140">
         <template slot-scope="scope" v-if="scope.row.HaveOperaAuth">
-          <span class="editsty" @click="copyCode(scope.row)">
+          <span class="editsty" @click="copyCode(scope.row)" v-if="showCopyDataBtn">
           <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
-        ><br />
+        ><br v-if="showCopyDataBtn"/>
         <span class="editsty" @click="viewTarget(scope.row)">{{$t('Edb.detail_lookdata_btn')/* 查看数据 */}}</span>
       </template>
     </el-table-column>
@@ -49,6 +49,10 @@ export default {
     tableData: {
       type: Array,
       default: () => []
+    },
+    showCopyDataBtn:{
+      type:Boolean,
+      default:true
     }
   },
   computed:{

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -46,6 +46,7 @@
 					<tableNoData :text="defaultWarn"/>
 			</div>
 		</el-table>
+		<template v-if="showDataList">
 		<ul 
 			class="value-ul" 
 			ref="valueUl" 
@@ -68,6 +69,7 @@
 			</li>
 			<li class="nodata value-item" v-if="!dataList.length">{{$t('Table.prompt_slogan')}}</li>
 		</ul>
+		</template>
 	</div>
 </template>
 
@@ -98,6 +100,10 @@ export default {
 			type:Array,
 			default:()=>{return []}
 		},
+		showDataList:{
+			type:Boolean,
+			default:true
+		},
 		haveMore:{
 			type:Boolean,
 			default:false

src/views/dataEntry_manage/databaseList.vue

@@ -451,6 +451,7 @@
 								:table-colums-two="tableColumsTwo"
 								:data-list="dataList"
 								:haveMore="haveMore"
+								:showDataList="false"
 								@getNextData="()=>{page_no++;getDataList();}"
 							/>
 						</div>

src/views/intervalAnalysis/addChart.vue

@@ -248,7 +248,7 @@
           </div>
 
           <!-- 关联指标 -->
-          <edbTableSection :tableData="tableData" />
+          <edbTableSection :tableData="tableData" :showCopyDataBtn="false"/>
         </div>
       </div>
       <div class="nodata" v-else>

src/views/predictEdb_manage/components/childData.vue

@@ -51,6 +51,7 @@
 					<tableNoData :text="defaultWarn"/>
 			</div>
 		</el-table>
+    <template v-if="showDataList">
     <ul
       class="value-ul"
       ref="valueUl"
@@ -76,6 +77,7 @@
       </li>
       <li class="nodata value-item" v-if="!dataList.length"><!-- 暂无数据 -->{{$t('Table.prompt_slogan')}}</li>
     </ul>
+    </template>
   </div>
 </template>
 
@@ -84,7 +86,11 @@ import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
 export default {
   props: {
     id: Number,
-    lang: String
+    lang: String,
+    showDataList:{
+      type:Boolean,
+      default:true
+    }
   },
   watch: {
     id(newval) {

src/views/predictEdb_manage/predictEdb.vue

@@ -263,7 +263,7 @@
 							:lang="currentLang" 
 							:isAllowEditLimit="isEdbBtnShow('edbPreData_editLimit')"
 							ref="detailComponentRef"
-							
+							:showDataList="false"
 							@updateTit="setNameBack"
 							@setCurrentClassify="setCurrentClassify"
 							@setOpera="({button,detail}) => { edbButton = button;predictEdbInfo=detail }"

src/views/report_manage/reportV2/components/reportBaseInfoDia.vue

@@ -266,7 +266,7 @@ export default {
         cooperationType: 1,//协作方式
         cooperationUsers: [],
         reportLayout: 1,//报告布局
-        isPublcPublish: 1
+        isPublcPublish: 2
       },
       publishTip: `若选择是，则发布后所有人可见；<br>
         若选择否，则发布后，仅创建人和审批人可见；`,
@@ -323,7 +323,7 @@ export default {
         cooperationType: 1,//协作方式
         cooperationUsers: [],
         reportLayout: 1,//报告布局
-        isPublcPublish: 1
+        isPublcPublish: 2
       }
 
       this.$emit("showChange", false);