From a92fdd735b893d6ec449e4d3884168ebc5a19fb8 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 14 May 2025 11:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |   2 +-
 .env.staging                                  |   2 +-
 package.json                                  |   2 +-
 src/api/base/mobile.js                        |   4 +-
 src/api/healthCenter/index.js                 | 147 ++++++
 src/views/base/mobile/bannerList/index.vue    |  21 +-
 src/views/base/mobile/complaint/index.vue     |   7 +-
 .../healthCenter/chronicDisease/index.vue     | 234 +++++++++
 .../healthCenter/nutritionScience/index.vue   | 465 ++++++++++++++++++
 src/views/index.vue                           |   2 +-
 src/views/login.vue                           |   2 +-
 src/views/login1.vue                          |   6 +-
 src/views/register.vue                        |   2 +-
 src/views/register1.vue                       |   2 +-
 src/views/system/notice/index.vue             |  11 +-
 vue.config.js                                 |   2 +-
 17 files changed, 887 insertions(+), 26 deletions(-)
 create mode 100644 src/api/healthCenter/index.js
 create mode 100644 src/views/healthCenter/chronicDisease/index.vue
 create mode 100644 src/views/healthCenter/nutritionScience/index.vue

diff --git a/.env.development b/.env.development
index 40bd065d..1f501daa 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 国网安徽经研院绿智食堂
+VUE_APP_TITLE = 绿智食堂
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index ef2a9a77..49e9f2cd 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 国网安徽经研院绿智食堂
+VUE_APP_TITLE = 绿智食堂
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 4738afe1..134b77cf 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 国网安徽经研院绿智食堂
+VUE_APP_TITLE = 绿智食堂
 
 NODE_ENV = production
 
diff --git a/package.json b/package.json
index eef04c86..a48ffbad 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bonus",
   "version": "3.6.4",
