提交

src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   title: '潜山市防疫数据平台',
   // urls: `http://118.178.139.79:7090`,
   urls: `http://192.168.101.11:8090`,
-   // urls: `http://192.168.101.49:8090`,
+   // urls: `https://qsfy.qs163.cn`,
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/index.vue

@@ -1,36 +1,38 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="5">
-      <el-col :sm="24" :lg="17" >
-        <div class="index_heade">
-          <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
-          <p class="index_headetab">
-            <span :class="[num == index ? ' spanto' : '']" v-for="(item,index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">{{item.dictLabel}}</span>
-          </p>
-                <div style="height: 87%;">
-                  <ul class="index_headerUl">
-                    <li v-for="(item,index) in configList" :key="index" @click="headerCld(item)">
-                        <img src="../assets/images/icon_list_sj.png" alt="">
-                        <p>{{item.notice_title}}</p>
-                        <span>{{item.create_time}}</span>
-                    </li>
-                  </ul>
-                  <div class="index_haderPagin">
-                    <el-pagination
-                          v-show="total>0"
-                         @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="currentPage3"
-                         :page-size="queryParams.pageSize"
-                         layout="prev, pager, next, jumper"
-                         :total="total">
-                    </el-pagination>
-                    <span>共 {{total}} 条  每页显示 10 条  </span>
-                  </div>
-                </div>
-        </div>
-        <!-- 列表 -->
-          <!-- <el-col :sm="24" :lg="24"  style="margin-top: 20px;" >
+	<div class="app-container home">
+		<el-row :gutter="5">
+			<el-col :sm="24" :lg="17">
+				<div class="index_heade">
+					<img src="../assets/images/icon_more.png" alt="" class="index_headerImg" />
+					<p class="index_headetab">
+						<span :class="[num == index ? ' spanto' : '']" v-for="(item, index) in editableTabs" :key="index" @click="tabSbu(item.dictValue)">
+							{{ item.dictLabel }}
+						</span>
+					</p>
+					<div style="height: 87%;">
+						<ul class="index_headerUl">
+							<li v-for="(item, index) in configList" :key="index" @click="headerCld(item)">
+								<img src="../assets/images/icon_list_sj.png" alt="" />
+								<p>{{ item.notice_title }}</p>
+								<span>{{ item.create_time }}</span>
+							</li>
+						</ul>
+						<div class="index_haderPagin">
+							<el-pagination
+								v-show="total > 0"
+								@size-change="handleSizeChange"
+								@current-change="handleCurrentChange"
+								:current-page.sync="currentPage3"
+								:page-size="queryParams.pageSize"
+								layout="prev, pager, next, jumper"
+								:total="total"
+							></el-pagination>
+							<span>共 {{ total }} 条 每页显示 10 条</span>
+						</div>
+					</div>
+				</div>
+				<!-- 列表 -->
+				<!-- <el-col :sm="24" :lg="24"  style="margin-top: 20px;" >
                <div class="index_heade index_headeNav" v-show="true">
                  <img src="../assets/images/icon_more.png" alt="" class="index_headerImg">
                  <p class="index_headetab">
@@ -100,9 +102,9 @@
                          </div>
                </div>
           </el-col> -->
-        <!-- </el-row> -->
-        <!-- 公司概况 -->
-        <!-- <el-col :sm="24" :lg="24">
+				<!-- </el-row> -->
+				<!-- 公司概况 -->
+				<!-- <el-col :sm="24" :lg="24">
            <div class="index_heade  index_headeProfile">
              <img src="../assets/images/icon_tjbj.png" alt="" class="index_headerImg">
             <p class="index_headetab">
@@ -129,1266 +131,1274 @@
                    </div>
            </div>
         </el-col> -->
-      </el-col>
+			</el-col>
 
-      <el-col :sm="24" :lg="7" style="padding-left: 15px">
-         <div class="index_nav">
-          <div class="index_navTime">
-            <p class="index_navTimep" @click="handleAdd">
-              <span>日程</span>
-              <span><i class="el-icon-date" ></i>创建日程</span>
-            </p>
-            <el-calendar id="calendar">
-                <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-                <template
-                  slot="dateCell"
-                  slot-scope="{date, data}">
-                  <!--自定义内容-->
-                  <div>
-                    <div class="calendar-day" style="text-align: center">
-                      <el-tooltip v-if="brightDate.indexOf(data.day) != -1" class="item" effect="dark" :content="content(data.day)" placement="right">
-                        <span class="everyDay">{{ data.day.split('-').slice(2).join('-') }}</span>
-                      </el-tooltip>
-                      <span v-else>{{ data.day.split('-').slice(2).join('-') }}</span>
-                      <!-- <p :class="data.isSelected ? 'is-selected' : ''">
+			<el-col :sm="24" :lg="7" style="padding-left: 15px">
+				<div class="index_nav">
+					<div class="index_navTime">
+						<p class="index_navTimep" @click="handleAdd">
+							<span>日程</span>
+							<span>
+								<i class="el-icon-date"></i>
+								创建日程
+							</span>
+						</p>
+						<el-calendar id="calendar">
+							<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+							<template slot="dateCell" slot-scope="{ date, data }">
+								<!--自定义内容-->
+								<div>
+									<div class="calendar-day" style="text-align: center">
+										<el-tooltip v-if="brightDate.indexOf(data.day) != -1" class="item" effect="dark" :content="content(data.day)" placement="right">
+											<span class="everyDay">
+												{{
+													data.day
+														.split('-')
+														.slice(2)
+														.join('-')
+												}}
+											</span>
+										</el-tooltip>
+										<span v-else>
+											{{
+												data.day
+													.split('-')
+													.slice(2)
+													.join('-')
+											}}
+										</span>
+										<!-- <p :class="data.isSelected ? 'is-selected' : ''">
                             {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : ''}}
                       </p> -->
-                    </div>
-                  </div>
-                </template>
-              </el-calendar>
-            <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-          </div>
-         </div>
-         <!-- 备忘录 -->
-         <el-col :sm="24" :lg="24" >
-           <div class="index_nav index_memoranduNnavTime">
-            <div class="index_navTime ">
-              <p class="index_navTimep">
-                <span>备忘录</span>
-                <span @click="memoere"><i class="el-icon-date"></i>创建备忘录</span>
-              </p>
-              <ul >
-                <li v-for="(item,index) in getmemorandum" :key="index" >
-                  <p>{{item.memorandum_title}}
-                  </p>
-                  <div class="index_navspande">
-                    <span>
-                    {{item.remind_time}}
-                    </span>
-                    <img src="../assets/images/deletety.png" alt="" v-if="shower" @click="index_deledetfe(item.id)">
-                  </div>
-                </li>
-
-              </ul>
-              <img src="../assets/images/icon_more.png" alt="" class="imjud">
-<!--              <el-calendar v-model="value">
+									</div>
+								</div>
+							</template>
+						</el-calendar>
+						<img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg" />
+					</div>
+				</div>
+				<!-- 备忘录 -->
+				<el-col :sm="24" :lg="24">
+					<div class="index_nav index_memoranduNnavTime">
+						<div class="index_navTime ">
+							<p class="index_navTimep">
+								<span>备忘录</span>
+								<span @click="memoere">
+									<i class="el-icon-date"></i>
+									创建备忘录
+								</span>
+							</p>
+							<ul>
+								<li v-for="(item, index) in getmemorandum" :key="index">
+									<p>{{ item.memorandum_title }}</p>
+									<div class="index_navspande">
+										<span>{{ item.remind_time }}</span>
+										<img src="../assets/images/deletety.png" alt="" v-if="shower" @click="index_deledetfe(item.id)" />
+									</div>
+								</li>
+							</ul>
+							<img src="../assets/images/icon_more.png" alt="" class="imjud" />
+							<!--              <el-calendar v-model="value">
               </el-calendar> -->
 
