1111-11

src/views/role/components/userDefault.vue

@@ -151,11 +151,7 @@
             
             <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="sszq" class="custom-align-right">
              
-<<<<<<< HEAD
                     <el-cascader v-model="form.sszq" :options="options_arr" filterable clearable></el-cascader>
-=======
-            <el-cascader v-model="form.sszq" :options="options_arr" filterable clearable></el-cascader>
->>>>>>> 0334dd936e10ef92b1051f098ef2a97d6ad73624
  
           </el-form-item>
           <!-- 创建用户--增加字段sszq，网站标识 -->
@@ -530,14 +526,9 @@ export default {
     },
     //提交表单
     addData(){
-<<<<<<< HEAD
            
           this.form.sszq=this.form.sszq[0]
            
-=======
-
-      this.form.sszq=this.form.sszq[0]
->>>>>>> 0334dd936e10ef92b1051f098ef2a97d6ad73624
 
       //1.格式化时间戳
       this.form.birthday = formatLocalDate(this.form.birthday);

src/views/role/components/userInvestigate.vue

@@ -1,7 +1,4 @@
 <template>
-
-
-
   <div class="mainBox">
     <div class="layerBox">
       <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left" label-width="120px">
@@ -225,7 +222,6 @@ import URL from '@/utils/baseUrl';
 import CityCascader from './CityCascader';
 //格式化时间
 import { formatLocalDate } from '@/utils/public';
-// import cjs from 'compression-webpack-plugin';
 
 export default {
   components: {