-  "description": "国网安徽经研院绿智食堂",
+  "description": "绿智食堂",
   "author": "博诺思",
   "license": "MIT",
   "scripts": {
diff --git a/src/api/base/mobile.js b/src/api/base/mobile.js
index d118ffcc..65db8617 100644
--- a/src/api/base/mobile.js
+++ b/src/api/base/mobile.js
@@ -31,11 +31,11 @@ import request from '@/utils/request'
   export function getCarouselListApi(data) {
       return request({
         url: '/smart-canteen/android/baseSetting/getCarouselImage',
-        method: 'post',
+        method: 'get',
         headers: {
             "merchant-id":"378915229716713472",
         },
-        data: data
+        params: data
       })
   }
   
diff --git a/src/api/healthCenter/index.js b/src/api/healthCenter/index.js
new file mode 100644
index 00000000..bfbec0f9
--- /dev/null
+++ b/src/api/healthCenter/index.js
@@ -0,0 +1,147 @@
+import request from '@/utils/request'
+
+// 分页查询 营养科普-列表
+export function getHealthSciencePageApi(data) {
+  return request({
+    url: '/smart-canteen/health_popular_science/list',
+    method: 'get',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
+
+// 营养科普-新增
+export function addHealthScienceApi(data) {
+    return request({
+        url: '/smart-canteen/health_popular_science',
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+
+// 营养科普-编辑
+export function editHealthScienceApi(data) {
+    return request({
+        url: '/smart-canteen/health_popular_science/edit',
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+
+// 营养科普-删除
+export function delHealthScienceApi(Id) { 
+    return request({
+        url: '/smart-canteen/health_popular_science/del/'+Id,
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        }
+    })
+}
+
+
+// 获取慢性病字典-下拉
+export function dictHealthChronicApi(data) {
+    return request({
+        url: '/smart-canteen/health/chronic/dict-health-chronic',
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+
+// 分页查询 慢性病 列表
+export function getChronicPageApi(data) {
+  return request({
+    url: '/smart-canteen/health_chronic/list',
+    method: 'get',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    params:data
+  })
+}
+// 慢性病-新增
+export function addChronicApi(data) {
+    return request({
+        url: '/smart-canteen/health_chronic',
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+} 
+// 慢性病-更新
+export function editChronicApi(data) {
+    return request({
+        url: '/smart-canteen/health_chronic/edit',
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        },
+        data: data
+    })
+}
+// 慢性病-更新
+export function delChronicApi(Id) {
+    return request({
+        url: '/smart-canteen/health_chronic/del/'+Id,
+        method: 'post',
+        headers: {
+            "merchant-id":"378915229716713472",
+        }
+    })
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/base/mobile/bannerList/index.vue b/src/views/base/mobile/bannerList/index.vue
index cf27e2af..0d8de765 100644
--- a/src/views/base/mobile/bannerList/index.vue
+++ b/src/views/base/mobile/bannerList/index.vue
@@ -24,6 +24,11 @@
         </el-row>
 
         <el-table v-loading="loading" :data="tableListData" height="800"> 
+            <el-table-column label="序号" align="center" width="80" type="index">
+                <template scope="scope"> 
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                </template> 
+            </el-table-column> 
             <el-table-column label="名称" align="center" prop="imageName" :show-overflow-tooltip="true"/>
             <el-table-column label="外链" align="center" prop="externalUrl" :show-overflow-tooltip="true"/> 
             <el-table-column label="图片" align="center" prop="imageUrl">
@@ -210,13 +215,13 @@ export default {
         getList() {
             this.loading = true;
             let param = {
-            // "pageNum": this.queryParams.pageNum, 
-            // "pageSize": this.queryParams.pageSize,  
-            "imageName": this.queryParams.imageName
+                "pageNum": this.queryParams.pageNum, 
+                "pageSize": this.queryParams.pageSize,  
+                "imageName": this.queryParams.imageName
             }
             getCarouselListApi(param).then(response => {
-                this.tableListData = response.data;
-            //   this.total = Number(response.total);
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
                 this.loading = false;
             });
         },  
@@ -279,12 +284,12 @@ export default {
                 id:row.id,
                 imageName:row.imageName,
                 externalUrl:row.externalUrl,
-                imageUrl:row.imageUrl,
+                imageUrl:row.imageUrl, 
             }
             if(row.isEnabled==0){
-                param.isEnabled=2
+                param.isEnabled='2'
             }else{
-                param.isEnabled=0
+                param.isEnabled='0'
             }
             console.log(param)
             updateCarouselApi(param).then(response => {
diff --git a/src/views/base/mobile/complaint/index.vue b/src/views/base/mobile/complaint/index.vue
index ff08d227..9b81e41f 100644
--- a/src/views/base/mobile/complaint/index.vue
+++ b/src/views/base/mobile/complaint/index.vue
@@ -54,7 +54,12 @@
       <el-row :gutter="10" class="mb8">
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row> 
-      <el-table v-loading="loading" :data="tableListData" height="800"> 
+      <el-table v-loading="loading" :data="tableListData" height="800">
+        <el-table-column label="序号" align="center" width="80" type="index">
+            <template scope="scope"> 
+                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+            </template> 
+        </el-table-column> 
         <el-table-column label="投诉人" align="center" prop="custName" :show-overflow-tooltip="true"/>
         <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true"/>
         <el-table-column label="投诉日期" align="center" prop="complaintDate" :show-overflow-tooltip="true"/>
diff --git a/src/views/healthCenter/chronicDisease/index.vue b/src/views/healthCenter/chronicDisease/index.vue
new file mode 100644
index 00000000..e7cc7b6f
--- /dev/null
+++ b/src/views/healthCenter/chronicDisease/index.vue
@@ -0,0 +1,234 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> 
+        <el-form-item label="慢性病名称">
+            <el-input v-model="queryParams.chronicName" placeholder="请输入慢性病名称" maxlength="20" clearable style="width: 220px"/>
+        </el-form-item> 
+        <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd" 
+                >新增</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable"> 
+            <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
+                    <template slot-scope="scope">
+                        <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                    </template>
+            </el-table-column> 
+            <el-table-column label="慢性病名称" align="center" prop="chronicName" :show-overflow-tooltip="true" > 
+            </el-table-column> 
+            <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)" 
+                    >修改</el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)" 
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+        />
+
+        <!-- 对话框 --> 
+        <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="慢性病名称" prop="chronicName">
+                            <el-input v-model="form.chronicName" placeholder="请输入慢性病名称" />
+                        </el-form-item>
+                    </el-col> 
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+    </div>
+</template>
+
+<script>   
+import { getChronicPageApi,addChronicApi, editChronicApi, delChronicApi } from "@/api/healthCenter/index";
+export default {
+    name: "",
+    dicts: [],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            //表格数据
+            tableListData: [],
+            title:"",
+            // 是否显示弹出层
+            open: false,   
+            chronicOptions:[],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                chronicName: undefined,
+            },
+            form: {
+                chronicName:null, 
+            },//详情
+            rules: {
+                chronicName: [
+                    { required: true, message: "名称不能为空", trigger: "blur" }
+                ]
+            }
+        };
+    },
+    created() {  
+        this.getList() 
+    }, 
+    methods: {  
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() { 
+            this.queryParams = {
+                pageNum: 1,
+                pageSize: 10,
+                chronicName: undefined
+            }
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true; 
+            let param = { 
+                ...this.queryParams
+            } 
+              getChronicPageApi(param).then(response => {
+                  this.tableListData = response.rows;
+                  this.total = Number(response.total);
+                this.loading = false;
+              });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() { 
+            this.form = {
+                chronicName:null
+            };
+            this.resetForm("form");
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增";
+        },
+        handleUpdate(row) {
+            this.form = Object.assign({}, row);
+            this.open = true;
+            this.title = "修改";
+        },
+        /** 提交按钮 */
+        submitForm: function() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.chronicId != undefined) {
+                        editChronicApi(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addChronicApi(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        handleDelete(row) {  
+            this.$modal.confirm('是否确认删除数据项？').then(function() {
+                return delChronicApi(row.id);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .remind-question{
+        width: 100%;
+        height: 50px;
+        font-size: 22px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    .remind-title{
+        width: 100%;
+        height: 40px;
+        font-size: 16px;
+        font-weight: bold;
+        color: #000;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    //隐藏图片上传框的css
+    ::v-deep.disabled {
+        .el-upload--picture-card {
+            display: none;
+        }
+    }
+</style>
diff --git a/src/views/healthCenter/nutritionScience/index.vue b/src/views/healthCenter/nutritionScience/index.vue
new file mode 100644
index 00000000..e9f2dafb
--- /dev/null
+++ b/src/views/healthCenter/nutritionScience/index.vue
@@ -0,0 +1,465 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form-item label="日期">
+            <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                format="yyyy-MM-dd" style="width: 220px"
+                :picker-options="pickerOptions" >
+            </el-date-picker>
+        </el-form-item>
+        <el-form-item label="文章标题">
+            <el-input v-model="queryParams.articleTitle" placeholder="请输入文章标题" maxlength="20" clearable style="width: 220px"/>
+        </el-form-item>
+        
+        <el-form-item label="适用慢性病">
+            <el-select v-model="queryParams.chronicList" multiple style="width: 220px" clearable collapse-tags>
+                <el-option v-for="item in chronicOptions"
+                    :key="item.chronicId"
+                    :label="item.chronicName"
+                    :value="item.chronicId"
+                ></el-option> 
+            </el-select>  
+        </el-form-item>
+        <el-form-item label="文章类型">
+            <el-select v-model="queryParams.articleType"  style="width: 220px" clearable collapse-tags>
+                <el-option label="原创" value="1"></el-option>
+                <el-option label="转载" value="2"></el-option> 
+            </el-select>  
+        </el-form-item> 
+
+        <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd" 
+                >新增</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable"> 
+            <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
+                    <template slot-scope="scope">
+                        <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                    </template>
+            </el-table-column> 
+            <el-table-column label="封面照片" align="center" prop="coverPhoto" :show-overflow-tooltip="true" >
+                <template slot-scope="scope">
+                    <img :src="scope.row.coverPhoto" v-if="scope.row.coverPhoto" alt="" style="width: 80px;height: 40px;" @click="openImg(scope.row)">
+                    <span v-else>无</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="文章标题" align="center" prop="articleTitle" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="适用慢性病" align="center" prop="chronicNames" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column label="文章类型" align="center" prop="articleType" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.articleType==1">原创</span>
+                    <span v-if="scope.row.articleType==2">转载</span>
+                </template> 
+            </el-table-column>
+            <el-table-column label="发布时间" align="center" prop="pushTime" :show-overflow-tooltip="true">
+            </el-table-column>
+            <el-table-column label="可见状态" align="center" prop="ifVisible" :show-overflow-tooltip="true">
+                
+            </el-table-column> 
+            <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handleUpdate(scope.row)" 
+                    >修改</el-button>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)" 
+                    >删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+        />
+
+        <!-- 对话框 --> 
+        <el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="文章标题" prop="articleTitle">
+                            <el-input v-model="form.articleTitle" placeholder="请输入文章标题" maxlength="20"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="文章摘要" prop="summary">
+                            <el-input v-model="form.summary" placeholder="请输入文章摘要" maxlength="30"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="适用慢性病" prop="chronicIdList">
+                            <el-select v-model="form.chronicIdList" multiple style="width: 100%" clearable collapse-tags>
+                                <el-option v-for="item in chronicOptions"
+                                    :key="item.chronicId"
+                                    :label="item.chronicName"
+                                    :value="item.chronicId"
+                                ></el-option> 
+                            </el-select>  
+                        </el-form-item>     
+                    </el-col>      
+                    <el-col :span="12">
+                        <el-form-item label="文章封面" prop="coverPhoto">
+                            <el-upload
+                                :http-request="
+                                    (obj) => imgUpLoad(obj, 'fileUrl')
+                                "
+                                action="#"
+                                :limit="1"
+                                :file-list="fileList"
+                                :show-file-list="true"
+                                list-type="picture-card"
+                                accept=".png, .jpg, .jpeg"
+                                :on-success="handleAvatarSuccess"
+                                :class="{ disabled: uploadDisabled }"
+                                :on-preview="handlePictureCardPreview"
+                                :on-remove="handleRemove"
+                            >
+                                <i
+                                    class="el-icon-plus avatar-uploader-icon"
+                                ></i>
+                            </el-upload> 
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="内容"  prop="articleContent">
+                            <editor v-model="form.articleContent" :min-height="192"/>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+    </div>
+</template>
+
+<script>   
+import { dictHealthChronicApi,getHealthSciencePageApi,addHealthScienceApi,editHealthScienceApi,delHealthScienceApi } from "@/api/healthCenter/index";
+import { imgUpLoadTwo } from '@/api/system/upload'
+
+export default {
+    name: "",
+    dicts: [],
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            //表格数据
+            tableListData: [],
+            title:"",
+            // 是否显示弹出层
+            open: false, 
+            dateRange:[new Date(),new Date()],
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
+                    picker.$emit('pick', [start, end]);
+                    }
+                },{
+                    text: '最近一个月',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                    picker.$emit('pick', [start, end]);
+                    }
+                },{
+                    text: '最近三个月',
+                    onClick(picker) {
+                    const start = new Date();
+                    const end = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
+                    picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            chronicOptions:[],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                articleTitle: undefined,//标题
+                chronicList:[],  //慢性病
+                articleType:null //类型 
+            },
+            form: {
+                articleTitle:null,
+                summary:null,
+                chronicIdList:[],
+                coverPhoto:null,
+                articleType:1,
+                articleContent:null, 
+            },//详情
+            rules: {
+                articleTitle: [
+                    { required: true, message: "文章标题不能为空", trigger: "blur" }
+                ],
+                articleContent: [
+                    { required: true, message: "文章内容不能为空", trigger: "blur" }
+                ]
+            }, 
+            fileList: [],//图片
+            checkUrlList: [],//图片
+            checkUrlNameList: [],//食堂图片
+            dialogVisible:false,//图片弹窗
+            dialogImageUrl:"",//图片弹窗  
+        };
+    },
+    created() {  
+        this.getList()
+        this.getChronicList()
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.checkUrlList.length > 0
+        },
+    },
+    methods: { 
+        //慢性病类型
+        getChronicList() {
+            dictHealthChronicApi({}).then((response) => {
+                this.chronicOptions = response.data;
+            });
+        },   
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.dateRange = [new Date(),new Date()]
+            this.queryParams = {
+                pageNum: 1,
+                pageSize: 10,
+                articleTitle: undefined,//标题
+                chronicList:[],  //慢性病
+                articleType:null //类型 
+            }
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true; 
+            let param = {  
+                "pageNum":this.queryParams.pageNum,
+                "pageSize":this.queryParams.pageSize,
+                "articleTitle":this.queryParams.articleTitle,
+                "articleType":this.queryParams.articleType,
+                "chronicIds":this.queryParams.chronicList.join(",")||"",
+                "startDate":this.formatDate(this.dateRange[0]),
+                "endDate":this.formatDate(this.dateRange[1])
+            }
+            // if(this.queryParams.chronicList.length>0){
+            //     this.queryParams.chronicIds = this.queryParams.chronicList.join(",")
+            // }else{
+            //     this.queryParams.chronicIds = ""
+            // }
+            getHealthSciencePageApi(param).then(response => {
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
+            this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.fileList=[]
+            this.checkUrlList=[]
+            this.checkUrlNameList=[]
+            this.form = {
+                articleTitle:null,
+                summary:null,
+                chronicIdList:[],
+                coverPhoto:null,
+                articleType:1,
+                articleContent: null, 
+            };
+            this.resetForm("form");
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增";
+        },
+        handleUpdate(row) {
+            this.form = Object.assign({}, row);
+            if(this.form.coverPhoto){
+                this.fileList=[{url:this.form.coverPhoto}]
+                this.checkUrlList=[this.form.coverPhoto]
+            }else{
+                this.fileList=[]
+                this.checkUrlList=[]
+            }
+            this.open = true;
+            this.title = "修改";
+        },
+        /** 提交按钮 */
+        submitForm: function() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if(this.form.chronicIdList.length>0){
+                        this.form.chronicIds = this.form.chronicIdList.join(",")
+                    }else{
+                        this.form.chronicIds = ""
+                    }
+                    this.form.coverPhoto = this.checkUrlList[0] 
+                    
+                    if (this.form.articleId != undefined) {
+                        editHealthScienceApi(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addHealthScienceApi(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        handleDelete(row) {  
+            this.$modal.confirm('是否确认删除数据项？').then(function() {
+                return delHealthScienceApi(row.articleId);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        }, 
+        openImg(row) {
+          this.dialogImageUrl = row.coverPhoto;
+          this.dialogVisible = true;
+        },
+        // 图片上传
+        imgUpLoad(param, name, index) {
+            // console.log(param,'image')
+            param.type = 'canteen'
+            imgUpLoadTwo(param).then((res) => {
+                if (res.code == 200) {
+                    this.checkUrlList.push(res.data.url)
+                    this.checkUrlNameList.push(res.data.name)
+                } else { 
+                    this.$modal.msgError(res.msg)
+                }
+            })
+            .catch((error) => { 
+                this.$modal.msgError(error)
+            })
+        },
+        handleAvatarSuccess(res, file) {
+            console.log('success')
+        }, 
+        handleRemove(file, fileList) {
+            let sum = 0
+            this.checkUrlNameList.forEach((item, index) => {
+                if (item == file.name) {
+                    sum = index
+                }
+            })
+            this.checkUrlNameList.splice(sum, 1)
+            this.checkUrlList.splice(sum, 1)
+        },
+        //图片点击查看
+        handlePictureCardPreview(file) { 
+            this.dialogImageUrl = file.url
+            this.dialogVisible = true
+        },
+        //日期
+        formatDate(date) {
+            // 格式化为 YYYY-MM-DD
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${year}-${month}-${day}`;
+        } 
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .remind-question{
+        width: 100%;
+        height: 50px;
+        font-size: 22px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    .remind-title{
+        width: 100%;
+        height: 40px;
+        font-size: 16px;
+        font-weight: bold;
+        color: #000;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+    //隐藏图片上传框的css
+    ::v-deep.disabled {
+        .el-upload--picture-card {
+            display: none;
+        }
+    }
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index d4596178..3a8269d1 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>国网安徽经研院绿智食堂</h2>
+        <h2>绿智食堂</h2>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>
         </p>
diff --git a/src/views/login.vue b/src/views/login.vue
index 4013ceff..15baca00 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">国网安徽经研院绿智食堂</h3>
+      <h3 class="title">绿智食堂</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/src/views/login1.vue b/src/views/login1.vue
index 9d1c0a95..2ca85ab0 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -3,7 +3,7 @@
     <div class="login">
       <div class="login-form">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-          <h3 class="title">国网安徽经研院绿智食堂</h3>
+          <h3 class="title">绿智食堂</h3>
           <template v-if="loginMethod === 'password'">
             <el-form-item prop="username">
               <el-input
@@ -128,7 +128,7 @@
               <span v-else>登 录 中...</span>
             </el-button>
           </el-form-item>
-          <el-form-item>
+          <!-- <el-form-item>
             <div class="login-divider">第三方登录</div>
             <div class="login-icons">
               <div class="login-icon">
@@ -141,7 +141,7 @@
                 <img :src="qq" alt="QQ">
               </div>
             </div>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
       </div>
     </div>
diff --git a/src/views/register.vue b/src/views/register.vue
index ed2b271f..30e09fe6 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">国网安徽经研院绿智食堂</h3>
+      <h3 class="title">绿智食堂</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/src/views/register1.vue b/src/views/register1.vue
index 2148cd25..c858c71c 100644
--- a/src/views/register1.vue
+++ b/src/views/register1.vue
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="register">
       <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-        <h3 class="title">国网安徽经研院绿智食堂</h3>
+        <h3 class="title">绿智食堂</h3>
 
         <el-form-item prop="nickName">
           <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="请输入姓名">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index d45067e8..9beed0ef 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -71,19 +71,24 @@
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" height="650" >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column label="序号" align="center" width="80" type="index">
+          <template scope="scope"> 
+              <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          </template> 
+      </el-table-column> 
+      <!-- <el-table-column label="公告ID" align="center" prop="noticeId" width="120" /> -->
       <el-table-column
         label="公告标题"
         align="center"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
+      <el-table-column label="公告类型" align="center" prop="noticeType" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
+      <el-table-column label="状态" align="center" prop="status" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
         </template>
diff --git a/vue.config.js b/vue.config.js
index 69bb9549..b5951757 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '国网安徽经研院绿智食堂' // 网页标题
+const name = process.env.VUE_APP_TITLE || '绿智食堂' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口