提交

src/api/login.js

@@ -39,4 +39,19 @@ export function getCodeImg() {
     url: '/code',
     method: 'get'
   })
+}
+
+// 获取二维码code
+export function getLoginCode() {
+  return request({
+    url: '/auth/getQrCode',
+    method: 'post'
+  })
+}
+// 二维码是否扫码
+export function getScanStatus(code) {
+  return request({
+    url: `/applet/getPool/${code}`,
+    method: 'get',
+  })
 }

src/views/login.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <img src="../assets/images/icon_dl_ewm@2x.png" v-if="statusFlag==1" @click="statusFlag=2" alt="" class="icon_rw">
-      <img src="../assets/images/icon_dl_madl@2x.png" v-if="statusFlag==2" alt="" @click="statusFlag=1" class="icon_mim">
+      <img src="../assets/images/icon_dl_ewm@2x.png" v-if="stageType==1" @click="dhiwyrei" alt="" class="icon_rw">
+      <img src="../assets/images/icon_dl_madl@2x.png" v-if="stageType==2" alt="" @click="stageType=1" class="icon_mim">
       <h3 class="title"> 潜山市防疫数据平台</h3>
-      <div v-if="statusFlag==2">
+      <!-- <div v-if="statusFlag==2">
         <div class="erw_img">
           <img src="" alt="" class="imgs">
           <p>请使用手机扫描上方二维码登录</p>
@@ -12,8 +12,33 @@
         <div class="mim_p">
           密码登录
         </div>
+      </div> -->
+	  <div v-show="stageType==2" class="login-erw">
+      <h2 class="logerw_tit">
+        二维码快速登录
+      </h2>
+      <p>请扫描下方的二维码</p>
+      <p>安全登录，防止盗号</p>
+      <div class="logerw_img" ref="qrCodeUrl">
       </div>
-      <div v-if="statusFlag==1">
+      <div class="ts_p" v-if="isInvalid">
+        二维码已过期，请点击<span @click="getQecode">刷新</span>重试
+      </div>
+      <!-- <div class="logerw_fot" @click="two_fn">
+        账号密码登录
+      </div> -->
+    </div>
+	<div v-show="stageType==3" class="login-erw-thre">
+	  <div class="log_erw_thre_img">
+	    <img src="../assets/images/pic_dlcg@2x.png" alt="" class="img">
+	  </div>
+	  <div class="log_erw_thre_rig">
+	    <h3>{{ success_status?'页面超时，请重新扫描二维码':'扫描成功，请在手机上确认是否授权登录'}}</h3>
+	    <p v-if="!success_status">使用其他方式登录，请<span @click="three_fn">返回</span></p>
+	    <div v-if="success_status" class="thre_btn" @click="three_sj_fn">返回上一页</div>
+	  </div>
+	</div>
+      <div v-if="stageType==1">
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -97,93 +122,219 @@
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+  import {
+    getCodeImg,
+    getLoginCode,
+    getScanStatus
+  } from "@/api/login";
+  import Cookies from "js-cookie";
+  import QRCode from 'qrcodejs2'
+  import settings from "@/settings";
+  import {
+    encrypt,
+    decrypt
+  } from '@/utils/jsencrypt'
+  import {setToken} from '@/utils/auth'
 