-              <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-            </div>
-           </div>
-         </el-col >
-         <!-- 通讯录 -->
-         <el-col :sm="24" :lg="24">
-           <div class="index_nav index_memoranduMail">
-                       <div class="index_navTime ">
-                         <p class="index_navTimep">
-                           <span>通讯录</span>
-                           <img src="../assets/images/icon_more.png" alt="" class="index_navTimeimgtwo">
-                           <!-- <span><i class="el-icon-date"></i>创建日程</span> -->
-                         </p>
-                        <div class="index_memoranduMailnav">
-                           <div class="tab_tol">
-                             <el-form class="iejgu" :model="queryParamsail" ref="queryForm" :inline="true" >
-                               <dynamic-forms :type="0" :ref="item.columnName" :config="queryParamsail" @inputs="changeFn" :formConfig="item"
-                                 v-for="(item,index) in queryDataali.queryList" :key='index' />
-                               <el-form-item style="width: 20%; text-align: right;">
-                                 <el-button type="primary"  size="mini" @click="handleQuerygty">搜索</el-button>
-
-                               </el-form-item>
-                             </el-form>
-                             <el-table  stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
-                               <el-table-column :width="item.columnComment == 'id'? '40' : item.columnComment == '姓名'? '60' : '110'"  :label="item.columnComment" align="left" :prop="item.columnName" v-for="(item,index) in postList.tableHeadList" :key="index"  />
-                             </el-table>
-                           </div>
-                          <div class="index_haderPagin index_haderPaginfoiu">
-                            <!-- getLisail -->
-                            <el-pagination
-                                 @size-change="handleSizeChangeali"
-                                 @current-change="handleCurrentChangeali"
-                                 :current-page.sync="currentPage3"
-                                 :page-size="queryParamsail.pageSize"
-                                 :small= "true"
-                                 layout="prev, pager, next, jumper"
-                                 :total="totalali">
-                            </el-pagination>
-                          </div>
-                        </div>
-                      <img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg">
-                       </div>
-            </div>
-         </el-col>
-
-
-      </el-col>
-    </el-row>
-    <!-- <el-divider /> -->
-  <!-- 添加或修改公告对话框 -->
-  <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
-            <el-form ref="form" :model="form" :rules="queryData.rules" label-width="160px" class="from_index">
-              <el-row>
-                <el-col :span="24" >
-                 <dynamic-forms @modelFn="modelFn"   :ref="item.columnName" :config="form.fixedData" @inputs = "changeFn" :formConfig="item" v-for="(item,index) in queryData.showData" :key='index' />
-                </el-col>
-              </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="handleQuery">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
-            </div>
-  </el-dialog>
-  <!-- 通知公告弹窗 -->
-  <el-dialog class="index_ese" :close-on-click-modal="false" :title="title" :visible.sync="openety" width="980px" append-to-body>
-           <div class="index_headertan" >
-               <p v-html="actingk.notice_title == undefined? '暂无数据' : actingk.notice_title"></p>
-               <p>{{actingk.create_time == undefined? '暂无数据' : actingk.create_time}} 发布人:{{actingk.create_by}}</p>
-               <pre>
+							<img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg" />
+						</div>
+					</div>
+				</el-col>
+				<!-- 通讯录 -->
+				<el-col :sm="24" :lg="24">
+					<div class="index_nav index_memoranduMail">
+						<div class="index_navTime ">
+							<p class="index_navTimep">
+								<span>通讯录</span>
+								<img src="../assets/images/icon_more.png" alt="" class="index_navTimeimgtwo" />
+								<!-- <span><i class="el-icon-date"></i>创建日程</span> -->
+							</p>
+							<div class="index_memoranduMailnav">
+								<div class="tab_tol">
+									<el-form class="iejgu" :model="queryParamsail" ref="queryForm" :inline="true">
+										<dynamic-forms
+											:type="0"
+											:ref="item.columnName"
+											:config="queryParamsail"
+											@inputs="changeFn"
+											:formConfig="item"
+											v-for="(item, index) in queryDataali.queryList"
+											:key="index"
+										/>
+										<el-form-item style="width: 20%; text-align: right;">
+											<el-button type="primary" size="mini" @click="handleQuerygty">搜索</el-button>
+										</el-form-item>
+									</el-form>
+									<el-table stripe v-loading="loading" :data="postList.rows" @selection-change="handleSelectionChange">
+										<el-table-column
+											:width="item.columnComment == 'id' ? '40' : item.columnComment == '姓名' ? '60' : '110'"
+											:label="item.columnComment"
+											align="left"
+											:prop="item.columnName"
+											v-for="(item, index) in postList.tableHeadList"
+											:key="index"
+										/>
+									</el-table>
+								</div>
+								<div class="index_haderPagin index_haderPaginfoiu">
+									<!-- getLisail -->
+									<el-pagination
+										@size-change="handleSizeChangeali"
+										@current-change="handleCurrentChangeali"
+										:current-page.sync="currentPage3"
+										:page-size="queryParamsail.pageSize"
+										:small="true"
+										layout="prev, pager, next, jumper"
+										:total="totalali"
+									></el-pagination>
+								</div>
+							</div>
+							<img src="../assets/images/pic_kpbg.png" alt="" class="index_navTimeimg" />
+						</div>
+					</div>
+				</el-col>
+			</el-col>
+		</el-row>
+		<!-- <el-divider /> -->
+		<!-- 添加或修改公告对话框 -->
+		<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="980px" append-to-body>
+			<el-form ref="form" :model="form" :rules="queryData.rules" label-width="160px" class="from_index">
+				<el-row>
+					<el-col :span="24">
+						<dynamic-forms
+							@modelFn="modelFn"
+							:ref="item.columnName"
+							:config="form.fixedData"
+							@inputs="changeFn"
+							:formConfig="item"
+							v-for="(item, index) in queryData.showData"
+							:key="index"
+						/>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="handleQuery">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+		<!-- 通知公告弹窗 -->
+		<el-dialog class="index_ese" :close-on-click-modal="false" :title="title" :visible.sync="openety" width="980px" append-to-body>
+			<div class="index_headertan">
+				<p v-html="actingk.notice_title == undefined ? '暂无数据' : actingk.notice_title"></p>
+				<p>{{ actingk.create_time == undefined ? '暂无数据' : actingk.create_time }} 发布人:{{ actingk.create_by }}</p>
+				<pre>
                  <div v-html="actingk.notice_content"></div>
                </pre>
