Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board

tijiao
2025-11-20 17:00:16 +08:00 · 2025-11-20 15:51:39 +08:00
4 changed files with 129 additions and 78 deletions
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -19,8 +19,8 @@ const service = axios.create({
 	// baseURL: 'https://submission.tmrjournals.com/', //正式 记得切换
 	// baseURL: 'http://www.tougao.com/', //测试本地 记得切换
 	// baseURL: 'http://192.168.110.110/tougao/public/index.php/',
-	baseURL: '/api', //本地
-	// baseURL: '/', //正式
+	// baseURL: '/api', //本地
+	baseURL: '/', //正式

 });

--- a/src/components/page/PreIngestedEditor.vue
+++ b/src/components/page/PreIngestedEditor.vue
@@ -1,9 +1,6 @@
 <template>
    <div>
-        <div class="tab_post" >
-
-
-            
+        <div class="tab_post">
            <div style="margin-bottom: 10px">
                <p
                    v-if="feeStatus == 0"
@@ -22,28 +19,23 @@
                    <i class="el-icon-warning" style="color: #f56c6c; margin-right: 10px"></i>Manuscript unpaid
                </p>
                <p
-                v-if="feeStatus == 1"
-                style="
-                    color: #67c23a;
-                    margin: 0;
-                    background: #f0f9eb;
-                    border-color: #c2e7b0;
-                    color: #67c23a;
-                    font-weight: bold;
-                    font-size: 12px;
-                    padding: 10px;
-                    box-sizing: border-box;
-                    
-                   
-                "
-            >
-                <i class="el-icon-warning" style="color: #67c23a; margin-right: 10px"></i>Paid already
-               
-            </p>
-            </div>
-            <div style="margin-bottom: 10px">
-         
+                    v-if="feeStatus == 1"
+                    style="
+                        color: #67c23a;
+                        margin: 0;
+                        background: #f0f9eb;
+                        border-color: #c2e7b0;
+                        color: #67c23a;
+                        font-weight: bold;
+                        font-size: 12px;
+                        padding: 10px;
+                        box-sizing: border-box;
+                    "
+                >
+                    <i class="el-icon-warning" style="color: #67c23a; margin-right: 10px"></i>Paid already
+                </p>
            </div>
+            <div style="margin-bottom: 10px"></div>
            <div v-for="(item, index) in tabsList" @click="jumpTab(index, item)" :class="tabName == item.refName ? 'P_style' : ''">
                <h5>
                    <span>{{ index + 1 }}</span>
@@ -65,6 +57,12 @@
                    Push To Accept
                </el-button>
            </div>
+            <div style="margin: 20px 0 0 0">
+                <el-button type="text" @click="pushToProduce(detailMes)" style="font-size: 13px">
+                    <i class="el-icon-finished"></i>
+                    Begin to Production
+                </el-button>
+            </div>
            <!-- 作者联系 -->
            <div class="contactAuthor">
                <h4>Contact author</h4>
@@ -97,7 +95,7 @@
            <!-- 文章正文 -->

            <!-- 参考文献 -->
-            <div :ref="tabsList[0].refName" class="scroll-item" >
+            <div :ref="tabsList[0].refName" class="scroll-item">
                <div class="bor_style_onli">
                    <h4>{{ tabsList[0].name }}</h4>
                    <div class="liter_ture" v-if="0 == 2">
