小红点，列表显示空白等问题

6 months ago · 9a4d3ad295
7 changed files with 83 additions and 37 deletions
--- a/src/assets/images/main/red.png
+++ b/src/assets/images/main/red.png
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@ -30,13 +30,15 @@
 					<el-menu-item index="3"  @click="$router.push({ path: '/main/base-smartExcel-filling' })">
 						<div class="nav-item" v-for="menu in $store.state.sidebarMenuList" v-show="menu.children.find(item => item.name === '任务填报')">
 							<img src="~@/assets/images/main/nav-sjjy.png" />
+		
 							<span>填报任务</span>
+							<img  v-if="dataRed" style="width: 10px;height: 10px;margin-bottom: 20px;" src="~@/assets/images/main/red.png"/>
 						</div>
 					</el-menu-item>
 					<el-menu-item index="3" @click="handleCLickNav">
 						<div class="nav-item">
 							<img src="~@/assets/images/main/nav-sjdb.png" />
-							<span>智能分析</span>
+							<span >智能分析</span>
 						</div>
 					</el-menu-item>
 				</el-menu>
@ -100,15 +102,13 @@ export default {
 	inject: ['refresh'],
 	data() {
 		return {
+			dataRed:0,
 			showHeader: true,
 			i18nMessages: messages,
 			updatePassowrdVisible: false,
 			customerName: '',
-
 			unreadMsgNum: 0,
-
 			noticeList: [],
-
 			displayedNoticeList: true
 		};
 	},
@ -123,6 +123,7 @@ export default {
 		this.changeCustomerName();

 		this.pollGetNoticeData();
+		this.redDot()
 	},
 	computed: {
 		userType() {
@ -130,6 +131,15 @@ export default {
 		}
 	},
 	methods: {
+		async redDot() {
+			const url = `/actual/base/communityOneTablePeriodPublish/redDot`;
+			const { data, code, msg } = await requestGet(url);
+			if (code == 0) {
+				this.dataRed=data
+			} else if (code >= 8000) {
+				this.$message.error(msg);
+			}
+		},
 		async readClearOne(item) {
 			const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
 			const { data, code, msg } = await requestPost(url);
--- a/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
+++ b/src/views/modules/base/smartExcel/cpts/acceptingPersonel.vue
@ -36,7 +36,7 @@
            <el-table-column prop="renwu" align="center" :show-overflow-tooltip="true" label="转派给">
            </el-table-column>
        </el-table>
-        <el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"
+        <el-form v-if="showType == 'edit'" ref="formData " label-position="left" :model="formData" label-width="150px"  :rules="dataRule"
            style="margin-left: 3%; margin-top: 10px;">
                <el-form-item label="任务要求" prop="taskIntroduction" style="display: block">
                    <el-input class="cell-width-2" type="textarea" maxlength="500" show-word-limit :rows="5"
@ -81,6 +81,15 @@ import { requestPost, requestGet } from "@/js/dai/request";
 export default {
    data() {
        return {
+            dataRule: {
+                taskTitle: [{ required: true, message: "任务主题不能为空", trigger: "blur" },],
+                taskPeriod: [{ required: 'true', message: '任务周期不能为空', trigger: 'blur' }],
+                receiverIds: [{ required: 'true', message: '分发人员不能为空', trigger: 'blur' }],
+                moduleUrl: [{ required: 'true', message: '模板不能为空', trigger: 'blur' }],
+                completeLimitDay: [
+                    { required: true, message: '完成时限不能为空', trigger: 'blur' },
+                ],
+            },
            tableData: [],
            formData: {
                effectiveDateRange:[],
@ -112,19 +121,15 @@ export default {
            pageNo: 1,
            pageSize: 10
        };
+        
    },
    created() {
-        console.log(this.formDatas,"sdfljksdlk");
        this.formData.taskPeriod=this.formDatas.taskPeriod
        this.formData.completeLimitDay=this.formDatas.completeLimitDay
        this.formData.effectiveDateRange.push(this.formDatas.startTime,this.formDatas.endTime)
-        console.log(this.formData.effectiveDateRange,"sdfjksdf");
-        
     },
    methods: {
      async  handleConfirm() {
-        console.log(this.showType, "dsklmfklds");
-            console.log(this.selfTag),"dsfkljdslk";
            let userIdList = this.selfTag.map(item => {
                return item.staffId
            })
@ -161,6 +166,9 @@ export default {
                // this.updateState()
            }
            else {
+                if (!this.formData.completeLimitDay) {
+                    return this.$message.error("完成时限不能为0天")
+                }
                const parms = {
                    userIdList: userIdList,
                    id: this.taskId,
@ -328,7 +336,23 @@ export default {
    computed: {

    },
-    watch: {},
+    watch: {
+        'formData.taskPeriod': function (newPeriod) {
+            if (newPeriod === 'once') {
+                this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突
+            } else {
+                this.formData.completeLimitDay = ''; // 如果不是 'once'，可以设置一个默认值
+            }
+        },
+        'formData.completeLimitDay': function (newPeriod) {
+  
+            if (newPeriod<0) {
+                console.log(newPeriod,"第一次");
+                this.formData.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突
+            } else {
+            }
+        }
+    }
 }
 </script>

--- a/src/views/modules/base/smartExcel/cpts/excel-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-info.vue
@ -14,8 +14,8 @@
                                <div
                                    style="display: flex;margin-left: 10px;
                                     justify-content: center; align-items: center; width: 60px; height: 20px; border: 2px solid #ADD8E6; color: #ADD8E6; font-size: 12px;">
-                                   {{ formData.taskStateName }}
-                                   
+                                    {{ formData.taskStateName }}
+
                                </div>
                            </div>

@ -36,24 +36,32 @@
                            <div>{{formData.createByName}}</div>
                        </el-form-item>
                    </el-col>
-                    <el-col :span="8" >
+                    <el-col :span="8">
                        <el-form-item label="任务类型">
                            <div>{{formData.type || '数据填报'}}</div>
                        </el-form-item>
                    </el-col>
                    <el-col :span="8">
                        <el-form-item label="完成时限">
-                            <div><span v-if="formData.taskPeriod!=='once'">每周期的第</span>{{formData.completeLimitDay}}<span v-if="formData.taskPeriod!=='once'">天内完成</span></div>
+                            <div><span
+                                    v-if="formData.taskPeriod!=='once'">每周期的第</span>{{formData.completeLimitDay}}<span
+                                    v-if="formData.taskPeriod!=='once'">天内完成</span>
+                                <el-button style="margin-left: 10px;" type="text"
+                                    @click="oncClickInfo('edit')">[修改]</el-button>
+                            </div>
+
                        </el-form-item>
                    </el-col>
                    <el-col :span="16" v-if="formData.taskPeriod!=='once'">
                        <el-form-item label="任务完成有效期">
-                            <div>{{formData.startTime.slice(0, 10) }}-{{formData.endTime.slice(0, 10)  }}</div>
+                            <div>{{formData.startTime?formData.startTime.slice(0, 10):formData.startTime }}-{{formData.endTime?formData.endTime.slice(0, 10):formData.endTime }}</div>
                        </el-form-item>
                    </el-col>
                    <el-col :span="16">
                        <el-form-item label="任务周期">
-                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
+                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' :
+                                formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' :
+                                '每季度' }}</div>
                        </el-form-item>
                    </el-col>
                    <el-col :span="24">
@ -79,28 +87,31 @@
            <div class="m-table">

                <el-table :data="tableData" border class="m-table-item"
-                    style="width: 70%;margin-left: 3%; margin-top: 30px;" >
+                    style="width: 70%;margin-left: 3%; margin-top: 30px;">
                    <el-table-column label="序号" fixed="left" type="index" align="center" width="80" />
                    <el-table-column prop="taskPeriodName" align="center" :show-overflow-tooltip="true" label="任务周期">
-                        <template slot-scope="scope" v-if="taskPeriod === 'once'">
+                        <template slot-scope="scope">
                            {{taskPeriod === 'once'?'一次性':`${scope.row.taskPeriodName}`}}
                        </template>
                    </el-table-column>
                    <el-table-column fixed="right" label="汇报情况" align="center">
                        <template slot-scope="scope">
-                            <el-button @click="handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum}}/{{ scope.row.totalNum }}</el-button>
-                            <el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button>
+                            <el-button @click="handleInfo(scope.row)" type="text" size="small">{{
+                                scope.row.resolveNum}}/{{ scope.row.totalNum }}</el-button>
+                            <el-button @click="handelClickShowSummary(scope.row)" type="text"
+                                size="small">查看</el-button>
                        </template>
                    </el-table-column>
                </el-table>
            </div>
-         
-        </div>  
-         <div v-if="showSummary" style="width: 100%;background: #ffffff;">
-                <excel-summary @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
-            </div>
+
+        </div>
+        <div v-if="showSummary" style="width: 100%;background: #ffffff;">
+            <excel-summary @close="closeSummary" :summaryDetal=summaryDetal></excel-summary>
+        </div>
        <div class=''>
-            <el-dialog :title="title" v-if="showPersonel" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false">
+            <el-dialog :title="title" v-if="showPersonel" :visible.sync="showPersonel" width="50%"
+                :close-on-click-modal="false">
                <acceptingPersonel :showType="showType" :acceptingId="formData.acceptingId" :taskId="taskId"
                    @handelPersonel="handelPersonel" :formDatas="formData"></acceptingPersonel>
            </el-dialog>
--- a/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
@ -91,12 +91,12 @@ export default {
    },
    mounted() {
        console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx'
-        const newUrl = this.fileUrl.replace(
-        /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, 
-        `${location.origin}`
-        );
-        this.urlToFile(newUrl,this.fileName)
-        // this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)
+        // const newUrl = this.fileUrl.replace(
+        // /^https:\/\/elink-esua-epdc\.oss-cn-qingdao\.aliyuncs\.com/, 
+        // `${location.origin}`
+        // );
+        // this.urlToFile(newUrl,this.fileName)
+        this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)

    },
    props: {
--- a/src/views/modules/base/smartExcel/cpts/excel-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue
@ -1,7 +1,7 @@
 <template>
  <div class='flex'  :style="{ height: tableHeight }">
    <div class="left_menu flex flex-y" v-if="!sheetTotal">
-      <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button>
+      <!-- <el-button type="text" round @click="handelClickBack" icon="el-icon-back">返回</el-button> -->
      <section>
        <h3>{{ menuList[0].taskTitle }}</h3>
        <p>{{ menuList[0].agencyName }}</p>
@ -17,9 +17,10 @@
    <div :class="['flex', 'flex-y', 'flex1', sheetTotal ? 'luckysheet-wrap' : 'luckysheet-wrap-all']">
      <div class="top_btn flex flex-end">
        <div>
-          <el-button type="warning" v-if="pageType === 'add'" @click="handleClickInspect"> 自动检查</el-button>
+             <el-button type="text" round @click="handelClickBack" icon="el-icon-back"  v-if="!sheetTotal">返回</el-button>
          <el-button type="text" round @click="handelClickBack" v-if="pageType !== 'add' || sheetTotal"
-            icon="el-icon-back">返回</el-button>
+          icon="el-icon-back">返回</el-button>
+          <el-button type="warning" v-if="pageType === 'add'" @click="handleClickInspect"> 自动检查</el-button>
          <el-button type="success" @click="onClickUplond()" v-if="pageType !== 'add'"> 智能填表</el-button>
        </div>
        <div>
--- a/src/views/modules/base/smartExcel/cpts/filling-info.vue
+++ b/src/views/modules/base/smartExcel/cpts/filling-info.vue
@ -25,7 +25,7 @@
                    </el-col>
                    <el-col :span="8">
                        <el-form-item label="完成时限">
-                            <div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周期内的第</span>{{formData.completeLimitDay }}<span
+                            <div style="color: #FF3300;"> <span v-if="formData.taskPeriod !== 'once'">每周期的第</span>{{formData.completeLimitDay }}<span
                                    v-if="formData.taskPeriod == 'once'"> {{formData.completeLimitHour}}</span>
                                <span v-if="formData.taskPeriod !== 'once'">内完成</span>
                            </div>