-           </div>
-
-  </el-dialog>
-
-  </div>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { listIndex, getUserProfile, listIndextwo, listIndextherr, listIndexfou, listIndextanl, getConfig, delConfig, addConfig, addConfigindex, updateConfig, clearCache, delIndexnabd,listIndexber, getTableQuery } from "@/api/system/config";
+import {
+	listIndex,
+	getUserProfile,
+	listIndextwo,
+	listIndextherr,
+	listIndexfou,
+	listIndextanl,
+	getConfig,
+	delConfig,
+	addConfig,
+	addConfigindex,
+	updateConfig,
+	clearCache,
+	delIndexnabd,
+	listIndexber,
+	getTableQuery
+} from '@/api/system/config';
 import Editor from '@/components/Editor';
 export default {
-  name: "index",
-  components: {
-    Editor
-  },
-  data() {
-    return {
-      // 版本号
-      version: "2.5.0",
-       currentPage3: 1,
-       total:0,
-       totalprofile:0,
-       totalali:0,
-       pageSize:6,
-       activeName: 'second',
-       // 是否显示弹出层
-       open: false,
-       // 弹出层标题
-       title: "",
-       value: new Date(),
-       editableTabs: [],
-       attendance:['待我审批','已办理','我的流程','驳回审批'],
-       editableTabsteo:[],
-       configList:[],
-       queryParams:{
-        table:'sys_notice',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:10,
-        fixedData:{
-          condition:{
-            notice_type:1,
-            status:0
-          }
-        }
-
-      },
-      queryParamstab:{
-        table:'sys_notice',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:6,
-        condition:{
-          notice_type:1
-        }
-      },
-      // 公司概况
-      queryParamstabprofile:{
-        table:'sys_info',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:1,
-        fixedData:{
-          condition:{
-            info_type:1
-          }
-        }
-
-      },
-      // 日历
-      queryParamscalendar:{
-        table:'sys_schedule',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:10,
-        fixedData:{
-          condition:{
-            create_by:''
-          }
-        }
-      },
-      // 备忘录
-      queryParamstabmemorandum:{
-        table:'sys_memorandum',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:6,
-        fixedData:{
-          condition:{
-            create_by:''
-          }
-        }
-      },
-      // 通讯录
-      queryParamsail:{
-        table:'sys_contacts',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:3,
-        fixedData:{
-          condition:{
-
-          }
-        }
-      },
-      // 通讯录搜索
-      queryParamsailss:{
-       table: '',
-       pageNo: 1,
-       isUi: false,
-       pageSize: 10,
-       orderBy: 'create_time desc',
-       fixedData: {
-         condition: {
-
-         }
-       }
-      },
-      queryParamsijeu:{
-        table:'sys_contacts',
-      },
-      num:0,
-      numlist:0,
-      numprofile:0,
-      dictType:'sys_notice_type',
-      // 公司概况
-      dictTypetwo:'sys_describe_type',
-      gettabList:[],
-      getLisprofileone:[],
-      // 备忘录
-      getmemorandum:[],
-      //通讯录参数
-      aliemg:{
-        table:'sys_contacts',
-        orderBy:'create_time desc',
-        pageNo:1,
-        pageSize:4,
-      },
-      tableDataalid:[],
-      getLisaillie:[],
-      alendarList:[],
-      calendarData: [
-            ],
-      ary:[],
-      tieku:'',
-      comg:'',
-      aekti:'',
-      // 弹框数据
-      form:{
-      },
-      // 表单校验
-      rules: {
-      },
-      //日历弹框
-      calendaradd:{
-        table:'sys_schedule',
-        isUi:false,
-        fixedData:{
-          id:-1
-        }
-
-      },
-      //备忘录弹框
-      calendaraddmer:{
-        table:'sys_memorandum',
-        isUi:false,
-        fixedData:{
-          id:-1
-        }
-      },
-      // input
-      inputList:[],
-      // 时间
-      dataList:[],
-      //单选框
-      radiolist:[],
-      // 复选框
-      chekbosList:[],
-      //下拉框
-      selectList:[],
-      editorList:[],
-      queryData: {},
-      queryDatatwo:{},
-      queryDatathre:{},
-      queryDataali:{},
-      nummer:0   ,//0 是日历  1 是备忘录
-      forme:{
-        table:'',
-        objId:-1,
-        fixedData:{}
-      },
-      rjtu:[],
-      truew:[],
-      fales:[],
-      postList:{},
-      arr:'2,2,3,3,4,4',
-      // 删除参数
-      deledlid:{
-        table:'sys_memorandum',
-        idList:[],
-        user: {
-          oldPassword: undefined,
-          newPassword: undefined,
-          confirmPassword: undefined
-        },
-        shower:true, //判断删除图标是否显示
-      },
-      titlees:'通知公告',//通知公告弹框
-      openety:false,
-      actingk:{}
-    };
-  },
-
-  created() {
-    // console.log(this.user)
-    this.unique(this.arr)
-    this.getList()
-    this.getListtab()
-    this.getLiser()
-    this.getLisprofile()
-    // 用户信息
-    this.getUser()
-    // this.getLismemorandum()  //备忘录
-    this.getLisail()//通讯录
-    this.getLisailtwo()
-    this.init()
-
-  },
-  computed: {
+	name: 'index',
+	components: {
+		Editor
+	},
+	data() {
+		return {
+			// 版本号
+			version: '2.5.0',
+			currentPage3: 1,
+			total: 0,
+			totalprofile: 0,
+			totalali: 0,
+			pageSize: 6,
+			activeName: 'second',
+			// 是否显示弹出层
+			open: false,
+			// 弹出层标题
+			title: '',
+			value: new Date(),
+			editableTabs: [],
+			attendance: ['待我审批', '已办理', '我的流程', '驳回审批'],
+			editableTabsteo: [],
+			configList: [],
+			queryParams: {
+				table: 'sys_notice',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 10,
+				fixedData: {
+					condition: {
+						notice_type: 1,
+						status: 0
+					}
+				}
+			},
+			queryParamstab: {
+				table: 'sys_notice',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 6,
+				condition: {
+					notice_type: 1
+				}
+			},
+			// 公司概况
+			queryParamstabprofile: {
+				table: 'sys_info',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 1,
+				fixedData: {
+					condition: {
+						info_type: 1
+					}
+				}
+			},
+			// 日历
+			queryParamscalendar: {
+				table: 'sys_schedule',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 10,
+				fixedData: {
+					condition: {
+						create_by: ''
+					}
+				}
+			},
+			// 备忘录
+			queryParamstabmemorandum: {
+				table: 'sys_memorandum',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 6,
+				fixedData: {
+					condition: {
+						create_by: ''
+					}
+				}
+			},
+			// 通讯录
+			queryParamsail: {
+				table: 'sys_contacts',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 3,
+				fixedData: {
+					condition: {}
+				}
+			},
+			// 通讯录搜索
+			queryParamsailss: {
+				table: '',
+				pageNo: 1,
+				isUi: false,
+				pageSize: 10,
+				orderBy: 'create_time desc',
+				fixedData: {
+					condition: {}
+				}
+			},
+			queryParamsijeu: {
+				table: 'sys_contacts'
+			},
+			num: 0,
+			numlist: 0,
+			numprofile: 0,
+			dictType: 'sys_notice_type',
+			// 公司概况
+			dictTypetwo: 'sys_describe_type',
+			gettabList: [],
+			getLisprofileone: [],
+			// 备忘录
+			getmemorandum: [],
+			//通讯录参数
+			aliemg: {
+				table: 'sys_contacts',
+				orderBy: 'create_time desc',
+				pageNo: 1,
+				pageSize: 4
+			},
+			tableDataalid: [],
+			getLisaillie: [],
+			alendarList: [],
+			calendarData: [],
+			ary: [],
+			tieku: '',
+			comg: '',
+			aekti: '',
+			// 弹框数据
+			form: {},
+			// 表单校验
+			rules: {},
+			//日历弹框
+			calendaradd: {
+				table: 'sys_schedule',
+				isUi: false,
+				fixedData: {
+					id: -1
+				}
+			},
+			//备忘录弹框
+			calendaraddmer: {
+				table: 'sys_memorandum',
+				isUi: false,
+				fixedData: {
+					id: -1
+				}
+			},
+			// input
+			inputList: [],
+			// 时间
+			dataList: [],
+			//单选框
+			radiolist: [],
+			// 复选框
+			chekbosList: [],
+			//下拉框
+			selectList: [],
+			editorList: [],
+			queryData: {},
+			queryDatatwo: {},
+			queryDatathre: {},
+			queryDataali: {},
+			nummer: 0, //0 是日历  1 是备忘录
+			forme: {
+				table: '',
+				objId: -1,
+				fixedData: {}
+			},
+			rjtu: [],
+			truew: [],
+			fales: [],
+			postList: {},
+			arr: '2,2,3,3,4,4',
+			// 删除参数
+			deledlid: {
+				table: 'sys_memorandum',
+				idList: [],
+				user: {
+					oldPassword: undefined,
+					newPassword: undefined,
+					confirmPassword: undefined
+				},
+				shower: true //判断删除图标是否显示
+			},
+			titlees: '通知公告', //通知公告弹框
+			openety: false,
+			actingk: {}
+		};
+	},
 
-     // 时间高亮的数组
-     brightDate () {
-       // let ary = []
-       var that =  this
-       if(that.calendarData.length !==null){
-         for (var i = 0 ; i < that.calendarData.length; i++) {
-           that.calendarData[i].love="yu"
-           if(that.calendarData[i].remind_time !== undefined){
-             that.ary.push(that.calendarData[i].remind_time)
-           }
-         }
-       }
-       return that.ary
-     }
+	created() {
+		// console.log(this.user)
+		this.unique(this.arr);
+		this.getList();
+		this.getListtab();
+		this.getLiser();
+		this.getLisprofile();
+		// 用户信息
+		this.getUser();
+		// this.getLismemorandum()  //备忘录
+		this.getLisail(); //通讯录
+		this.getLisailtwo();
+		this.init();
+	},
+	computed: {
+		// 时间高亮的数组
+		brightDate() {
+			// let ary = []
+			var that = this;
+			if (that.calendarData.length !== null) {
+				for (var i = 0; i < that.calendarData.length; i++) {
+					that.calendarData[i].love = 'yu';
+					if (that.calendarData[i].remind_time !== undefined) {
+						that.ary.push(that.calendarData[i].remind_time);
+					}
+				}
+			}
+			return that.ary;
+		}
+	},
+	methods: {
+		// 通讯录搜索
+		init() {
+			console.log(1243);
+			getTableQuery({
+				table: this.queryParamsijeu.table
+			}).then(res => {
+				let data = res.data;
+				this.queryDataali = data;
+			});
+		},
+		// Tooltip 文字提示
+		content(date) {
+			let data = date;
+			let datase = date;
+			let content = '';
+			let conert = '';
+			let conertre = '';
+			let nujue = 0;
+			for (var i = 0; i < this.calendarData.length; i++) {
+				if (this.calendarData[i].schedule_content !== undefined) {
+					this.calendarData[i].schedule_content = this.calendarData[i].schedule_content.replace(/<\/?[^>]*>/g, '');
+				}
+				if (data == this.calendarData[i].remind_time) {
+					if (content == this.calendarData[i].schedule_content + '、') {
+						content = content;
+					} else {
+						content = content + this.calendarData[i].schedule_content + '、';
+					}
+				}
+			}
+			return content;
+		},
+		modelFn(obj, cont) {
+			this.$set(this.form, obj, cont);
+		},
+		//数据  第一部分列表
+		getList() {
+			this.loading = true;
+			this.configList = [];
+			listIndex(this.queryParams).then(response => {
+				if (response.data.rows !== null) {
+					this.configList = response.data.rows;
+				} else {
+					this.configList.push({ notice_title: '暂无数据' });
+				}
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		//数据  第二部分列表
+		getListtabone() {
+			this.loading = true;
+			listIndex(this.queryParams).then(response => {
+				this.configList = response.data.rows;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+		//数据  第三部分列表
+		getLisprofile() {
+			// this.loading = true;
+			listIndexber(this.queryParamstabprofile).then(response => {
+				if (response.data !== undefined) {
+					this.getLisprofileone = response.data.rows;
+					if (response.data.rows !== null) {
+						this.tieku = this.getLisprofileone[0].info_title;
+						this.comg = this.getLisprofileone[0].info_content;
+					} else {
+						this.tieku = '暂无数据';
+						this.comg = '暂无数据';
+					}
+					this.totalprofile = response.data.total;
+				}
+				this.loading = false;
+			});
+		},
+		//数据  日历数据列表
+		getLisalendar() {
+			this.loading = true;
+			this.queryParamscalendar.fixedData.condition.create_by = this.user.userName;
+			listIndex(this.queryParamscalendar).then(response => {
+				if (response.data !== undefined) {
+					this.calendarData = response.data.rows;
+				}
+				this.loading = false;
+			});
+		},
+		//数据  备忘录数据列表
+		getLismemorandum() {
+			this.loading = true;
+			this.getmemorandum = [];
+			this.queryParamstabmemorandum.fixedData.condition.create_by = this.user.userName;
+			listIndex(this.queryParamstabmemorandum).then(response => {
+				if (response.data !== undefined) {
+					if (response.data.rows !== null) {
+						this.shower = true;
+						this.getmemorandum = response.data.rows;
+					} else {
+						this.shower = false;
+						this.getmemorandum.push({ memorandum_title: '暂无数据', shower: false });
+					}
+				}
+				this.loading = false;
+			});
+		},
+		// 数据列表   通讯录数据
+		getLisailtwo() {
+			this.loading = true;
+			listIndex(this.queryParamsail).then(response => {
+				if (response.data !== undefined) {
+					this.getLisaillie = response.data.rows;
+				}
+				this.totalali = response.data.total;
+				this.loading = false;
+			});
+		},
+		//tab 公告 栏数据
+		getListtab() {
+			this.loading = true;
+			listIndextwo(this.dictType).then(response => {
+				this.editableTabs = response.data;
+				this.queryParams.dictType = response.data[1].dictType;
+				// this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 公司概况  tab
+		getLiser() {
+			this.loading = true;
+			listIndextherr(this.dictTypetwo).then(response => {
+				this.editableTabsteo = response.data;
+				// this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 通讯录表头
+		getLisail() {
+			this.loading = true;
+			listIndexfou(this.queryParamsail).then(response => {
+				if (response.data !== undefined) {
+					this.tableDataalid = response.data.tableHeadList;
+					this.postList = response.data;
+					if (this.postList.rows !== null) {
+						this.postList.rows.filter(route => {
+							// route.dept_id = route.dept_id.value
+							for (var item in route) {
+								if (typeof route[item] == 'object') {
+									route[item] = route[item].value;
+								}
+							}
+						});
+					}
 
-   },
-  methods: {
-    // 通讯录搜索
-    init() {
-      console.log(1243)
-      getTableQuery({
-        table: this.queryParamsijeu.table
-      }).then(res => {
-        let data = res.data
-        this.queryDataali = data
-      })
-    },
-      // Tooltip 文字提示
-        content (date) {
-          let data = date
-          let datase = date
-          let content = ''
-          let conert = ''
-          let conertre = ''
-          let nujue= 0
-          for (var i = 0 ; i < this.calendarData.length; i++) {
-            if(this.calendarData[i].schedule_content !== undefined){
-           this.calendarData[i].schedule_content = this.calendarData[i].schedule_content.replace(/<\/?[^>]*>/g, '')
-            }
-            if(data == this.calendarData[i].remind_time){
-              if(content  == this.calendarData[i].schedule_content + '、'){
-                content  = content
-              }else{
-                content  = content  + this.calendarData[i].schedule_content + '、'
-              }
-            }
-          }
-         return content
-        },
-      modelFn(obj, cont) {
-        this.$set(this.form,obj,cont)
-      },
-    //数据  第一部分列表
-    getList() {
-      this.loading = true;
-      this.configList = []
-      listIndex(this.queryParams).then(response => {
-          if(response.data.rows !== null){
-            this.configList = response.data.rows;
-          }else {
-            this.configList.push({notice_title: "暂无数据"});
-          }
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-    },
-    //数据  第二部分列表
-    getListtabone() {
-      this.loading = true;
-      listIndex(this.queryParams).then(response => {
-          this.configList = response.data.rows;
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
-    },
-    //数据  第三部分列表
-    getLisprofile() {
-      // this.loading = true;
-      listIndexber(this.queryParamstabprofile).then(response => {
-          if(response.data !== undefined){
-            this.getLisprofileone = response.data.rows;
-            if(response.data.rows !== null){
-              this.tieku = this.getLisprofileone[0].info_title
-              this.comg = this.getLisprofileone[0].info_content
-            }else {
-              this.tieku = '暂无数据'
-              this.comg = '暂无数据'
-            }
-            this.totalprofile = response.data.total;
-          }
-         this.loading = false;
-        }
-      );
-    },
-    //数据  日历数据列表
-    getLisalendar() {
-      this.loading = true;
-      this.queryParamscalendar.fixedData.condition.create_by = this.user.userName
-      listIndex(this.queryParamscalendar).then(response => {
-          if(response.data !== undefined){
-            this.calendarData = response.data.rows;
-          }
-          this.loading = false;
-        }
-      );
-    },
-    //数据  备忘录数据列表
-    getLismemorandum() {
-      this.loading = true;
-      this.getmemorandum = []
-      this.queryParamstabmemorandum.fixedData.condition.create_by = this.user.userName
-      listIndex(this.queryParamstabmemorandum).then(response => {
-          if(response.data !== undefined){
-            if(response.data.rows !== null){
-              this.shower = true
-              this.getmemorandum = response.data.rows;
-            }else{
-              this.shower = false
-              this.getmemorandum.push({memorandum_title:'暂无数据',shower:false})
-            }
-          }
-          this.loading = false;
-        }
-      );
-    },
-    // 数据列表   通讯录数据
-    getLisailtwo() {
-      this.loading = true;
-      listIndex(this.queryParamsail).then(response => {
-          if(response.data !== undefined){
-            this.getLisaillie = response.data.rows;
-          }
-          this.totalali = response.data.total
-          this.loading = false;
-        }
-      );
-    },
-    //tab 公告 栏数据
-    getListtab() {
-      this.loading = true;
-      listIndextwo(this.dictType).then(response => {
-          this.editableTabs = response.data;
-          this.queryParams.dictType = response.data[1].dictType
-          // this.total = response.total;
-          this.loading = false;
-        }
-      )
-    },
-    // 公司概况  tab
-    getLiser() {
-      this.loading = true;
-      listIndextherr(this.dictTypetwo).then(response => {
-          this.editableTabsteo = response.data;
-          // this.total = response.total;
-          this.loading = false;
-        }
-      )
-    },
-   // 通讯录表头
-   getLisail() {
-     this.loading = true;
-     listIndexfou(this.queryParamsail).then(response => {
-         if(response.data !== undefined){
-           this.tableDataalid = response.data.tableHeadList;
-           this.postList = response.data
-           if(this.postList.rows !== null){
-             this.postList.rows.filter(route => {
-               // route.dept_id = route.dept_id.value
-               for(var item in route){
-                 if(typeof route[item] == 'object'){
-                   route[item]= route[item].value
-                 }
-               }
-             })
-           }
+					this.totalali = response.data.total;
+				}
+				this.loading = false;
+			});
+		},
+		//日历新增弹框数据
+		getLisalendaraddd() {
+			this.loading = true;
+			this.queryData = [];
+			listIndextanl(this.calendaradd).then(response => {
+				if (response.data !== undefined) {
+					this.queryData = response.data;
+				}
+				this.loading = false;
+			});
+		},
+		//备忘录新增弹框数据
+		getLisalendaradddmer() {
+			this.loading = true;
+			this.queryData = [];
+			listIndextanl(this.calendaraddmer).then(response => {
+				if (response.data !== undefined) {
+					this.queryData = response.data;
+				}
+				this.loading = false;
+			});
+		},
+		goTarget(href) {
+			window.open(href, '_blank');
+		},
+		handleSizeChange(val) {},
+		handleCurrentChange(val) {
+			this.queryParams.pageNo = val;
+			this.getList();
+		},
+		// 公司概况
+		handleSizeChangeprofile(val) {},
+		handleCurrentChangeprofile(val) {
+			this.queryParamstabprofile.pageNo = val;
+			this.getLisprofile();
+		},
+		// 通讯录
+		handleSizeChangeali(val) {},
+		handleCurrentChangeali(val) {
+			this.queryParamsail.pageNo = val;
+			this.getLisail();
+		},
+		handleClick(tab, event) {},
+		// 第一部分tab点击
+		tabSbu(index) {
+			this.num = index - 1;
+			this.queryParams.fixedData.condition.notice_type = index;
+			this.getList();
+		},
+		// 第二部分tab点击numlist
+		tabList(index) {
+			this.numlist = index;
+		},
+		// 第三部分tab点击
+		tabSbuprofile(index) {
+			this.numprofile = index - 1;
+			this.queryParamstabprofile.fixedData.condition.info_type = index;
+			this.getLisprofile();
+		},
+		// 表单重置
+		reset() {
+			(this.form = {}), this.resetForm('form');
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.openety = false;
+			this.reset();
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.nummer = 0;
+			this.reset();
+			this.form = {};
+			this.getLisalendaraddd();
+			this.open = true;
+			this.title = '添加日程';
+		},
+		/** 提交按钮操作 */
+		handleQuery() {
+			for (let item of this.queryData.showData) {
+				if (item.htmlType == 'checkbox' || item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload') {
+					this.form[item.columnName] = this.$refs[item.columnName][0].config;
+				} else {
+					this.form[item.columnName] = this.$refs[item.columnName][0].config[item.columnName];
+				}
+			}
+			// this.forme = this.form
+			if (this.nummer == 0) {
+				this.forme.table = 'sys_schedule';
+				this.forme.objId = -1;
+				this.forme.fixedData = this.form;
+				// if(this.forme.fixedData.remind_type !== undefined){
+				//   this.forme.fixedData.remind_type = this.forme.fixedData.remind_type.join(',');
+				// }
+				//日历
+				addConfigindex(this.forme).then(response => {
+					this.msgSuccess('新增成功');
+					// this.open = false;
+					this.getLisalendar();
+					this.cancel();
+				});
+			} else if (this.nummer == 1) {
+				// this.form.table = 'sys_memorandum'
+				this.forme.table = 'sys_memorandum';
+				this.forme.objId = -1;
+				this.forme.fixedData = this.form;
 
-           this.totalali = response.data.total;
-         }
-         this.loading = false;
-       }
-     );
-   },
-   //日历新增弹框数据
-   getLisalendaraddd() {
-     this.loading = true;
-     this.queryData = []
-     listIndextanl(this.calendaradd).then(response => {
-         if(response.data !== undefined){
-           this.queryData = response.data
+				//备忘录
+				addConfigindex(this.forme).then(response => {
+					this.msgSuccess('新增成功');
+					// this.open = false;
+					this.getLismemorandum();
+					this.cancel();
+				});
+			}
+			// this.getList();
+		},
+		// 弹框
+		changeFn(obj) {
+			console.log(obj);
+			for (let key in obj) {
+				this.form.fixedData[key] = obj[key];
+			}
+		},
+		// 新增备忘录
+		memoere() {
+			this.nummer = 1;
+			this.open = true;
+			this.title = '添加备忘录';
+			this.getLisalendaradddmer();
+		},
+		// 备忘录删除
+		index_deledetfe(id) {
+			var that = this;
+			that.deledlid.idList = [];
+			that.deledlid.idList.push(id);
 
-         }
-         this.loading = false;
-       }
-     );
-   },
-   //备忘录新增弹框数据
-   getLisalendaradddmer() {
-     this.loading = true;
-     this.queryData = []
-     listIndextanl(this.calendaraddmer).then(response => {
-         if(response.data !== undefined){
-           this.queryData = response.data
-         }
-         this.loading = false;
-       }
-     );
-   },
-    goTarget(href) {
-      window.open(href, "_blank");
-    },
-     handleSizeChange(val) {
-      },
-    handleCurrentChange(val) {
-      this.queryParams.pageNo = val
-      this.getList()
-      },
-      // 公司概况
-      handleSizeChangeprofile(val) {
-        },
-      handleCurrentChangeprofile(val) {
-        this.queryParamstabprofile.pageNo = val
-        this.getLisprofile()
-        },
-     // 通讯录
-     handleSizeChangeali(val) {
-       },
-     handleCurrentChangeali(val) {
-       this.queryParamsail.pageNo = val
-       this.getLisail()
-       },
-    handleClick(tab, event) {
-      },
-      // 第一部分tab点击
-    tabSbu(index){
-     this.num = index - 1
-     this.queryParams.fixedData.condition.notice_type = index
-     this.getList()
-    },
-    // 第二部分tab点击numlist
-    tabList(index){
-      this.numlist = index
-    },
-    // 第三部分tab点击
-    tabSbuprofile(index){
-      this.numprofile = index - 1
-      this.queryParamstabprofile.fixedData.condition.info_type = index
-      this.getLisprofile()
-    },
-    // 表单重置
-    reset() {
-      this.form ={
-      },
-      this.resetForm("form");
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.openety = false
-      this.reset();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.nummer = 0
-      this.reset();
-      this.form ={
-      }
-      this.getLisalendaraddd()
-      this.open = true;
-      this.title = "添加日程";
-    },
-    /** 提交按钮操作 */
-    handleQuery() {
-      for(let item of this.queryData.showData){
-        if(item.htmlType == 'checkbox' || item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload'){
-          this.form[item.columnName] = this.$refs[item.columnName][0].config
-        } else{
-          this.form[item.columnName] = this.$refs[item.columnName][0].config[item.columnName]
-        }
-      }
-      // this.forme = this.form
-      if(this.nummer == 0){
-        this.forme.table = 'sys_schedule'
-        this.forme.objId = -1
-        this.forme.fixedData = this.form
-        // if(this.forme.fixedData.remind_type !== undefined){
-        //   this.forme.fixedData.remind_type = this.forme.fixedData.remind_type.join(',');
-        // }
-        //日历
-        addConfigindex(this.forme).then(response => {
-          this.msgSuccess("新增成功");
-          // this.open = false;
-          this.getLisalendar()
-          this.cancel();
-        });
-      }else if(this.nummer == 1){
-        // this.form.table = 'sys_memorandum'
-        this.forme.table = 'sys_memorandum'
-        this.forme.objId = -1
-        this.forme.fixedData = this.form
+			this.$confirm('是否确认删除', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			})
+				.then(function() {
+					return delIndexnabd(that.deledlid);
+				})
+				.then(() => {
+					this.getLismemorandum();
+					this.msgSuccess('删除成功');
+					// this.$router.go(-1)
+				});
+		},
 
-        //备忘录
-       addConfigindex(this.forme).then(response => {
-         this.msgSuccess("新增成功");
-         // this.open = false;
-         this.getLismemorandum()
-         this.cancel();
-       });
-      }
-      // this.getList();
-    },
-    // 弹框
-    changeFn(obj) {
-      console.log(obj)
-      for(let key in obj){
-        this.form.fixedData[key] = obj[key]
-      }
-    },
-    // 新增备忘录
-    memoere(){
-     this.nummer = 1
-     this.open = true;
-     this.title = "添加备忘录";
-     this.getLisalendaradddmer()
-    },
-    // 备忘录删除
-    index_deledetfe(id){
-      var that =  this
-      that.deledlid.idList = []
-      that.deledlid.idList.push(id)
-
-     this.$confirm('是否确认删除', "警告", {
-         confirmButtonText: "确定",
-         cancelButtonText: "取消",
-         type: "warning"
-       }).then(function() {
-         return delIndexnabd(that.deledlid);
-       }).then(() => {
-         this.getLismemorandum();
-         this.msgSuccess("删除成功");
-         // this.$router.go(-1)
-       })
-    },
-
-    handleSelectionChange() {
-
-    },
-    // 字符串去重
-    unique(arr) {
-      let arfe = []
-      let serfgt = []
-      arfe = arr.split(',')
-      for(var i = 0 ; i < arfe.length; i++){
-         if (serfgt.indexOf(arfe[i]) === -1) {
-            serfgt.push(arfe[i])
-            }
-      }
-     // const res = new Map();
-     // return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
-    },
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data;
-        this.getLisalendar()
-        this.getLismemorandum()
-      });
-    },
-    // 通知公告弹窗
-    headerCld(index){
-      this.title = '通知公告'
-       this.openety = true,
-       this.actingk=index
-    },
-    // 搜索
-    handleQuerygty(){
-    this.queryParams.pageNo = 1;
-    this.grabFn(this.queryDataali.queryList, this.queryParamsail.fixedData.condition)
-    this.getLisail()
-
-    },
-    // 抓取参数
-    grabFn(arr, parForm) {
-      for (let item of arr) {
-        if (item.htmlType == 'checkbox' || item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload') {
-          if (this.$refs[item.columnName][0].config.length) {
-            parForm[item.columnName] = this.$refs[item.columnName][0].config
-          }
-        } else {
-          parForm[item.columnName] = this.$refs[item.columnName][0].config[item.columnName]
-        }
-      }
-    },
-    // 搜索重置  通讯录
-    resetQuery(){
-      console.log(12436)
-     this.queryParamsail.fixedData.condition = {}
-     this.queryParamsail.pageNo = 1
-     // this.resetForm("queryParamsail");
-     console.log(this.queryParamsail)
-     this.getLisail()
-    }
-  },
+		handleSelectionChange() {},
+		// 字符串去重
+		unique(arr) {
+			let arfe = [];
+			let serfgt = [];
+			arfe = arr.split(',');
+			for (var i = 0; i < arfe.length; i++) {
+				if (serfgt.indexOf(arfe[i]) === -1) {
+					serfgt.push(arfe[i]);
+				}
+			}
+			// const res = new Map();
+			// return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
+		},
+		getUser() {
+			getUserProfile().then(response => {
+				this.user = response.data;
+				this.getLisalendar();
+				this.getLismemorandum();
+			});
+		},
+		// 通知公告弹窗
+		headerCld(index) {
+			this.title = '通知公告';
+			(this.openety = true), (this.actingk = index);
+		},
+		// 搜索
+		handleQuerygty() {
+			this.queryParams.pageNo = 1;
+			this.grabFn(this.queryDataali.queryList, this.queryParamsail.fixedData.condition);
+			this.getLisail();
+		},
+		// 抓取参数
+		grabFn(arr, parForm) {
+			for (let item of arr) {
+				if (item.htmlType == 'checkbox' || item.htmlType == 'imageUpload' || item.htmlType == 'fileUpload') {
+					if (this.$refs[item.columnName][0].config.length) {
+						parForm[item.columnName] = this.$refs[item.columnName][0].config;
+					}
+				} else {
+					parForm[item.columnName] = this.$refs[item.columnName][0].config[item.columnName];
+				}
+			}
+		},
+		// 搜索重置  通讯录
+		resetQuery() {
+			console.log(12436);
+			this.queryParamsail.fixedData.condition = {};
+			this.queryParamsail.pageNo = 1;
+			// this.resetForm("queryParamsail");
+			console.log(this.queryParamsail);
+			this.getLisail();
+		}
+	}
 };
 </script>
 
 <style lang="scss">
-  .iejgu{
-     .el-form-item__label{
-       width: 40px !important;
-        .el-input__inner{
-          width: 60%;
-        }
-     }
-     .el-form-item{
-       width: 71%;
-     }
-     .el-form--inline .el-form-item{
-
-     }
-     .el-form--inline .el-form-item__content{
-       width: 76%;
-     }
-  .el-form-item__content{
-    width: 75%;
-  }
-  }
-  .index_ese{
-    .el-dialog__body{
-      padding-top: 10px !important;
-    }
-
-  }
-  .home{
-    .el-tabs__header{
-     margin-bottom: 5px !important;
-    }
-    .el-calendar-table tr td:first-child{
-      border: 0 !important;
-    }
-    .el-calendar-table tr:first-child td{
-      border: 0 !important;
-    }
-    .el-calendar-table td{
-      border: 0 !important;
-    }
-    .el-calendar-table .el-calendar-day{
-      height: 30px;
-      text-align: center;
-      line-height: 30px;
-      border-radius: 30px;
-      padding: 0;
-      // background-color: #0B18E8;
-    }
-    .el-calendar-table td.is-selected{
-      // background-color: #0B18E8;
-       border-radius: 30px;
-    }
-    .el-calendar__header{
-      border: 0;
-      padding: 0 20px;
-    }
-    .el-calendar__body{
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-    .el-pagination{
-      padding-left: 0;
-    }
-    .index_headeNav{
-      .el-tabs__item{
-        position: relative;
-      }
-    }
-    .el-table th.is-leaf, .el-table td{
-       border: 0 !important;
-    }
-    .el-calendar__title{
-      font-size: 12px;
-    }
-     .el-table td{
-       padding:  6px 0;
-     }
-     .index_haderPaginfoiu{
-       .el-pagination__jump{
-         display: block !important;
-         text-align: center;
-         margin-left: 0;
-       }
-     }
-   .everyDay {
-     display: inline-block;
-     width: 20px;
-     height: 20px;
-     line-height: 20px;
-     background-color: #409eff;
-     color: #fff;
-     border-radius: 50%;
-     margin-top: 5px;
-   }
-  }
+.iejgu {
+	.el-form-item__label {
+		width: 40px !important;
+		.el-input__inner {
+			width: 60%;
+		}
+	}
+	.el-form-item {
+		width: 71%;
+	}
+	.el-form--inline .el-form-item {
+	}
+	.el-form--inline .el-form-item__content {
+		width: 76%;
+	}
+	.el-form-item__content {
+		width: 75%;
+	}
+}
+.index_ese {
+	.el-dialog__body {
+		padding-top: 10px !important;
+	}
+}
+.home {
+	.el-tabs__header {
+		margin-bottom: 5px !important;
+	}
+	.el-calendar-table tr td:first-child {
+		border: 0 !important;
+	}
+	.el-calendar-table tr:first-child td {
+		border: 0 !important;
+	}
+	.el-calendar-table td {
+		border: 0 !important;
+	}
+	.el-calendar-table .el-calendar-day {
+		height: 30px;
+		text-align: center;
+		line-height: 30px;
+		border-radius: 30px;
+		padding: 0;
+		// background-color: #0B18E8;
+	}
+	.el-calendar-table td.is-selected {
+		// background-color: #0B18E8;
+		border-radius: 30px;
+	}
+	.el-calendar__header {
+		border: 0;
+		padding: 0 20px;
+	}
+	.el-calendar__body {
+		padding-top: 0;
+		padding-bottom: 0;
+	}
+	.el-pagination {
+		padding-left: 0;
+	}
+	.index_headeNav {
+		.el-tabs__item {
+			position: relative;
+		}
+	}
+	.el-table th.is-leaf,
+	.el-table td {
+		border: 0 !important;
+	}
+	.el-calendar__title {
+		font-size: 12px;
+	}
+	.el-table td {
+		padding: 6px 0;
+	}
+	.index_haderPaginfoiu {
+		.el-pagination__jump {
+			display: block !important;
+			text-align: center;
+			margin-left: 0;
+		}
+	}
+	.everyDay {
+		display: inline-block;
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		background-color: #409eff;
+		color: #fff;
+		border-radius: 50%;
+		margin-top: 5px;
+	}
+}
 </style>
 
-
 <style scoped lang="scss">
 .home {
-  // tab
-  .index_headetab{
-    display: flex;
-    border-bottom: 1px solid #E5E5E5;
-    height: 65px;
-    padding-top: 10px;
-    padding-bottom: 10px;
-   span{
-     cursor:pointer;
-     width: 80px;
-     // flex: 1;
-     text-align: center;
-     line-height: 55px;
-     height: 55px;
-     font-size: 15px;
-     font-family: PingFang SC;
-     font-weight: bold;
-     color: #666;
-     position: relative;
-     overflow: hidden;
-     white-space: nowrap;
-     text-overflow: ellipsis;
-     // flex: 1;
-     // border-bottom: ;
-   }
-   .span{
-     content: '';
-     display: block;
-     width: 18px;
-     height: 8px;
-     border-radius: 3px;
-     background-color: #3C8DBC;
-     color: #3C8DBC !important;
-     // position: absolute;
-     // border-bottom: ;
-   }
-  .spanto{
-    color:#3C8DBC ;
-    border-bottom: 3px solid #3C8DBC;
-  }
-  }
-  p{
-    margin: 0;
-
-  }
-  ul{
-    margin: 0;
-    padding: 0;
-  }
-  background-color: #eef0ff;
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  .index_heade{
-    // border: 1px solid #eee;
-    // width: 100%;
-    padding: 0 20px;
-    height: 570px;
-    background-color: #fff;
-    position: relative;
-    border-radius: 6px;
-    .index_headerImg{
-      width: 23px;
-      height: 6px;
-      position: absolute;
-      right: 20px;
-      top:32px;
-    }
-    .index_headerUl{
-      width: 100%;
-      padding: 0;
-      margin: 0;
-      height: 85%;
-      li{
-        margin: 0;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        height: 43px;
-        cursor:pointer;
-        img{
-          width: 11px;
-          height: 13px;
-        }
-        p{
-          font-size: 14px;
-          font-family: PingFang SC;
-          font-weight: 400;
-          color: #343434;
-          line-height: 36px;
-          margin: 0;
-          text-align: left;
-          flex: 1;
-          padding: 0 18px;
-          overflow:hidden;
-          	text-overflow:ellipsis;
-          	white-space:nowrap
-        }
-        span{
-          font-size: 14px;
-          font-family: PingFang SC;
-          font-weight: 400;
-          color: #343434;
-          line-height: 36px;
-        }
-      }
-    }
-    .index_haderPagin{
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-top: 30px;
-      span{
-        flex: 1;
-        font-size: 12px;
-        font-family: PingFang SC;
-        font-weight: 400;
-        color: #343434;
-        text-align: right;
-        // line-height: 36px;
-      }
-    }
-  }
-  //表格样式
-  .index_headeNav{
-    padding: 0 20px;
-    height: 550px;
-    background-color: #fff;
-    position: relative;
-    border-radius: 6px;
-     .tab_i{
-       position: absolute;
-       right: 1px;
-       top:5px;
-       border-radius: 50%;
-     // display: block;
-     width: 15px ;
-     height: 15px;
-     line-height: 15px;
-     text-align: center;
-     color: #fff;
-     background-color: red;
-     overflow:hidden; //超出的文本隐藏
-     text-overflow:ellipsis; //溢出用省略号显示
-     white-space:nowrap; //溢出不换行
-     font-size: 11px;
-     font-family: PingFang SC;
-     font-weight: bold;
-
-      }
-  }
-  .index_nav{
-    // border: 1px solid #eee;
-    background-color: #fff;
-    height: 315px;
-    box-shadow: 0px 4px 4px 0px rgba(130, 150, 162, 0.64);
-    border-radius: 6px;
-    .index_navTime{
-      height: 270px;
-      position: relative;
-    }
-    .index_navTimeimg{
-      height: 47px;
-      width: 100%;
-      position: absolute;
-      bottom: -76px;
-      left: 0;
-    }
-    .index_navTimep{
-      padding: 10px 0;
-      margin: 0 20px;
-      margin-bottom: 10px;
-      border-bottom: 1px solid #E5E5E5;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-       span:nth-child(1){
-         font-size: 15px;
-         font-family: PingFang SC;
-         font-weight: bold;
-         color: #3C8DBC;
-       }
-       span:nth-child(1)::before{
-          content: "";
-         display: block;
-         width: 18px;
-         height: 8px;
-         background: #3C8DBC;
-         border-radius: 3px;
-
-       }
-       span:nth-child(2){
-         font-size: 12px;
-         font-family: PingFang SC;
-         font-weight: 400;
-         color: #3C8DBC;
-         cursor:pointer;
-       }
-    }
-  }
-  // 公司概况样式
-  .index_headeProfile{
-    margin-top: 40px;
-    margin-bottom: 20px;
-    height: 590px;
-    .index_profilep{
-      font-size: 12px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #343434;
-      line-height: 27px;
-      text-indent:2em;
-      height: 368px;
-      overflow-y: hidden;
-       // p{
+	// tab
+	.index_headetab {
+		display: flex;
+		border-bottom: 1px solid #e5e5e5;
+		height: 65px;
+		padding-top: 10px;
+		padding-bottom: 10px;
+		span {
+			cursor: pointer;
+			width: 80px;
+			// flex: 1;
+			text-align: center;
+			line-height: 55px;
+			height: 55px;
+			font-size: 15px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #666;
+			position: relative;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			// flex: 1;
+			// border-bottom: ;
+		}
+		.span {
+			content: '';
+			display: block;
+			width: 18px;
+			height: 8px;
+			border-radius: 3px;
+			background-color: #3c8dbc;
+			color: #3c8dbc !important;
+			// position: absolute;
+			// border-bottom: ;
+		}
+		.spanto {
+			color: #3c8dbc;
+			border-bottom: 3px solid #3c8dbc;
+		}
+	}
+	p {
+		margin: 0;
+	}
+	ul {
+		margin: 0;
+		padding: 0;
+	}
+	background-color: #eef0ff;
+	blockquote {
+		padding: 10px 20px;
+		margin: 0 0 20px;
+		font-size: 17.5px;
+		border-left: 5px solid #eee;
+	}
+	.index_heade {
+		// border: 1px solid #eee;
+		// width: 100%;
+		padding: 0 20px;
+		height: 570px;
+		background-color: #fff;
+		position: relative;
+		border-radius: 6px;
+		.index_headerImg {
+			width: 23px;
+			height: 6px;
+			position: absolute;
+			right: 20px;
+			top: 32px;
+		}
+		.index_headerUl {
+			width: 100%;
+			padding: 0;
+			margin: 0;
+			height: 85%;
+			li {
+				margin: 0;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 43px;
+				cursor: pointer;
+				img {
+					width: 11px;
+					height: 13px;
+				}
+				p {
+					font-size: 14px;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #343434;
+					line-height: 36px;
+					margin: 0;
+					text-align: left;
+					flex: 1;
+					padding: 0 18px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				span {
+					font-size: 14px;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #343434;
+					line-height: 36px;
+				}
+			}
+		}
+		.index_haderPagin {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 30px;
+			span {
+				flex: 1;
+				font-size: 12px;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #343434;
+				text-align: right;
+				// line-height: 36px;
+			}
+		}
+	}
+	//表格样式
+	.index_headeNav {
+		padding: 0 20px;
+		height: 550px;
+		background-color: #fff;
+		position: relative;
+		border-radius: 6px;
+		.tab_i {
+			position: absolute;
+			right: 1px;
+			top: 5px;
+			border-radius: 50%;
+			// display: block;
+			width: 15px;
+			height: 15px;
+			line-height: 15px;
+			text-align: center;
+			color: #fff;
+			background-color: red;
+			overflow: hidden; //超出的文本隐藏
+			text-overflow: ellipsis; //溢出用省略号显示
+			white-space: nowrap; //溢出不换行
+			font-size: 11px;
+			font-family: PingFang SC;
+			font-weight: bold;
+		}
+	}
+	.index_nav {
+		// border: 1px solid #eee;
+		background-color: #fff;
+		height: 315px;
+		box-shadow: 0px 4px 4px 0px rgba(130, 150, 162, 0.64);
+		border-radius: 6px;
+		.index_navTime {
+			height: 270px;
+			position: relative;
+		}
+		.index_navTimeimg {
+			height: 47px;
+			width: 100%;
+			position: absolute;
+			bottom: -76px;
+			left: 0;
+		}
+		.index_navTimep {
+			padding: 10px 0;
+			margin: 0 20px;
+			margin-bottom: 10px;
+			border-bottom: 1px solid #e5e5e5;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			span:nth-child(1) {
+				font-size: 15px;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #3c8dbc;
+			}
+			span:nth-child(1)::before {
+				content: '';
+				display: block;
+				width: 18px;
+				height: 8px;
+				background: #3c8dbc;
+				border-radius: 3px;
+			}
+			span:nth-child(2) {
+				font-size: 12px;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #3c8dbc;
+				cursor: pointer;
+			}
+		}
+	}
+	// 公司概况样式
+	.index_headeProfile {
+		margin-top: 40px;
+		margin-bottom: 20px;
+		height: 590px;
+		.index_profilep {
+			font-size: 12px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #343434;
+			line-height: 27px;
+			text-indent: 2em;
+			height: 368px;
+			overflow-y: hidden;
+			// p{
 
-       // }
-    }
-    .index_haderPagin{
-      margin-top: 25px;
-    }
-    .index_headerImg{
-      width: 21px;
-      height: 21px;
-      top:19px;
-    }
-  }
-  // 备忘录样式
-  .index_memoranduNnavTime{
-    height: 335px;
-    margin-top: 90px;
-    position: relative;
-    .index_navTimep{
-      padding: 20px 0;
-      // margin-bottom: 20px;
-    }
-    .index_navTimeimg{
-      height: 47px;
-      width: 100%;
-      position: absolute;
-      bottom: -76px;
-      left: 0;
-      bottom: -96px;
-    }
-    .imjud{
-      width: 23px;
-      height: 6px;
-      position: absolute;
-      right: 20px;
-      bottom: -50px;
-    }
-    ul{
-      padding: 0 20px;
-      li{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        border-bottom: 1px dashed #E5E5E5;
-        p{
-          font-size: 12px;
-          font-family: PingFang SC;
-          font-weight: 400;
-          color: #343434;
-          line-height: 36px;
-          flex: 1;
-        }
-        .index_navspande{
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          span{
-            font-size: 12px;
-            font-family: PingFang SC;
-            font-weight: 400;
-            color: #343434;
-            line-height: 36px;
-            // flex: 1;
-			width: 20%;
-          }
-          img{
-            width: 16px;
-            height: 16px;
-            margin-left: 5px;
-            cursor: pointer;
-          }
-
-        }
-
-      }
-    }
-  }
-  //通讯录样式
-  .index_memoranduMail{
-    height: 363px;
-    margin-top: 100px;
-    .index_navTimeimgtwo{
-      width: 23px;
-      height: 6px;
-    }
-    .index_navTimep{
-      padding: 20px 0;
-    }
-    .index_memoranduMailnav{
-      padding: 0 20px;
-      height: 90%;
-    }
-    .index_navTimeimg{
-      height: 47px;
-      width: 100%;
-      position: absolute;
-      bottom: -76px;
-      left: 0;
-      bottom: -126px;
-    }
-   .index_haderPagin{
-     margin-top: 10px;
-   }
-  }
+			// }
+		}
+		.index_haderPagin {
+			margin-top: 25px;
+		}
+		.index_headerImg {
+			width: 21px;
+			height: 21px;
+			top: 19px;
+		}
+	}
+	// 备忘录样式
+	.index_memoranduNnavTime {
+		height: 335px;
+		margin-top: 90px;
+		position: relative;
+		.index_navTimep {
+			padding: 20px 0;
+			// margin-bottom: 20px;
+		}
+		.index_navTimeimg {
+			height: 47px;
+			width: 100%;
+			position: absolute;
+			bottom: -76px;
+			left: 0;
+			bottom: -96px;
+		}
+		.imjud {
+			width: 23px;
+			height: 6px;
+			position: absolute;
+			right: 20px;
+			bottom: -50px;
+		}
+		ul {
+			padding: 0 20px;
+			li {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				border-bottom: 1px dashed #e5e5e5;
+				p {
+					font-size: 12px;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #343434;
+					line-height: 36px;
+					flex: 1;
+				}
+				.index_navspande {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					span {
+						font-size: 12px;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #343434;
+						line-height: 36px;
+						flex: 1;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						// width: 20%;
+					}
+					img {
+						width: 16px;
+						height: 16px;
+						margin-left: 5px;
+						cursor: pointer;
+					}
+				}
+			}
+		}
+	}
+	//通讯录样式
+	.index_memoranduMail {
+		height: 363px;
+		margin-top: 100px;
+		.index_navTimeimgtwo {
+			width: 23px;
+			height: 6px;
+		}
+		.index_navTimep {
+			padding: 20px 0;
+		}
+		.index_memoranduMailnav {
+			padding: 0 20px;
+			height: 90%;
+		}
+		.index_navTimeimg {
+			height: 47px;
+			width: 100%;
+			position: absolute;
+			bottom: -76px;
+			left: 0;
+			bottom: -126px;
+		}
+		.index_haderPagin {
+			margin-top: 10px;
+		}
+	}
 }
 
 // table
-.tab_tol{
-  // display: flex;
-  height: 80%;
-  .tr_one{
-    display: flex;
-    justify-content: space-around;
-    width: 100%;
-    th{
-      flex: 1;
-      font-size: 12px;
-      font-family: PingFang SC;
-      font-weight: bold;
-      color: #343434;
-      line-height: 36px;
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-    }
-  }
-  .two_tr{
-    display: flex;
-    justify-content: space-around;
-    font-size: 12px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #343434;
-    line-height: 36px;
-    td{
-      flex: 1;
-      overflow: hidden;
-      text-overflow:ellipsis;
-      white-space: nowrap;
-    }
-  }
-  .two_trtwo{
-    background-color: #F2F2F2;
-  }
+.tab_tol {
+	// display: flex;
+	height: 80%;
+	.tr_one {
+		display: flex;
+		justify-content: space-around;
+		width: 100%;
+		th {
+			flex: 1;
+			font-size: 12px;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #343434;
+			line-height: 36px;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+	.two_tr {
+		display: flex;
+		justify-content: space-around;
+		font-size: 12px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #343434;
+		line-height: 36px;
+		td {
+			flex: 1;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+		}
+	}
+	.two_trtwo {
+		background-color: #f2f2f2;
+	}
 }
 // 通知公告弹窗
-.index_headertan{
-  margin: 0 30px;
-  p{
-    margin: 0;
-  }
-  p:nth-child(1){
-    font-size: 24px;
-    font-family: PingFang SC;
-    font-weight: bold;
-    color: #343434;
-    line-height: 42px;
-    text-align: center;
-    margin-bottom: 10px;
-    text-indent:0em;
-  }
-  p:nth-child(2){
-    font-size: 16px;
-    font-family: PingFang SC;
-    font-weight: 400;
-    color: #666666;
-    line-height: 24px;
-    text-align: center;
-    margin-bottom: 20px;
-    text-indent:0em;
-  }
-  pre{
-    font-size: 16px;
-    font-family: PingFang SC;
-    font-weight: 400;
-    color: #343434;
-  }
+.index_headertan {
+	margin: 0 30px;
+	p {
+		margin: 0;
+	}
+	p:nth-child(1) {
+		font-size: 24px;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #343434;
+		line-height: 42px;
+		text-align: center;
+		margin-bottom: 10px;
+		text-indent: 0em;
+	}
+	p:nth-child(2) {
+		font-size: 16px;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		line-height: 24px;
+		text-align: center;
+		margin-bottom: 20px;
+		text-indent: 0em;
+	}
+	pre {
+		font-size: 16px;
+		font-family: PingFang SC;
+		font-weight: 400;
+		color: #343434;
+	}
+}
+pre {
+	white-space: pre-wrap;
 }
-  pre{
-    white-space:pre-wrap;
-  }
-
 </style>

src/views/login.vue

@@ -280,10 +280,11 @@
           this.qecode = res.data
           console.log(res.msg,67)
           let apiurl = settings.urls
-          if(apiurl.includes('118.178.139.79')){
-            apiurl = 'https://video.zhongxinyun.com.cn/api'
-          }
-          let urls = `${apiurl}/dev-api/auth/scanCode/${res.data}`
+          // if(apiurl.includes('118.178.139.79')){
+          //   apiurl = 'https://video.zhongxinyun.com.cn/api'
+          // }
+		  // /dev-api
+          let urls = `${apiurl}/prod-api/auth/scanCode/${res.data}`
           console.log(urls,987)
           this.creatQrCode(urls)
           this.isInvalid = false

src/views/system/role/index.vue

@@ -136,8 +136,9 @@
             type="text"
             icon="el-icon-circle-check"
             @click="handleDataScope(scope.row)"
-            v-hasPermi="['system:role:edit']"
+            
           >数据权限</el-button>
+		  <!-- v-hasPermi="['system:role:edit']" -->
           <el-button
             size="mini"
             type="text"
@@ -532,6 +533,7 @@ export default {
     },
     /** 分配数据权限操作 */
     handleDataScope(row) {
+	 console.log(row.id)
       const roleDeptTreeselect = this.getRoleDeptTreeselect(row.id);
       getRole(row.id).then(response => {
         this.form = response.data;
@@ -546,8 +548,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
+		console.log(2345)
       this.$refs["form"].validate(valid => {
         if (valid) {
+			console.log(234)
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys();
             updateRole(this.form).then(response => {
@@ -568,6 +572,7 @@ export default {
     },
     /** 提交按钮（数据权限） */
     submitDataScope: function() {
+		console.log(345678)
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys();
         dataScope(this.form).then(response => {

src/views/system/time/index.vue

@@ -26,7 +26,7 @@
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="剂次" prop="jici">
-								<el-select style="width:240px;" v-model="queryParams.jici" placeholder="剂次" clearable>
+								<el-select style="width:240px;" v-model="queryParams.jici" placeholder="剂次" clearable :disabled="shouwestwo">
 									<el-option v-for="dict in typeOptionstimesgt" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
 								</el-select>
 							</el-form-item>
@@ -52,7 +52,7 @@
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="疫苗名称" prop="vaccineName">
-								<el-select style="width:240px;" v-model="queryParams.vaccineName" placeholder="疫苗名称" clearable>
+								<el-select style="width:240px;" v-model="queryParams.vaccineName" placeholder="疫苗名称" clearable :disabled="shouwestwo" >
 									<el-option v-for="dict in typeOptionsname" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 								</el-select>
 							</el-form-item>
@@ -67,12 +67,13 @@
 							    format="yyyy-MM-dd"
 							    placeholder="选择接种时间"
 								style="width:240px;"
+								:disabled="shouwestwo"
 							  ></el-date-picker>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="接种地点" prop="vaccinationPlace">
-								<el-select v-model="queryParams.vaccinationPlace" placeholder="接种地点" style="width:240px;" clearable>
+								<el-select v-model="queryParams.vaccinationPlace" placeholder="接种地点" style="width:240px;" clearable :disabled="shouwestwo">
 									<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
 								</el-select>
 							</el-form-item>
@@ -128,14 +129,29 @@
 					<el-row>
 						<el-col :span="5">
 							<el-form-item label="接种情况" prop="isVaccination">
-								<el-radio-group v-model="queryParams.isVaccination" @change="gywoa">
+								<el-radio-group v-model="queryParams.isVaccination" @change="gywoatwo">
 									<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :span="5">
 							<el-form-item label="应种未种" prop="shouldBe">
-								<el-radio-group v-model="queryParams.shouldBe" style="width: 100%;">
+								<el-radio-group v-model="queryParams.shouldBe" style="width: 100%;" :disabled="!shouwestwo">
+									<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
+								</el-radio-group>
+								<!-- <el-input
+												v-model="queryParams.shouldBe"
+												placeholder="请输入应种未种
+							"
+												clearable
+												size="small"
+												@keyup.enter.native="handleQuery"
+											/> -->
+							</el-form-item>
+						</el-col>
+						<el-col :span="5">
+							<el-form-item label="应续未续" prop="shouldSlow">
+								<el-radio-group v-model="queryParams.shouldSlow" style="width: 100%;">
 									<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
 								</el-radio-group>
 								<!-- <el-input
@@ -230,7 +246,7 @@
 		<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="100%" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1240px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 				<el-row>
 					<el-col :span="8">
@@ -351,30 +367,24 @@
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
-							<el-col :span="3">
+							<!-- <el-col :span="3">
 								<el-form-item label="应种未种" prop="shouldBe">
-									<!-- <el-radio-group v-model="form.shouldBe" :disabled="shouwes">
-									<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
-									</el-radio-group> -->
-									<el-checkbox v-model="form.shouldBe" true-label="是" false-label="否"></el-checkbox>
+									<el-checkbox :disabled="shouwes" v-model="form.shouldBe" true-label="是" false-label="否"></el-checkbox>
 								</el-form-item>
-							</el-col>
-							<el-col :span="5">
+							</el-col> -->
+							<!-- <el-col :span="5">
 								<el-form-item label="应续未续" prop="shouldSlow">
-									<!-- <el-radio-group v-model="form.shouldBe" :disabled="shouwes">
-									<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
-									</el-radio-group> -->
 									<el-checkbox v-model="form.shouldSlow" true-label="是" false-label="否"></el-checkbox>
 								</el-form-item>
-							</el-col>
+							</el-col> -->
 						</el-row>
 					</el-col>
 					<el-col :span="24" style="height: 40px;"><el-form-item label="接种记录 :" prop="shouldBe"></el-form-item></el-col>
 					<el-col :span="24" v-for="(item, index) in form.vaccineInfoUserList" :key="index">
-						<el-row>
-							<el-col :span="4">
-								<el-form-item label="疫苗名称" >
-									<el-select v-model="item.vaccineName" placeholder="疫苗名称" clearable :disabled="naneme" @change="changeheu(index)">
+						<el-row type="flex">
+							<!-- <el-col :span="4"> -->
+								<el-form-item label="疫苗名称" class="iejghiadh">
+									<el-select v-model="item.vaccineName" placeholder="疫苗名称" style="width:123px" clearable :disabled="naneme" @change="changeheu(index)">
 										<el-option
 											v-for="dict in typeOptionsname"
 											:key="dict.dictValue"
@@ -383,9 +393,9 @@
 										/>
 									</el-select>
 								</el-form-item>
-							</el-col>
-							<el-col :span="5" class="oiuyty">
-								<el-form-item label="接种时间" >
+							<!-- </el-col> -->
+							<!-- <el-col :span="4" class="oiuyty"> -->
+								<el-form-item label="接种时间" class="oiuyty">
 									<el-date-picker
 										clearable
 										v-model="item.vaccinationTime"
@@ -393,23 +403,23 @@
 										value-format="yyyy-MM-dd HH:mm:ss"
 										format="yyyy-MM-dd HH:mm:ss"
 										placeholder="选择接种时间"
-										style="width: 100%;"
+										style="width: 167px;"
 										:disabled="naneme"
 									></el-date-picker>
 								</el-form-item>
-							</el-col>
-							<el-col :span="5">
+							<!-- </el-col> -->
+							<el-col :span="4" class="ijeuhdy">
 								<el-form-item label="接种地点" >
-									<el-select :disabled="naneme" v-model="item.vaccinationPlace" placeholder="接种地点" clearable size="small">
+									<el-select :disabled="naneme" v-model="item.vaccinationPlace" placeholder="接种地点" clearable size="small" style="100%">
 										<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 										<!-- dict.dictValue -->
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="3">
+							<!-- <el-col :span="3"> -->
 								<el-form-item label="剂次"  class="jhy">
 									<!-- <el-input v-model="form.jici" placeholder="请输入剂次" /> -->
-									<el-select @change="changeheujici(index)" v-model="item.jici" placeholder="剂次" clearable style="width:60%" :disabled="naneme">
+									<el-select @change="changeheujici(index)" v-model="item.jici" placeholder="剂次" clearable style="width:75px" :disabled="naneme" >
 										<el-option
 											v-for="dict in typeOptionstimes"
 											:key="dict.dictValue"
@@ -418,18 +428,19 @@
 										/>
 									</el-select>
 								</el-form-item>
-							</el-col>
+							<!-- </el-col> -->
 
-							<el-col :span="3">
+							<el-col style="width: 135px;">
 								<el-form-item label="进度"  class="jhy">
-									<el-select v-model="item.progress" placeholder="进度" clearable style="width:50%" :disabled="naneme">
+									<el-select v-model="item.progress" placeholder="进度" clearable style="width:100%" :disabled="naneme">
 										<el-option v-for="dict in statusOptionstue" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="2.5">
-								<el-form-item label="附件"  class="jhy">
-									<div class="jdidur">
+							<el-col :span="3">
+								<el-form-item class="jdueuh">
+									<div class="jdidur  jdoier">
+										<el-tooltip class="item" effect="dark" content="请上传png/jpg文档,且不超过50MB" placement="top-start">
 										<el-upload
 											:disabled="naneme"
 											class="upload-demo"
@@ -443,38 +454,41 @@
 											:on-preview="handlePictureCardPreviewtwo"
 											:before-upload="beforstwo"
 										>
-											<el-button size="small" type="primary">点击上传</el-button>
+											<el-button size="small" type="primary">附件上传</el-button>
 										</el-upload>
-										<div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div>
+										</el-tooltip>
+										<!-- <div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div> -->
+										<div class="hyeoa">
+											 <el-tooltip class="item" effect="dark" content="新增疫苗信息,请慎重操作" placement="top-start">
+											      <img src="../../../assets/images/icon_tc_add.png" alt="" class="hueyde" @click="tijea(index)" />
+											    </el-tooltip>
+												<el-tooltip class="item" effect="dark" content="删除无法恢复,请慎重操作" placement="top-start">
+												     <img src="../../../assets/images/delei.png" alt="" class="hueydele" @click="naeyrfakjf(index, item)" />
+												   </el-tooltip>
+										</div>
 									</div>
 								</el-form-item>
 							</el-col>
 							
-							<el-col :span="1.5" class="hjdoecdre">
-								<div class="hyeoa">
-									 <el-tooltip class="item" effect="dark" content="新增疫苗信息,请慎重操作" placement="top-start">
-									      <img src="../../../assets/images/icon_tc_add.png" alt="" class="hueyde" @click="tijea(index)" />
-									    </el-tooltip>
-										<el-tooltip class="item" effect="dark" content="删除无法恢复,请慎重操作" placement="top-start">
-										     <img src="../../../assets/images/delei.png" alt="" class="hueydele" @click="naeyrfakjf(index, item)" />
-										   </el-tooltip>
-								</div>
-							</el-col>
+							<!-- <el-col :span="2" class="hjdoecdre"> -->
+								
+							<!-- </el-col> -->
 						</el-row>
 					</el-col>
 					<el-col :span="24">
 						<el-row>
-							<el-col :span="7">
+							<el-col :span="7" style="width: 360px;">
 								<el-row>
-									<el-col :span="12">
+									<el-col :span="16">
 										<el-form-item label="禁忌症" prop="contraindication" class="ehiqya">
 											<el-select :disabled="shouwes" v-model="form.contraindication" placeholder="禁忌症" clearable size="small" style="width: 100%;">
 												<el-option v-for="dict in typeOptionscont" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
 											</el-select>
 										</el-form-item>
 									</el-col>
-									<el-col :span="8" style="margin-left: 10px;">
+									<el-col :span="6" style="margin-left: 10px;">
 										<div class="jdidur">
+											<el-tooltip class="item" effect="dark" content="请上传png/jpg文档,且不超过50MB" placement="top-start">
 											<el-upload
 												:disabled="shouwes"
 												class="upload-demo"
@@ -488,9 +502,10 @@
 												:on-preview="handlePictureCardPreview"
 												:before-upload="befors"
 											>
-												<el-button size="small" type="primary">点击上传</el-button>
+												<el-button size="small" type="primary">附件上传</el-button>
 											</el-upload>
-											<div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div>
+											</el-tooltip>
+											<!-- <div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div> -->
 										</div>
 									</el-col>
 									
@@ -498,8 +513,8 @@
 							</el-col>
 							<el-col :span="9">
 								<el-row>
-									<el-col :span="17" class="znshu">
-								<el-form-item label="暂缓接种" prop="suspend">
+									<el-col :span="18" class="znshu">
+								<el-form-item label="暂缓接种" prop="suspend"> 
 									<!-- <el-input
                   						v-model="form.suspend"
                   						placeholder="请输入暂缓"
@@ -510,8 +525,9 @@
 									</el-select>
 								</el-form-item>
 							</el-col>
-									<el-col :span="6" style="margin-left: 10px;">
+									<el-col :span="5" style="margin-left: 10px;">
 										<div class="jdidur">
+											<el-tooltip class="item" effect="dark" content="请上传png/jpg文档,且不超过50MB" placement="top-start">
 											<el-upload
 												:disabled="shouwes"
 												class="upload-demo"
@@ -525,9 +541,10 @@
 												:on-preview="handlePictureCardPreviewther"
 												:before-upload="beforsther"
 											>
-												<el-button size="small" type="primary">点击上传</el-button>
+												<el-button size="small" type="primary">附件上传</el-button>
 											</el-upload>
-											<div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div>
+											</el-tooltip>
+											<!-- <div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div> -->
 										</div>
 									</el-col>
 									
@@ -545,6 +562,7 @@
 									</el-col>
 									<el-col :span="8" style="margin-left: 10px;">
 										<div class="jdidur">
+											<el-tooltip class="item" effect="dark" content="请上传png/jpg文档,且不超过50MB" placement="top-start">
 											<el-upload
 												:disabled="shouwes"
 												class="upload-demo"
@@ -558,9 +576,10 @@
 												:on-preview="handlePictureCardPreviewfor"
 												:before-upload="beforsfor"
 											>
-												<el-button size="small" type="primary">点击上传</el-button>
+												<el-button size="small" type="primary">附件上传</el-button>
 											</el-upload>
-											<div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div>
+											</el-tooltip>
+											<!-- <div class="el-upload__tip" style="margin-left: 5px; color: red; margin-top: 0;">请上传png/jpg文档,且不超过50MB</div> -->
 										</div>
 									</el-col>
 									
@@ -775,6 +794,7 @@ export default {
 			imashow: false,
 			naneme: false,
 			shouwes: false,
+			shouwestwo:false,
 			villageTownshy: undefined,
 			naiseurya: '',
 			hsuej: '',
@@ -967,6 +987,19 @@ export default {
 				}
 			}
 		},
+		gywoatwo() {
+			console.log(this.queryParams.isVaccination);
+			if (this.queryParams.isVaccination !== null) {
+				if (this.queryParams.isVaccination == '是') {
+					// 接种疫苗
+					// (this.naneme = false), (this.shouwes = true);
+					this.shouwestwo = false
+				} else {
+					// (this.naneme = true), (this.shouwes = false);
+					this.shouwestwo = true
+				}
+			}
+		},
 		// 上传前控制
 		befors(res, file) {
 			console.log(res, file);
@@ -1095,7 +1128,7 @@ export default {
 				this.msgSuccess('上传成功');
 				this.comfietg.push(res.data);
 				this.comfietg.filter( router=> {
-					router.name = '接种附件'
+					router.name = '附件'
 				})
 				console.log(this.comfietg); 
 				console.log(res.data.name.substr(0, res.data.name.length - 4));
@@ -1109,7 +1142,7 @@ export default {
 			console.log(res.data.name.substr(-4));
 		},
 		errtwo() {
-			this.msgSuccess('上传失败');
+			this.msgInfo('上传失败');
 			console.log(35);
 		},
 		reseImagetwo(file, fileList) {
@@ -1184,16 +1217,16 @@ export default {
 				console.log(this.configther); 
 				console.log(res.data.name.substr(0, res.data.name.length - 4));
 				console.log(this.nameutaiL)
-				this.form.suspend_url = this.configther
+				this.form.suspendUrl = this.configther
 				// this.form.url = this.config;
-				this.form.suspend_url = JSON.stringify(this.form.suspend_url);
+				this.form.suspendUrl = JSON.stringify(this.form.suspendUrl);
 			}
 			// querjtgoe.message_title
-			console.log(this.form.suspend_url);
+			console.log(this.form.suspendUrl);
 			console.log(res.data.name.substr(-4));
 		},
 		errther() {
-			this.msgSuccess('上传失败');
+			this.msgInfo('上传失败');
 			console.log(35);
 		},
 		reseImagether(file, fileList) {
@@ -1209,9 +1242,9 @@ export default {
 				}
 			}
 			if (this.comfietg.length == 0) {
-				this.form.suspend_url = undefined
+				this.form.suspendUrl = undefined
 			} else {
-				this.form.suspend_url = JSON.stringify(this.form.suspend_url);
+				this.form.suspendUrl = JSON.stringify(this.form.suspendUrl);
 			}
 		},
 		// 其他
@@ -1257,7 +1290,7 @@ export default {
 		upImageFnfor(res, file) {
 			this.configfor = []
 			if (res.code !== 200) {
-				this.msgSuccess('上传失败');
+				this.msgInfo('上传失败');
 				return false;
 			} else {
 				this.msgSuccess('上传成功');
@@ -1268,16 +1301,16 @@ export default {
 				console.log(this.configfor); 
 				console.log(res.data.name.substr(0, res.data.name.length - 4));
 				console.log(this.nameutaiL)
-				this.form.other_url = this.configfor
+				this.form.otherUrl = this.configfor
 				// this.form.url = this.config;
-				this.form.other_url = JSON.stringify(this.form.other_url);
+				this.form.otherUrl = JSON.stringify(this.form.otherUrl);
 			}
 			// querjtgoe.message_title
-			console.log(this.form.other_url);
+			console.log(this.form.otherUrl);
 			console.log(res.data.name.substr(-4));
 		},
 		errfor() {
-			this.msgSuccess('上传失败');
+			this.msgInfo('上传失败');
 			console.log(35);
 		},
 		reseImagefor(file, fileList) {
@@ -1293,9 +1326,9 @@ export default {
 				}
 			}
 			if (this.configfor.length == 0) {
-				this.form.other_url = undefined
+				this.form.otherUrl = undefined
 			} else {
-				this.form.other_url = JSON.stringify(this.form.other_url);
+				this.form.otherUrl = JSON.stringify(this.form.otherUrl);
 			}
 		},
 		// 表单重置
@@ -1615,14 +1648,37 @@ export default {
 };
 </script>
 <style lang="scss">
+	.jdueuh{
+		.el-form-item__label {
+			width: 0px !important;
+		}
+		.el-form-item__content {
+			margin-left: 10px !important;
+			// width: 70%;
+		}
+	}
+	.ijeuhdy{
+		.el-form-item__label {
+			width: 80px !important;
+		}
+		.el-form-item__content {
+			margin-left: 80px !important;
+			// width: 70%;
+		}
+	}
 	.znshu{
 		.el-form-item__label {
 			width: 80px !important;
+			// padding-left: 30px;
 		}
 		.el-form-item__content {
 			margin-left: 80px !important;
+			
 			// width: 70%;
 		}
+		.el-input__inner{
+			padding-left: 0 !important;
+		}
 	}
 	.heioangd{
 		.el-form-item__label {
@@ -1665,12 +1721,16 @@ export default {
 }
 .jhy {
 	// width: 100%;
+	// .el-form-item__content {
+	// 	width: 100%;
+	// 	margin-left: 0 !important;
+	// }
 	.el-form-item__content {
-		width: 100%;
-		margin-left: 0 !important;
+		margin-left: 55px !important;
+		// width: 70%;
 	}
 	.el-form-item__label {
-		width: 60px !important;
+		width: 55px !important;
 	}
 }
 .ehiqya {
@@ -1679,13 +1739,21 @@ export default {
 		.jdidur {
 			flex: 1;
 			margin-left: 10px;
-			// display: flex;
+			// text-align: left;
+			display: flex;
 		}
 	}
 	.upload-demo {
 		display: flex;
 	}
 }
+.jdoier{
+	display: flex;
+	align-items: center;
+	.upload-demo {
+		display: flex;
+	}
+}
 .hueyde {
 	width: 18px;
 	height: 18px;
@@ -1720,4 +1788,10 @@ export default {
 .hueya{
 	margin-left: 0 !important;
 }
+.iejghiadh{
+	.el-input__inner{
+		padding-right: 0 !important;
+		padding-left: 5px !important;
+	}
+}
 </style>