@@ -404,8 +402,8 @@ import { quillEditor } from 'vue-quill-editor';
 import { Loading } from 'element-ui';
 import timetalk from './time_talk';
 export default {
-    props:['type'],
-   data() {
+    props: ['type'],
+    data() {
        return {
            feeStatus: null,
            isShowCommit: false,
@@ -623,7 +621,7 @@ export default {
            //         value: '书评'
            //     }
            // ],
-            opMedical: [ ],
+            opMedical: [],
            editAuthor: false,
            addAuthor: false,
            editSchool: false,
@@ -840,7 +838,8 @@ export default {
            }
        };
    },
-    created() {this.opMedical=this.$commonJS.opMedicalList()
+    created() {
+        this.opMedical = this.$commonJS.opMedicalList();
        this.getDetail();
        this.getHight();
        window.addEventListener('resize', this.getHight);
@@ -927,10 +926,9 @@ export default {
                .then((res) => {
                    console.log('res at line 191:', res);
                    if (res.code == 0) {
-                        this.feeStatus=res.data.state
-                        this.isShowCommit=res.data.state==1?true:false
-                        console.log(this.isShowCommit)
-                      
+                        this.feeStatus = res.data.state;
+                        this.isShowCommit = res.data.state == 1 ? true : false;
+                        console.log(this.isShowCommit);
                    }
                });
        },
@@ -1673,11 +1671,15 @@ export default {

        // 6----校对文章
        htmlContet() {
-            window.open(this.$router.resolve({  path: '/GenerateCharts',
-                query: {
-                    id: this.$route.query.id
-                } }).href, '_blank');
-            
+            window.open(
+                this.$router.resolve({
+                    path: '/GenerateCharts',
+                    query: {
+                        id: this.$route.query.id
+                    }
+                }).href,
+                '_blank'
+            );
        },

        // 6----修改时间为年月日
@@ -2123,6 +2125,50 @@ export default {
                })
                .catch(() => {});
        },
+        pushToProduce(detailMes) {
+            if (!this.isShowCommit) {
+                this.$message.error('The manuscript has not been paid, please contact the author promptly for payment');
+                return false;
+            }
+
+            this.$confirm(`Please confirm if you would like to push this article to the production stage?`, 'Prompt', {
+                confirmButtonText: 'Yes',
+                cancelButtonText: 'Cancle',
+                type: 'warning'
+            })
+                .then(() => {
+                    const load = this.$loading({
+                        lock: true,
+                        text: 'Loading...',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    });
+                    this.$api
+                        .post('api/Preaccept/beginProduce', {
+                            article_id: this.$route.query.id
+                        })
+                        .then((res) => {
+                            if (res.code == 0) {
+                                load.close();
+                                this.$message.success('successed!');
+                                setTimeout(() => {
+                                    localStorage.setItem('U_point', 2);
+                                    this.$router.push({
+                                        path: 'articleListEditor'
+                                    });
+                                }, 1000);
+                            } else {
+                                load.close();
+                                this.$message.error(res.msg);
+                            }
+                        })
+                        .catch((err) => {
+                            load.close();
+                            this.$message.error(err);
+                        });
+                })
+                .catch(() => {});
+        },
        // 点击开始上线显示
        pushOnline(detailMes) {
            if (this.authorData.length == 0) {
@@ -2310,7 +2356,7 @@ export default {
 }

 .contactAuthor {
-    margin-top: 50px;
+    margin-top: 30px;
    color: #8c939d;
 }
 .contactAuthor > p {
--- a/src/components/page/articleListEditor.vue
+++ b/src/components/page/articleListEditor.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :style="[2,5].includes(activeIndex) ?'height:100%':''">
+    <div :style="[2, 5].includes(Number(activeIndex)) ? 'height:100%' : ''">
        <!-- 		<div class="crumbs">
 			<el-breadcrumb separator="/">
 				<el-breadcrumb-item>
@@ -7,8 +7,7 @@
 				</el-breadcrumb-item>
 			</el-breadcrumb>
 		</div> -->
-        
-       
+
        <div class="tab_all">
            <!-- 正在处理 -->
            <p @click="tabIndex(1)" :class="activeIndex == 1 ? 'tab_Normal tab_Select' : 'tab_Normal'">Edit</p>
@@ -27,18 +26,18 @@
            <!-- <p @click="tabIndex(4)" :class="activeIndex == 4 ? 'tab_Normal tab_Select' : 'tab_Normal'">Investigte and
 				Retrace</p> -->
            <br clear="both" />
-      
        </div>
-        <div class="container" style="padding: 20px 15px 10px;box-sizing: border-box;" 
-        :style="[2,5].includes(activeIndex) ?'height:calc(100% - 60px)':''"
+        <div
+            class="container"
+            style="padding: 20px 15px 10px; box-sizing: border-box"
+            :style="[2, 5].includes(Number(activeIndex)) ? 'height:calc(100% - 60px)' : ''"
        >
-		
            <articleListA v-if="activeIndex == '1'" :journals="journals[0]"></articleListA>
-            <articleListB v-if="activeIndex == '2'" :journals="journals[1]" @changeEvent="changeEvent"></articleListB>
+            <articleListB v-if="activeIndex == '2'" :journals="journals[1]" @changeEvent="changeEvent" ></articleListB>
            <articleListC v-if="activeIndex == '3'" :journals="journals[0]"></articleListC>
-            <articleListD v-if="activeIndex == '4'" ></articleListD>
-            <articleListE v-if="activeIndex == '5'"  :journals="journals[0]"></articleListE>
-            <articleListF v-if="activeIndex == '6'" ></articleListF>
+            <articleListD v-if="activeIndex == '4'"></articleListD>
+            <articleListE v-if="activeIndex == '5'" :journals="journals[0]"></articleListE>
+            <articleListF v-if="activeIndex == '6'"></articleListF>
        </div>
    </div>
 </template>
@@ -67,27 +66,36 @@ export default {
        articleListE,
        articleListF
    },
-  async  created() {
-      await  this.initJournal();
-	//   await this.getDate();
-        if (localStorage.getItem('U_point') != null) {
-            this.activeIndex = localStorage.getItem('U_point');
-            localStorage.removeItem('U_point');
-        }
+    async created() { this.$nextTick(() => {
+            if (localStorage.getItem('U_point') != null) {
+                this.activeIndex = localStorage.getItem('U_point');
+                localStorage.removeItem('U_point');
+            }
+        });
+        await this.initJournal();
+        this.$forceUpdate()
+        //   await this.getDate();
+       
    },
-	async  activated() {
-		await this.initJournal();
-		// await this.getDate();
+    async activated() { this.$nextTick(() => {
+            if (localStorage.getItem('U_point') != null) {
+                this.activeIndex = localStorage.getItem('U_point');
+                localStorage.removeItem('U_point');
+            }
+        });
+        await this.initJournal();
+       this.$forceUpdate()
+        // await this.getDate();
    },
    methods: {
        async initJournal() {
            [1, 2, 4].forEach(async (e, i) => {
-				this.$set(this.journals, i, await this.initselect(e)); // 使用 Vue.set 确保数据是响应式的
-               
+                this.$set(this.journals, i, await this.initselect(e)); // 使用 Vue.set 确保数据是响应式的
+
                // console.log('this.journals at line 80:', this.journals)
            });
        },
-       async initselect(e) {
+        async initselect(e) {
            var url = '';
            var data = {};
            switch (e) {
@@ -113,19 +121,17 @@ export default {
                    break;
            }

-			try {
-                const res = await this.$api.post(url, {...data });
-				if(e==4){
-					return res.data.journals; // 返回数据
-				}else{
-					return res; // 返回数据
-				}
-				
+            try {
+                const res = await this.$api.post(url, { ...data });
+                if (e == 4) {
+                    return res.data.journals; // 返回数据
+                } else {
+                    return res; // 返回数据
+                }
            } catch (error) {
                console.error('Error fetching data:', error);
                return []; // 如果发生错误，返回空数组
            }
-      
        },
        // 获取数据
        getDate() {
@@ -158,7 +164,6 @@ export default {
 </script>

 <style scoped>
-
 .tab_all {
    border-bottom: 1px solid #ddd;
 }
@@ -188,7 +193,7 @@ export default {

 .tab_Select:hover {
 }
-.sticky-header{
+.sticky-header {
    background-color: #fafafa;
 }
 </style>
--- a/src/components/page/articleListEditor_A.vue
+++ b/src/components/page/articleListEditor_A.vue
@@ -274,7 +274,7 @@
                                                        overflow: hidden;
                                                        text-overflow: ellipsis;
                                                    "
-                                                    >{{ v.realname || '-' }}
+                                                    >{{ v.realname || v.email ||'-' }}
                                                </span>
                                                <svg
                                                    @click="linkEmail(item, v.art_aut_id)"
Author	SHA1	Message	Date
始于初见	4755bed457	Merge branch 'master' of https://git.nuttyreading.com/wangjinlei/tougao_web into Editorial-Board	2025-11-20 17:00:16 +08:00
始于初见	19b2f88da0	tijiao	2025-11-20 15:51:39 +08:00