-export default {
-  name: "Login",
-  data() {
-    return {
-      statusFlag: 1,
-      codeUrl: "",
-      cookiePassword: "",
-      loginForm: {
-        username: "",
-        password: "",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "用户名不能为空" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "密码不能为空" }
-        ],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
-      },
-      loading: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  methods: {
-    btns() {
-      this.msgInfo('暂未开放')
+  export default {
+    name: "Login",
+    data() {
+      return {
+        stageType: 1, //1密码登录  2扫码登录 3扫码成功
+        isInvalid: false, // true失效  false有效
+        setInStatus: '', // 校验是否扫码 时间函数
+        codeUrl: "",
+        cookiePassword: "",
+        loginForm: {
+          username: "",
+          password: "",
+          rememberMe: false,
+          code: "",
+          uuid: ""
+        },
+        loginRules: {
+          username: [{
+            required: true,
+            trigger: "blur",
+            message: "用户名不能为空"
+          }],
+          password: [{
+            required: true,
+            trigger: "blur",
+            message: "密码不能为空"
+          }],
+          code: [{
+            required: true,
+            trigger: "change",
+            message: "验证码不能为空"
+          }]
+        },
+        setInStatus_num: 0,
+        loading: false,
+        qecode: '', // code
+        redirect: undefined,
+        success_status: false, // 扫描成功 是否超时
+        setInSuccess_fn: '', // 扫码成功函数
+        setInSuccess_num: 0, // 扫码成功计时
+      };
     },
-    getCode() {
-      getCodeImg().then(res => {
-        this.codeUrl = "data:image/gif;base64," + res.img;
-        this.loginForm.uuid = res.uuid;
-      });
+    watch: {
+      $route: {
+        handler: function(route) {
+          this.redirect = route.query && route.query.redirect;
+        },
+        immediate: true
+      }
     },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
+    created() {
+      this.getCode();
+      this.getCookie();
     },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            this.getCode();
-          });
+    methods: {
+		btns() {
+		  this.msgInfo('暂未开放')
+		},
+      getCode() {
+        getCodeImg().then(res => {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        });
+      },
+      two_fn() {
+        this.stageType = 1
+        this.setInStatus_num = 0
+        this.isInvalid = false
+        if(this.setInStatus){
+          clearInterval(this.setInStatus)
+        }
+      },
+      three_sj_fn() {
+        this.getQecode()
+      },
+      three_fn() {
+        this.stageType = 1
+        this.setInSuccess_num = 0
+        this.success_status = false
+        if(this.setInSuccess_fn){
+          clearInterval(this.setInSuccess_fn)
         }
-      });
+      },
+      creatQrCode(url) {
+        const _this = this
+        this.$refs.qrCodeUrl.innerHTML="";
+        let qrcode = new QRCode(_this.$refs.qrCodeUrl, {
+          text: url, // 需要转换为二维码的内容
+          width: 200,
+          height: 200,
+          colorDark: '#000000',
+          colorLight: '#ffffff',
+          correctLevel: QRCode.CorrectLevel.H
+        })
+        console.log(qrcode,987)
+        this.setInStatus_fn()
+      },
+      setInStatus_fn() {
+        this.setInStatus = setInterval(red => {
+          this.setInStatus_num ++
+          if(this.setInStatus_num==180){
+            this.setInStatus_num = 0
+            this.isInvalid = true
+            clearInterval(this.setInStatus)
+          }else{
+            getScanStatus(this.qecode).then(res => {
+              if(res.msg == 'has_scan'){
+                clearInterval(this.setInStatus)
+                this.setInStatus_num = 0
+                this.stageType=3
+                this.succes_fn()
+              }
+            })
+          }
+        },1000)
+      },
+      succes_fn() {
+        this.setInSuccess_fn = setInterval(red => {
+          this.setInSuccess_num++
+          if(this.setInSuccess_num==180){
+            this.setInSuccess_num = 0
+            this.success_status = true
+            clearInterval(this.setInSuccess_fn)
+          }else{
+            getScanStatus(this.qecode).then(res => {
+              if(res.msg.includes('login_success:')){
+                clearInterval(this.setInSuccess_fn)
+                let token = res.msg.replace('login_success:','')
+                setToken(token)
+                this.$store.commit('SET_TOKEN', token)
+                this.$router.push({
+                  path: this.redirect || "/"
+                }).catch(() => {});
+              }
+            })
+          }
+        },1000)
+      },
+      getQecode() {
+        getLoginCode().then(res => {
+          this.qecode = res.data
+          console.log(res.msg,67)
+          let apiurl = settings.urls
+          if(apiurl.includes('47.114.172.162')){
+            apiurl = 'https://video.zhongxinyun.com.cn/api'
+          }
+          let urls = `${apiurl}/applet/scanQr/${res.msg}`
+          console.log(urls,987)
+          this.creatQrCode(urls)
+          this.isInvalid = false
+          this.stageType = 2
+        })
+      },
+	  dhiwyrei(){
+		  this.stageType=2
+		  this.getQecode()
+	  },
+      getCookie() {
+        const username = Cookies.get("username");
+        const password = Cookies.get("password");
+        const rememberMe = Cookies.get('rememberMe')
+        this.loginForm = {
+          username: username === undefined ? this.loginForm.username : username,
+          password: password === undefined ? this.loginForm.password : decrypt(password),
+          rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        };
+      },
+      handleLogin() {
+        this.$refs.loginForm.validate(valid => {
+          if (valid) {
+            this.loading = true;
+            if (this.loginForm.rememberMe) {
+              Cookies.set("username", this.loginForm.username, {
+                expires: 30
+              });
+              Cookies.set("password", encrypt(this.loginForm.password), {
+                expires: 30
+              });
+              Cookies.set('rememberMe', this.loginForm.rememberMe, {
+                expires: 30
+              });
+            } else {
+              Cookies.remove("username");
+              Cookies.remove("password");
+              Cookies.remove('rememberMe');
+            }
+            this.$store.dispatch("Login", this.loginForm).then(() => {
+              this.$router.push({
+                path: this.redirect || "/"
+              }).catch(() => {});
+            }).catch(() => {
+              this.loading = false;
+              this.getCode();
+            });
+          }
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
@@ -355,4 +506,105 @@ export default {
 .login-code-img {
   height: 38px;
 }
+
+ .login-erw-thre {
+    border-radius: 4px;
+    background: #ffffff;
+    padding: 81px 41px;
+    text-align: center;
+    display: flex;
+    align-items: center;
+
+    .log_erw_thre_img {
+      width: 181px;
+      height: 270px;
+
+      .img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .log_erw_thre_rig {
+      h3 {
+        font-size: 16px;
+        color: #343434;
+        margin: 0 0 40px;
+      }
+       .thre_btn{
+         width: 120px;
+         height: 36px;
+         color: #24B2FA;
+         border: 1px solid #24B2FA;
+         box-sizing: border-box;
+         border-radius: 18px;
+         cursor: pointer;
+         margin: 0 auto;
+         line-height: 36px;
+       }
+      p {
+        font-size: 14px;
+        color: #666666;
+        text-align: left;
+
+        span {
+          color: #24B2FA;
+          margin-left: 4px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .login-erw {
+    border-radius: 4px;
+    background: #ffffff;
+    width: 335px;
+    padding: 35px 31px 24px;
+    position: relative;
+    text-align: center;
+
+    .logerw_tit {
+      color: #343434;
+      font-size: 23px;
+      margin: 0 0 20px;
+    }
+
+    p {
+      color: #343434;
+      font-size: 15px;
+      margin: 0;
+      line-height: 22px;
+    }
+
+    .logerw_img {
+      width: 200px;
+      height: 200px;
+      margin: 22px auto 15px;
+      border: 1px solid #E4E4E4;
+      padding: 6px;
+      box-sizing: border-box;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .ts_p{
+      font-size: 14px;
+      margin-bottom: 25px;
+      color: #343434;
+      span{
+        margin: 0 3px;
+        color: #24B2FA;
+        cursor: pointer;
+      }
+    }
+
+    .logerw_fot {
+      text-align: right;
+      font-size: 15px;
+      color: #666666;
+      cursor: pointer;
+    }
+  }
 </style>

src/views/system/time/index.vue

@@ -19,9 +19,6 @@
 								<el-input v-model="queryParams.phoneNum" placeholder="请输入联系号码" style="width:240px;"clearable @keyup.enter.native="handleQuery" />
 							</el-form-item>
 						</el-col>
-						
-						
-						
 					</el-row>
 				</el-col>
 
@@ -40,7 +37,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						
 						<el-col :span="4.8">
 							<el-form-item label="重点行业" prop="keyIndustries">
 								<el-select v-model="queryParams.keyIndustries" placeholder="重点行业" clearable style="width:240px;">
@@ -85,7 +81,7 @@
 				</el-col>
 				<el-col :span="24">
 					<el-row>
-						<el-col :span="9" class="jehak">
+						<el-col :span="8" class="jehak">
 							<el-form-item label="户籍地址" prop="villagerGroup">
 								<el-cascader
 									placeholder="点击选择户籍地址"
@@ -93,13 +89,43 @@
 									filterable
 									@change="chahetwo"
 									:props="optionProps"
-									style="width: 100%;"
+									style="width: 110%;"
 									@keyup.enter.native="handleQuery"
 									clearable
 								></el-cascader>
 							</el-form-item>
 						</el-col>
+						<el-col :span="14" class="jehak">
+							<el-form-item label="居住地址" prop="villagerGroup">
+								<!-- <el-cascader
+									placeholder="点击选择居住地址"
+									:options="options"
+									filterable
+									@change="chahetwo"
+									:props="optionProps"
+									style="width: 100%;"
+									@keyup.enter.native="handleQuery"
+									clearable
+								></el-cascader> -->
+								<area-select
+								type="text"
+								v-model="selectedtwo"
+								:data="$pcaa"
+								:level="2"
+								style="display: flex;line-height: 18px;"
+								@change="onSelectedtwo"
+								@blur="dakousr"
+								class="hues"
+							></area-select>
+							</el-form-item>
+						</el-col>
 
+						
+						
+					</el-row>
+				</el-col>
+				<el-col :span="24">
+					<el-row>
 						<el-col :span="5">
 							<el-form-item label="接种情况" prop="isVaccination">
 								<el-radio-group v-model="queryParams.isVaccination" @change="gywoa">
@@ -122,7 +148,7 @@
 											/> -->
 							</el-form-item>
 						</el-col>
-
+						
 						<el-col :span="4" style="text-align: center;">
 							<el-form-item>
 								<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -151,48 +177,52 @@
 
 		<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" stripe style="width: 100%" height="350">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="编号" align="center" prop="code" fixed />
 			<el-table-column label="姓名" align="center" prop="userName" fixed />
-			<el-table-column label="性别" align="center" prop="gender" />
+			<el-table-column label="是否完成" align="center" prop="progress" fixed />
+			<el-table-column label="最后一次的接种时间" align="center" prop="vaccinationTime" width="150" />
+			<el-table-column label="下次应接时间" align="center" prop="vaccinationTimeNext" width="120"/>
+			<el-table-column label="联系方式" align="center" prop="phoneNum" />
+			<!-- <el-table-column label="性别" align="center" prop="gender" /> -->
 			<el-table-column label="身份证号码" align="center" prop="idCard" width="180" />
-			<el-table-column label="现居省份" align="center" prop="province" />
+			<!-- <el-table-column label="现居省份" align="center" prop="province" />
 			<el-table-column label="现居市" align="center" prop="city" />
-			<el-table-column label="现居县区" align="center" prop="region" />
-			<el-table-column label="现居住地详细地址" align="center" prop="nowIn" width="180" />
-			<el-table-column label="联系号码" align="center" prop="phoneNum" />
-			<el-table-column label="户籍乡镇" align="center" prop="villageTowns" />
+			<el-table-column label="现居县区" align="center" prop="region" /> -->
+			<el-table-column label="户籍地址" align="center" prop="domicileSelect" width="250" />
+			<el-table-column label="居住地址" align="center" prop="nowInSelect" width="250" />
+			
+			<!-- <el-table-column label="户籍乡镇" align="center" prop="villageTowns" />
 			<el-table-column label="户籍村居" align="center" prop="village" />
-			<el-table-column label="户籍村民组" align="center" prop="villagerGroup" />
-			<el-table-column label="户主" align="center" prop="houseType" />
-			<el-table-column label="户籍地址" align="center" prop="domicile" />
-
+			<el-table-column label="户籍村民组" align="center" prop="villagerGroup" /> -->
+			<!-- <el-table-column label="户主" align="center" prop="houseType" /> -->
+			
 			<!-- <el-table-column label="重点行业" align="center" prop="keyIndustries" /> -->
-			<el-table-column label="接种情况" align="center" prop="isVaccination" />
-			<el-table-column label="接种记录" align="center" class-name="small-padding fixed-width">
+			<!-- <el-table-column label="接种情况" align="center" prop="isVaccination" /> -->
+			<!-- <el-table-column label="接种记录" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button size="mini" type="text" @click="chakei(scope.row)">查看</el-button>
-					<!-- v-hasPermi="['core:info:edit']" -->
+					
 				</template>
-			</el-table-column>
-			<el-table-column
+			</el-table-column> -->
+			<!-- v-hasPermi="['core:info:edit']" -->
+			<!-- <el-table-column
 				label="应种未种
 "
 				align="center"
 				prop="shouldBe"
-			/>
-			<el-table-column label="工作单位" align="center" prop="other" />
-			<el-table-column label="进度" align="center" prop="vaccineInfoUserList[0].progress" />
-			<el-table-column label="备注" align="center" prop="remark" />
+			/> -->
+			<!-- <el-table-column label="工作单位" align="center" prop="other" /> -->
+			<!-- <el-table-column label="进度" align="center" prop="vaccineInfoUserList[0].progress" /> -->
+			<!-- <el-table-column label="备注" align="center" prop="remark" /> -->
 			<!-- <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
         	<span>{{ scope.row.status==0?'启用' :'停用' }}</span>
         </template>
       </el-table-column> -->
 			<!-- <el-table-column label="是否删除" align="center" prop="isDel" /> -->
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+			<el-table-column label="操作" align="left" 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)" v-hasPermi="['core:info:edit']">查看修改</el-button>
-					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['core:info:remove']">删除</el-button>
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" class="hueya" v-hasPermi="['core:info:remove']">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -294,7 +324,7 @@
 					</el-col>
 
 					<el-col :span="12">
-						<el-form-item label="工作单位" prop="other"><el-input v-model="form.other" placeholder="请输入工作单位" /></el-form-item>
+						<el-form-item label="工作单位" prop="work_unit"><el-input v-model="form.other" placeholder="请输入工作单位" /></el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="备注" prop="remark"><el-input v-model="form.remark" placeholder="请输入备注" /></el-form-item>
@@ -321,41 +351,20 @@
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
-							<el-col :span="5.5">
-								<el-form-item label="暂缓" prop="suspend">
-									<!-- <el-input
-                  						v-model="form.suspend"
-                  						placeholder="请输入暂缓"
-                  					/> -->
-									<el-radio-group v-model="form.suspend" :disabled="shouwes">
-										<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.5">
-								<el-form-item label="死亡" prop="death">
-									<!-- <el-input v-model="form.death" placeholder="请输入死亡" /> -->
-									<el-radio-group v-model="form.death" :disabled="shouwes">
-										<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="4.8">
-								<el-form-item
-									label="失联失踪
-                  "
-									prop="lostInMissing"
-								>
-									<el-radio-group v-model="form.lostInMissing" :disabled="shouwes">
-										<el-radio v-for="dict in typeOptionsty" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
-									</el-radio-group>
+							<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-form-item>
 							</el-col>
 							<el-col :span="5">
-								<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-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-form-item>
 							</el-col>
 						</el-row>
@@ -364,7 +373,7 @@
 					<el-col :span="24" v-for="(item, index) in form.vaccineInfoUserList" :key="index">
 						<el-row>
 							<el-col :span="4">
-								<el-form-item label="疫苗名称" :prop="item.vaccineName">
+								<el-form-item label="疫苗名称" >
 									<el-select v-model="item.vaccineName" placeholder="疫苗名称" clearable :disabled="naneme" @change="changeheu(index)">
 										<el-option
 											v-for="dict in typeOptionsname"
@@ -376,7 +385,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="5" class="oiuyty">
-								<el-form-item label="接种时间" :prop="item.vaccinationTime">
+								<el-form-item label="接种时间" >
 									<el-date-picker
 										clearable
 										v-model="item.vaccinationTime"
@@ -390,7 +399,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="5">
-								<el-form-item label="接种地点" :prop="item.vaccinationPlace">
+								<el-form-item label="接种地点" >
 									<el-select :disabled="naneme" v-model="item.vaccinationPlace" placeholder="接种地点" clearable size="small">
 										<el-option v-for="dict in typeOptionsvaccinatio" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
 										<!-- dict.dictValue -->
@@ -398,7 +407,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="3">
-								<el-form-item label="剂次" :prop="item.jici" class="jhy">
+								<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-option
@@ -412,14 +421,14 @@
 							</el-col>
 
 							<el-col :span="3">
-								<el-form-item label="进度" :prop="item.progress" class="jhy">
+								<el-form-item label="进度"  class="jhy">
 									<el-select v-model="item.progress" placeholder="进度" clearable style="width:50%" :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="证明" :prop="item.progress" class="jhy">
+								<el-form-item label="附件"  class="jhy">
 									<div class="jdidur">
 										<el-upload
 											:disabled="naneme"
@@ -428,11 +437,11 @@
 											:action="process + '/boman-file/upload'"
 											:on-change="handleChangertwo"
 											:on-success="upImageFntwo"
-											:on-error="err"
+											:on-error="errtwo"
 											:on-remove="reseImagetwo"
-											:file-list="config"
-											:on-preview="handlePictureCardPreview"
-											:before-upload="befors"
+											:file-list="item.url == '' ? item.url : JSON.parse(item.url)"
+											:on-preview="handlePictureCardPreviewtwo"
+											:before-upload="beforstwo"
 										>
 											<el-button size="small" type="primary">点击上传</el-button>
 										</el-upload>
@@ -444,7 +453,7 @@
 							<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" />
+									      <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)" />
@@ -455,33 +464,109 @@
 					</el-col>
 					<el-col :span="24">
 						<el-row>
-							<el-col :span="6">
-								<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-col :span="7">
+								<el-row>
+									<el-col :span="12">
+										<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;">
+										<div class="jdidur">
+											<el-upload
+												:disabled="shouwes"
+												class="upload-demo"
+												:headers="{ Authorization: 'Bearer ' + getToken() }"
+												:action="process + '/boman-file/upload'"
+												:on-change="handleChangert"
+												:on-success="upImageFn"
+												:on-error="err"
+												:on-remove="reseImage"
+												:file-list="config"
+												:on-preview="handlePictureCardPreview"
+												:before-upload="befors"
+											>
+												<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>
+										</div>
+									</el-col>
+									
+								</el-row>
+							</el-col>
+							<el-col :span="9">
+								<el-row>
+									<el-col :span="17" class="znshu">
+								<el-form-item label="暂缓接种" prop="suspend">
+									<!-- <el-input
+                  						v-model="form.suspend"
+                  						placeholder="请输入暂缓"
+                  					/> -->
+									<el-select :disabled="shouwes" v-model="form.suspend" placeholder="暂缓接种" clearable size="small" style="width: 100%;">
+											<el-option v-for="dict in typeOptionstyzandeh" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel" />
+											<!-- dict.dictValue -->
 									</el-select>
 								</el-form-item>
 							</el-col>
-							<el-col :span="12" style="margin-left: 20px;">
-								<div class="jdidur">
-									<el-upload
-										:disabled="shouwes"
-										class="upload-demo"
-										:headers="{ Authorization: 'Bearer ' + getToken() }"
-										:action="process + '/boman-file/upload'"
-										:on-change="handleChangert"
-										:on-success="upImageFn"
-										:on-error="err"
-										:on-remove="reseImage"
-										:file-list="config"
-										:on-preview="handlePictureCardPreview"
-										:before-upload="befors"
-									>
-										<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>
-								</div>
+									<el-col :span="6" style="margin-left: 10px;">
+										<div class="jdidur">
+											<el-upload
+												:disabled="shouwes"
+												class="upload-demo"
+												:headers="{ Authorization: 'Bearer ' + getToken() }"
+												:action="process + '/boman-file/upload'"
+												:on-change="handleChangerther"
+												:on-success="upImageFnther"
+												:on-error="err"
+												:on-remove="reseImagether"
+												:file-list="configther"
+												:on-preview="handlePictureCardPreviewther"
+												:before-upload="beforsther"
+											>
+												<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>
+										</div>
+									</el-col>
+									
+								</el-row>
+							</el-col>
+							<el-col :span="7">
+								<el-row>
+									<el-col :span="12" class="heioangd">
+										<el-form-item label="其他" prop="other" class="ehiqya">
+											<el-select :disabled="shouwes" v-model="form.other" placeholder="其他" clearable size="small" style="width: 100%;">
+												<el-option v-for="dict in typeOptionscontqit" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictLabel"/>
+												<!-- dictValue -->
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="8" style="margin-left: 10px;">
+										<div class="jdidur">
+											<el-upload
+												:disabled="shouwes"
+												class="upload-demo"
+												:headers="{ Authorization: 'Bearer ' + getToken() }"
+												:action="process + '/boman-file/upload'"
+												:on-change="handleChangerfor"
+												:on-success="upImageFnfor"
+												:on-error="errfor"
+												:on-remove="reseImagefor"
+												:file-list="configfor"
+												:on-preview="handlePictureCardPreviewfor"
+												:before-upload="beforsfor"
+											>
+												<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>
+										</div>
+									</el-col>
+									
+								</el-row>
 							</el-col>
+							
 						</el-row>
 					</el-col>
 				</el-row>
@@ -582,6 +667,9 @@ export default {
 				}
 			},
 			config: [],
+			comfietg:[],
+			configther:[],
+			configfor:[],
 			// 表单参数
 			form: {
 				nowIn: '',
@@ -592,7 +680,8 @@ export default {
 						vaccinationTime: '',
 						vaccinationPlace: '',
 						jici: '',
-						progress: ''
+						progress: '',
+						url:''
 					}
 				]
 			},
@@ -654,25 +743,16 @@ export default {
 					dictLabel: '否'
 				}
 			],
+			typeOptionstyzandeh:[],
 			angesList: [
-				{
-					dictValue: '12-17',
-					dictLabel: '12岁-17岁'
-				},
-				{
-					dictValue: '18-59',
-					dictLabel: '18岁-59岁'
-				},
-				{
-					dictValue: '60以上',
-					dictLabel: '60岁以上'
-				}
+				
 			],
 			typeOptionsname: [],
 			typeOptionstimes: [],
 			typeOptionsvaccinatio: [],
 			typeOptionscont: [],
 			typeOptionscontty: [],
+			typeOptionscontqit:[],
 			// 剂次
 			typeOptionstimesgt: [
 				{
@@ -701,7 +781,8 @@ export default {
 			jdourdjoaj: false,
 			jiezhong: false,
 			jiezheList: [],
-			fireLise:{config:[]}
+			fireLise:{config:[]},
+			nameutaiL:0
 		};
 	},
 	created() {
@@ -720,15 +801,31 @@ export default {
 		this.getDicts('vaccination_site').then(response => {
 			this.typeOptionsvaccinatio = response.data;
 		});
+		// 暂缓接种
+		this.getDicts('moratorium_on_vaccination').then(response => {
+			this.typeOptionstyzandeh = response.data;
+		});
 		// typeOptionscontty
 		// 禁忌症
 		this.getDicts('contraindication').then(response => {
 			this.typeOptionscont = response.data;
 		});
+		// 其他 typeOptionscontqit 
+		this.getDicts('other_status').then(response => {
+			this.typeOptionscontqit = response.data;
+		});
+		// 年龄阶段
+		this.getDicts('age_interval').then(response => {
+			this.angesList = response.data;
+		});
+		
 		this.form.province = this.selected[0];
 		this.form.city = this.selected[1];
 		this.form.region = this.selected[2];
-		this.naiseurya = this.form.province + this.form.city + this.form.region;
+		this.queryParams.province = this.selectedtwo[0];
+		this.queryParams.city = this.selectedtwo[1];
+		this.queryParams.region = this.selectedtwo[2];
+		// this.naiseurya = this.form.province + this.form.city + this.form.region;
 	},
 	methods: {
 		onSelected(data) {
@@ -738,7 +835,6 @@ export default {
 			this.form.city = data[1];
 			this.form.region = data[2];
 			this.naiseurya = this.form.province + this.form.city + this.form.region;
-
 			if (this.jdourdjoaj == false) {
 				// 修改
 				this.form.nowIn = '';
@@ -860,6 +956,17 @@ export default {
 			this.imashow = false;
 			this.reset();
 		},
+		gywoa() {
+			console.log(this.form.isVaccination);
+			if (this.form.isVaccination !== null) {
+				if (this.form.isVaccination == '是') {
+					// 接种疫苗
+					(this.naneme = false), (this.shouwes = true);
+				} else {
+					(this.naneme = true), (this.shouwes = false);
+				}
+			}
+		},
 		// 上传前控制
 		befors(res, file) {
 			console.log(res, file);
@@ -872,17 +979,6 @@ export default {
 			// }
 			return true;
 		},
-		gywoa() {
-			console.log(this.form.isVaccination);
-			if (this.form.isVaccination !== null) {
-				if (this.form.isVaccination == '是') {
-					// 接种疫苗
-					(this.naneme = false), (this.shouwes = true);
-				} else {
-					(this.naneme = true), (this.shouwes = false);
-				}
-			}
-		},
 		// 图片预览
 		handlePictureCardPreview(file) {
 			console.log(file, 87);
@@ -918,7 +1014,7 @@ export default {
 				this.msgSuccess('上传成功');
 				this.config.push(res.data);
 				this.config.filter( router=> {
-					router.name = '附件'
+					router.name = '禁忌症附件'
 				})
 				console.log(res.data); 
 				console.log(res.data.name.substr(0, res.data.name.length - 4));
@@ -951,6 +1047,257 @@ export default {
 				this.form.url = JSON.stringify(this.config);
 			}
 		},
+		// 上传前控制
+		beforstwo(res, file) {
+			console.log(res, file);
+			// console.log(res.name.substr(0, res.name.length - 4));
+			// if(res.type !== 'application/pdf'){
+			//   this.msgSuccess('只能上传pdf文件');
+			//   return false
+			// }else{
+			//   return true
+			// }
+			return true;
+		},
+		// 图片预览
+		handlePictureCardPreviewtwo(file) {
+			console.log(file, 87);
+			console.log(file.name.split('.'));
+			let hegs = file.name.split('.');
+			console.log(hegs[hegs.length - 1]);
+			if (hegs[hegs.length - 1] == 'pdf') {
+				this.shouewhu = true;
+			} else {
+				if (hegs[hegs.length - 1] == 'jpg' || hegs[hegs.length - 1] == 'png') {
+					this.shouewhu = false;
+					this.exelshow = false;
+				} else {
+					this.exelshow = true;
+				}
+			}
+			console.log(this.shouewhu, this.exelshow);
+			this.dialogImageUrl = file.url;
+			this.dialogImageUrlname = file.name;
+			console.log(this.dialogImageUrlname);
+			this.dialogVisible = true;
+			this.imashow = true;
+		},
+		// 上传文件
+		handleChangertwo(file, fileList) {
+			// this.fileList = fileList.slice(-3);
+		},
+		upImageFntwo(res, file) {
+			this.comfietg = []
+			if (res.code !== 200) {
+				this.msgSuccess('上传失败');
+				return false;
+			} else {
+				this.msgSuccess('上传成功');
+				this.comfietg.push(res.data);
+				this.comfietg.filter( router=> {
+					router.name = '接种附件'
+				})
+				console.log(this.comfietg); 
+				console.log(res.data.name.substr(0, res.data.name.length - 4));
+				console.log(this.nameutaiL)
+				this.form.vaccineInfoUserList[this.nameutaiL].url = this.comfietg
+				// this.form.url = this.config;
+				this.form.vaccineInfoUserList[this.nameutaiL].url = JSON.stringify(this.form.vaccineInfoUserList[this.nameutaiL].url);
+			}
+			// querjtgoe.message_title
+			console.log(this.form.vaccineInfoUserList[this.nameutaiL].url);
+			console.log(res.data.name.substr(-4));
+		},
+		errtwo() {
+			this.msgSuccess('上传失败');
+			console.log(35);
+		},
+		reseImagetwo(file, fileList) {
+			let urls = '';
+			if (file.response) {
+				urls = file.response.url;
+			} else {
+				urls = file.url;
+			}
+			for (let i = this.config.length - 1; i >= 0; i--) {
+				if (this.comfietg[i].url == urls) {
+					this.comfietg.splice(i, 1);
+				}
+			}
+			if (this.comfietg.length == 0) {
+				this.form.vaccineInfoUserList[this.nameutaiL].url = [];
+			} else {
+				this.form.vaccineInfoUserList[this.nameutaiL].url = JSON.stringify(this.form.vaccineInfoUserList[this.nameutaiL].url);
+			}
+		},
+		// 暂缓
+		// 上传前控制
+		beforsther(res, file) {
+			console.log(res, file);
+			// console.log(res.name.substr(0, res.name.length - 4));
+			// if(res.type !== 'application/pdf'){
+			//   this.msgSuccess('只能上传pdf文件');
+			//   return false
+			// }else{
+			//   return true
+			// }
+			return true;
+		},
+		// 图片预览
+		handlePictureCardPreviewther(file) {
+			console.log(file, 87);
+			console.log(file.name.split('.'));
+			let hegs = file.name.split('.');
+			console.log(hegs[hegs.length - 1]);
+			if (hegs[hegs.length - 1] == 'pdf') {
+				this.shouewhu = true;
+			} else {
+				if (hegs[hegs.length - 1] == 'jpg' || hegs[hegs.length - 1] == 'png') {
+					this.shouewhu = false;
+					this.exelshow = false;
+				} else {
+					this.exelshow = true;
+				}
+			}
+			console.log(this.shouewhu, this.exelshow);
+			this.dialogImageUrl = file.url;
+			this.dialogImageUrlname = file.name;
+			console.log(this.dialogImageUrlname);
+			this.dialogVisible = true;
+			this.imashow = true;
+		},
+		// 上传文件
+		handleChangerther(file, fileList) {
+			// this.fileList = fileList.slice(-3);
+		},
+		upImageFnther(res, file) {
+			this.configther = []
+			if (res.code !== 200) {
+				this.msgSuccess('上传失败');
+				return false;
+			} else {
+				this.msgSuccess('上传成功');
+				this.configther.push(res.data);
+				this.configther.filter( router=> {
+					router.name = '暂缓附件'
+				})
+				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.url = this.config;
+				this.form.suspend_url = JSON.stringify(this.form.suspend_url);
+			}
+			// querjtgoe.message_title
+			console.log(this.form.suspend_url);
+			console.log(res.data.name.substr(-4));
+		},
+		errther() {
+			this.msgSuccess('上传失败');
+			console.log(35);
+		},
+		reseImagether(file, fileList) {
+			let urls = '';
+			if (file.response) {
+				urls = file.response.url;
+			} else {
+				urls = file.url;
+			}
+			for (let i = this.config.length - 1; i >= 0; i--) {
+				if (this.comfietg[i].url == urls) {
+					this.comfietg.splice(i, 1);
+				}
+			}
+			if (this.comfietg.length == 0) {
+				this.form.suspend_url = undefined
+			} else {
+				this.form.suspend_url = JSON.stringify(this.form.suspend_url);
+			}
+		},
+		// 其他
+		// 上传前控制
+		beforsfor(res, file) {
+			console.log(res, file);
+			// console.log(res.name.substr(0, res.name.length - 4));
+			// if(res.type !== 'application/pdf'){
+			//   this.msgSuccess('只能上传pdf文件');
+			//   return false
+			// }else{
+			//   return true
+			// }
+			return true;
+		},
+		// 图片预览
+		handlePictureCardPreviewfor(file) {
+			console.log(file, 87);
+			console.log(file.name.split('.'));
+			let hegs = file.name.split('.');
+			console.log(hegs[hegs.length - 1]);
+			if (hegs[hegs.length - 1] == 'pdf') {
+				this.shouewhu = true;
+			} else {
+				if (hegs[hegs.length - 1] == 'jpg' || hegs[hegs.length - 1] == 'png') {
+					this.shouewhu = false;
+					this.exelshow = false;
+				} else {
+					this.exelshow = true;
+				}
+			}
+			console.log(this.shouewhu, this.exelshow);
+			this.dialogImageUrl = file.url;
+			this.dialogImageUrlname = file.name;
+			console.log(this.dialogImageUrlname);
+			this.dialogVisible = true;
+			this.imashow = true;
+		},
+		// 上传文件
+		handleChangerfor(file, fileList) {
+			// this.fileList = fileList.slice(-3);
+		},
+		upImageFnfor(res, file) {
+			this.configfor = []
+			if (res.code !== 200) {
+				this.msgSuccess('上传失败');
+				return false;
+			} else {
+				this.msgSuccess('上传成功');
+				this.configfor.push(res.data);
+				this.configfor.filter( router=> {
+					router.name = '其他附件'
+				})
+				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.url = this.config;
+				this.form.other_url = JSON.stringify(this.form.other_url);
+			}
+			// querjtgoe.message_title
+			console.log(this.form.other_url);
+			console.log(res.data.name.substr(-4));
+		},
+		errfor() {
+			this.msgSuccess('上传失败');
+			console.log(35);
+		},
+		reseImagefor(file, fileList) {
+			let urls = '';
+			if (file.response) {
+				urls = file.response.url;
+			} else {
+				urls = file.url;
+			}
+			for (let i = this.config.length - 1; i >= 0; i--) {
+				if (this.configfor[i].url == urls) {
+					this.configfor.splice(i, 1);
+				}
+			}
+			if (this.configfor.length == 0) {
+				this.form.other_url = undefined
+			} else {
+				this.form.other_url = JSON.stringify(this.form.other_url);
+			}
+		},
 		// 表单重置
 		reset() {
 			this.form = {
@@ -991,7 +1338,8 @@ export default {
 						vaccinationTime: '',
 						vaccinationPlace: '',
 						jici: '',
-						progress: ''
+						progress: '',
+						url:[]
 					}
 				]
 			};
@@ -1027,6 +1375,7 @@ export default {
 			this.form.region = this.selected[2];
 			this.title = '添加疫苗信息';
 			this.jdourdjoaj = true;
+			console.log(this.form)
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -1070,9 +1419,16 @@ export default {
 								vaccinationTime: '',
 								vaccinationPlace: '',
 								jici: '',
-								progress: ''
+								progress: '',
+								url:[]
 							}
 						];
+					}else {
+						this.form.vaccineInfoUserList.filter(router =>{
+							if(router.url == undefined){
+								router.url = []
+							}
+						})
 					}
 				}
 				// villageTownshy
@@ -1113,19 +1469,21 @@ export default {
 				console.log(this.selected);
 				if (valid) {
 					if (this.form.id != null) {
-						this.form.nowIn = this.naiseurya + this.form.nowIn;
-						this.form.domicile = this.hsuej + this.form.domicile;
+						// this.form.nowIn = this.naiseurya + this.form.nowIn;
+						// this.form.domicile = this.hsuej + this.form.domicile;
 						updateInfo(this.form).then(response => {
 							this.msgSuccess('修改成功');
 							this.open = false;
 							this.getList();
 						});
 					} else {
-						this.form.nowIn = this.naiseurya + this.form.nowIn;
-						this.form.domicile = this.hsuej + this.form.domicile;
-						if (this.form.nowIn == 'undefined') {
-							this.form.nowIn = null;
-						}
+						// this.form.nowIn = this.naiseurya + this.form.nowIn;
+						// this.form.domicile = this.hsuej + this.form.domicile;
+						// if (this.form.nowIn == 'undefined') {
+						// 	this.form.nowIn = null;
+						// } 
+						console.log(this.form)
+						// return
 						addInfo(this.form).then(response => {
 							this.msgSuccess('新增成功');
 							this.open = false;
@@ -1206,13 +1564,16 @@ export default {
 			this.jicherutwo(data.value);
 		},
 		// 点击新增
-		tijea() {
+		tijea(index) {
+			console.log(index+ 1)
+			this.nameutaiL = index+ 1
 			this.form.vaccineInfoUserList.push({
 				vaccineName: '',
 				vaccinationTime: '',
 				vaccinationPlace: '',
 				jici: '',
-				progress: ''
+				progress: '',
+				url:[]
 			});
 		},
 		// 点击删除
@@ -1254,6 +1615,24 @@ export default {
 };
 </script>
 <style lang="scss">
+	.znshu{
+		.el-form-item__label {
+			width: 80px !important;
+		}
+		.el-form-item__content {
+			margin-left: 80px !important;
+			// width: 70%;
+		}
+	}
+	.heioangd{
+		.el-form-item__label {
+			width: 70px !important;
+		}
+		.el-form-item__content {
+			margin-left: 70px !important;
+			// width: 70%;
+		}
+	}
 .hues {
 	.area-select {
 		margin-left: 0 !important;
@@ -1338,4 +1717,7 @@ export default {
 		line-height: 50px;
 	}
 }
+.hueya{
+	margin-left: 0 !important;
+}
 </style>