修改bug

src/views/news/creatNews.vue

@@ -570,6 +570,7 @@ export default {
     handleDelete() {
       // 删除图片
       this.imgUrl = ''; // 清空图片 URL
+      this.form.imgurl = ''; // 清空表单中的图片 URL
     },
     //---------------------------
     addInput(index) {
@@ -925,7 +926,7 @@ export default {
         this.cleatForm(1)
       }
       //如果推荐等级为空，则设置为0
-      if (this.form.level == "") {
+      if (this.form.level == "" || this.form.level == "[0]") {
         this.form.level = "[0]";
       } else {
         this.form.level = JSON.stringify(this.form.level);

src/views/news/surveyList.vue

@@ -1,16 +1,16 @@
 <template>
-    <!-- 广告位管理 -->
+    <!-- 投票管理 -->
     <div>
         <!-- 头部搜索框部分 -->
         <div class="title">
             <el-row>
-                <el-col :span="8" class="left">
+                <el-col :span="11" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">投票名称</div>
                         <el-input v-model="tabbarName" class="input" placeholder="请输入投票名称" :maxlength="10"></el-input>
                     </div>
                 </el-col>
-                <el-col :span="8" class="left">
+                <el-col :span="11" class="left">
                     <div class="searchBox">
                         <div class="searchTitle">投票类型</div>
                         <el-select v-model="typeid" placeholder="请选择投票类型...">
@@ -19,15 +19,17 @@
                         </el-select>
                     </div>
                 </el-col>
-                <el-col :span="8" class="left">
-                    <div class="searchBox">
-                        <div class="searchTitle">是否开启</div>
-                        <el-select v-model="status" placeholder="请选择是否开启...">
-                            <el-option label="是" value="1"></el-option>
-                            <el-option label="否" value="0"></el-option>
-                        </el-select>
-                    </div>
-                </el-col>
+<!-- 
+<el-col :span="8" class="left">
+    <div class="searchBox">
+        <div class="searchTitle">是否开启</div>
+        <el-select v-model="status" placeholder="请选择是否开启...">
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+        </el-select>
+    </div>
+</el-col>
+-->
                 
             </el-row>
             <el-row>
@@ -45,10 +47,9 @@
             <el-row>
                 <template>
                     <el-table class="my-table" :data="tableData" style="width: 100%">
-                        <el-table-column type="index" :index="indexMethod" label="编号" width="90">
-                        </el-table-column>
-                        <el-table-column prop="survey_name" label="投票名称" width="500">
+                        <el-table-column prop="id" label="编号" width="90">
                         </el-table-column>
+                        <el-table-column prop="survey_name" label="投票名称" width="500"></el-table-column>
                         <el-table-column prop="survey_type" label="投票类型" width="100" >
                             <template slot-scope="scope">
                                 <span v-if="scope.row.survey_type==1">
@@ -59,16 +60,18 @@
                                 </span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="is_survey" label="是否开启" width="100">
-                            <template slot-scope="scope">
-                                <span v-if="scope.row.is_survey==1">
-                                    是
-                                </span>
-                                <span v-if="scope.row.is_survey==0">
-                                    否
-                                </span>
-                            </template>
-                        </el-table-column>
+                        <!--
+                            <el-table-column prop="is_survey" label="是否开启" width="100">
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.is_survey==1">
+                                        是
+                                    </span>
+                                    <span v-if="scope.row.is_survey==0">
+                                        否
+                                    </span>
+                                </template>
+                            </el-table-column>
+                        -->
                         <el-table-column prop="created_at" label="添加时间" width="">
                         </el-table-column>
                         <el-table-column prop="updated_at" label="修改时间" width="">

src/views/role/components/userDefault.vue

@@ -292,7 +292,7 @@ export default {
 
       formLabelWidth:"120px",
       editId:"",
-      uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
+      uploadFileUrl:URL.baseUrl+"/public/uploadFile",//获得上传地址
       headers: {},
 
 

src/views/role/components/userEnterprise.vue

@@ -1,17 +1,14 @@
 <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">
+      <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left"
+        label-width="120px">
         <div class="formDiv">
           <!--选择角色 start------------------------------------------>
           <el-form-item label="所属角色：" :label-width="formLabelWidth" prop="role_id" class="custom-align-right">
             <div class="formLabelFloatBox">
               <el-select v-model="form.role_id" placeholder="请选择..">
-                <el-option
-                  v-for="item in role_idArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                <el-option v-for="item in role_idArr" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </div>
@@ -20,22 +17,13 @@
           <el-form-item label="登录账号：" :label-width="formLabelWidth" prop="user_name" class="custom-align-right">
             <el-input v-model="form.user_name" autocomplete="off" placeholder="请输入登录账号.."></el-input>
           </el-form-item>
-          <div v-if="editId==''">
+          <div v-if="editId == ''">
             <!--新密码 start------------------------------------------>
             <div class="PasswordBox">
-              <el-form-item prop="password" label="登录密码："  class="custom-align-right">
+              <el-form-item prop="password" label="登录密码：" class="custom-align-right">
                 <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType1"
-                    ref="password1"
-                    v-model="form.password"
-                    :type="passwordType1"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
+                  <el-input :key="passwordType1" ref="password1" v-model="form.password" :type="passwordType1"
+                    placeholder="请输入密码" name="password" tabindex="2" autocomplete="off" @blur="capsTooltip2 = false" />
                   <span class="show-pwd" @click="showPwd(1)">
                     <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
                   </span>
@@ -45,19 +33,10 @@
             <!--新密码 end------------------------------------------>
             <!--新密码 start------------------------------------------>
             <div class="PasswordBox">
-              <el-form-item prop="confirm_password" label="确认密码："  class="custom-align-right">
+              <el-form-item prop="confirm_password" label="确认密码：" class="custom-align-right">
                 <div class="PasswordBody">
-                  <el-input
-                    :key="passwordType2"
-                    ref="password2"
-                    v-model="form.confirm_password"
-                    :type="passwordType2"
-                    placeholder="请输入密码"
-                    name="password"
-                    tabindex="2"
-                    autocomplete="off"
-                    @blur="capsTooltip2 = false"
-                  />
+                  <el-input :key="passwordType2" ref="password2" v-model="form.confirm_password" :type="passwordType2"
+                    placeholder="请输入密码" name="password" tabindex="2" autocomplete="off" @blur="capsTooltip2 = false" />
                   <span class="show-pwd" @click="showPwd(2)">
                     <svg-icon :icon-class="passwordType2 === 'password' ? 'eye' : 'eye-open'" />
                   </span>
@@ -87,46 +66,42 @@
           <el-form-item label="负责人身份证：" :label-width="formLabelWidth" prop="id_card" class="custom-align-right">
             <el-input v-model="form.id_card" autocomplete="off" placeholder="请输入负责人身份证号.."></el-input>
           </el-form-item>
-          <el-form-item label="法人：" :label-width="formLabelWidth" prop="legal_person_real_name" class="custom-align-right">
+          <el-form-item label="法人：" :label-width="formLabelWidth" prop="legal_person_real_name"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_real_name" autocomplete="off" placeholder="请输入法人姓名.."></el-input>
           </el-form-item>
-          <el-form-item label="法人电话：" :label-width="formLabelWidth" prop="legal_person_mobile" class="custom-align-right">
+          <el-form-item label="法人电话：" :label-width="formLabelWidth" prop="legal_person_mobile"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_mobile" autocomplete="off" placeholder="请输入法人联系电话.."></el-input>
           </el-form-item>
-          <el-form-item label="法人身份证：" :label-width="formLabelWidth" prop="legal_person_id_card" class="custom-align-right">
+          <el-form-item label="法人身份证：" :label-width="formLabelWidth" prop="legal_person_id_card"
+            class="custom-align-right">
             <el-input v-model="form.legal_person_id_card" autocomplete="off" placeholder="请输入法人身份证号.."></el-input>
           </el-form-item>
           <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
-            <el-date-picker
-              v-model="timeList"
-              type="daterange"
-              :disabled="form.long_time === 1"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions">
+            <el-date-picker v-model="timeList" type="daterange" :disabled="form.long_time === 1" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
             </el-date-picker>
-            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0"
+              class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
 
 
 
 
-           <!-- <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
-            <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="websiteTag_arr_id" class="custom-align-right">
+          <!-- <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="city_arr_id" class="custom-align-right"> -->
+          <el-form-item label="站点标识：" :label-width="formLabelWidth" prop="sszq" class="custom-align-right">
             <!-- 级联选择器 xx-->
             <!-- websiteTag_ -->
             <!-- <el-cascader v-model="form.website_column_arr_id" :props="props_1" :options="website_column_arr" filterable clearable ></el-cascader> -->
-            
-            <el-cascader v-model="form.websiteTag_arr_id" :options="options_arr" filterable clearable></el-cascader>
- 
+            <el-cascader v-model="form.sszq" :options="options_arr" filterable clearable></el-cascader>
           </el-form-item>
 
 
 
 
 
-          
+
           <el-form-item label="传真：" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
             <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
           </el-form-item>
@@ -140,22 +115,14 @@
             <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload
-              class="upload-demo"
-              :action="uploadFileUrl"
-              :headers="headers"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
-              :on-success="handleUploadSuccess"
-              multiple
-              :limit="30"
-              :on-exceed="handleExceed"
-              :file-list="otherList">
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" :on-preview="handlePreview"
+              :on-remove="handleRemove" :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple
+              :limit="30" :on-exceed="handleExceed" :file-list="otherList">
               <el-button size="small" type="primary">点击上传</el-button>
               <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
             </el-upload>
           </el-form-item>
+
           <el-form-item label="提示词：" :label-width="formLabelWidth" prop="" class="custom-align-right">
             <el-input type="textarea" v-model="form.remark" class="custom-textarea" placeholder="请输入提示词"></el-input>
           </el-form-item>
@@ -173,12 +140,12 @@
 
         </div>
       </el-form>
-    </div>  
+    </div>
     <div class="bottomBtnBox">
       <el-button type="info" @click="goList">返回</el-button>
-      <el-button type="primary" @click="addData" v-if="editId==''">提交</el-button>
-      <el-button type="primary" @click="editData" v-if="editId!=''">修改</el-button>
-      <el-button type="warning" @click="resetPassword" v-if="editId!=''">重置密码</el-button>
+      <el-button type="primary" @click="addData" v-if="editId == ''">提交</el-button>
+      <el-button type="primary" @click="editData" v-if="editId != ''">修改</el-button>
+      <el-button type="warning" @click="resetPassword" v-if="editId != ''">重置密码</el-button>
     </div>
   </div>
 </template>
@@ -208,28 +175,28 @@ export default {
         callback()
       }
     }
-    const validateEmpty = (rule,value,callback) => {
+    const validateEmpty = (rule, value, callback) => {
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空！'));
       } else {
         callback();
       }
     }
-    const validateArray = (rule,value,callback) => {
+    const validateArray = (rule, value, callback) => {
       if (value.length == 0) {
         callback(new Error('该项不能为空！'))
       } else {
         callback()
       }
     }
-    const validateTimeTo = (rule,value,callback) => {
-      if(self.timeList.length == 0&&self.form.long_time==0){
+    const validateTimeTo = (rule, value, callback) => {
+      if (self.timeList.length == 0 && self.form.long_time == 0) {
         callback(new Error('该项不能为空！'))
-      }else{
+      } else {
         callback()
       }
     }
-    const validateIdcard = (rule,value,callback) => {
+    const validateIdcard = (rule, value, callback) => {
       const idCardRegex = /^(?:\d{15}|\d{18}|\d{17}[\dXx])$/; // 正则表达式验证身份证号
       if (!value || value.trim() === "") {
         callback(new Error('该项不能为空！'));
@@ -242,62 +209,62 @@ export default {
       }
     }
     return {
-      formLabelWidth:"120px",
-      editId:"",
-      uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
+      formLabelWidth: "120px",
+      editId: "",
+      uploadFileUrl: URL.baseUrl + "/public/uploadFile",//获得上传地址
       headers: {},
 
-      options_arr:[],
-
-
-      website_tag_params:{//xx
-            keyword:"",//网站名称查询
-            website_column_id:[],//使用网系id查询
-            city_id:[],//使用城市id查询
-
-            page:1,//当前是第几页
-            pageSize:666666,//一共多少条
-            name:"",
-       },
-
-
-
-      form:{
-
-            websiteTag_arr_id:[],    //站点标识下拉id only
-        websiteTag_reg:[],    
-        sszq:"", //站点标识下拉id
-           
-
-        type_id:3,//企业会员
-        role_id:"",//角色id 
-        user_name:"",//登录账号
-        password:"",//密码
-        confirm_password:"",//确认密码
-        real_name:"",//真实姓名
-        id_card:"",//身份证号
-        mobile:"",//手机号
-        city_arr_id:[],//工作区域 
-        address_arr_id:[],//详细地址
-        from_time:"",//有效期开始时间
-        to_time:"",//有效期结束时间
-        long_time:0,//是否为长期 //长期1：长期 0：非长期
-        qq:"",//QQ
-        email:"",//电子邮箱
-        other:[],//相关资料
-        remark:"",//提示词
+      options_arr: [],
+
+
+      website_tag_params: {//xx
+        keyword: "",//网站名称查询
+        website_column_id: [],//使用网系id查询
+        city_id: [],//使用城市id查询
+
+        page: 1,//当前是第几页
+        pageSize: 666666,//一共多少条
+        name: "",
+      },
+
+
+
+      form: {
+
+        websiteTag_arr_id: [],    //站点标识下拉id only
+        websiteTag_reg: [],
+        sszq: "", //站点标识下拉id
+
+
+        type_id: 3,//企业会员
+        role_id: "",//角色id 
+        user_name: "",//登录账号
+        password: "",//密码
+        confirm_password: "",//确认密码
+        real_name: "",//真实姓名
+        id_card: "",//身份证号
+        mobile: "",//手机号
+        city_arr_id: [],//工作区域 
+        address_arr_id: [],//详细地址
+        from_time: "",//有效期开始时间
+        to_time: "",//有效期结束时间
+        long_time: 0,//是否为长期 //长期1：长期 0：非长期
+        qq: "",//QQ
+        email: "",//电子邮箱
+        other: [],//相关资料
+        remark: "",//提示词
         //企业相关字段
-        fax:"",//传真
-        business_name:"",//企业名称
-        position:"",//负责人职务
-        legal_person_real_name:"",//法人姓名
-        legal_person_mobile:"",//法人手机号
-        legal_person_id_card:"",//法人身份证号
-        sszq:[]//网站选择
+        fax: "",//传真
+        business_name: "",//企业名称
+        position: "",//负责人职务
+        legal_person_real_name: "",//法人姓名
+        legal_person_mobile: "",//法人手机号
+        legal_person_id_card: "",//法人身份证号
+        // sszq:[]//网站选择
       },
-      timeList:[],//时间段
-      otherList:[],//相关资料列表
-      role_idArr:[],//角色id池
+      timeList: [],//时间段
+      otherList: [],//相关资料列表
+      role_idArr: [],//角色id池
       //网站列表
       webSiteList: [],
       //密码验证
@@ -306,10 +273,10 @@ export default {
       passwordType1: 'password',
       passwordType2: 'password',
       //配置from表单验证规则
-      loginRules: { 
+      loginRules: {
 
-      //   站点标识xx
-      websiteTag_arr_id: [{ type:'array',required: true, trigger: 'blur', validator: validateArray }],
+        //   站点标识xx
+        websiteTag_arr_id: [{ type: 'array', required: true, trigger: 'blur', validator: validateArray }],
 
 
 
@@ -346,7 +313,7 @@ export default {
         //14.法人身份证号
         legal_person_id_card: [{ required: true, trigger: 'blur', validator: validateEmpty }],
         //15.有效期
-        timeList:[{ required: true, trigger: 'blur', validator: validateTimeTo }],
+        timeList: [{ required: true, trigger: 'blur', validator: validateTimeTo }],
         //16.网站选择
         sszq: [{ required: true, trigger: 'blur', validator: validateArray }]
       },
@@ -377,17 +344,17 @@ export default {
       });
     },
     //1.2获得角色列表池
-    getRoleList(){
+    getRoleList() {
       let data = {
-        page:1,
-        pageSize:100
+        page: 1,
+        pageSize: 100
       }
-      this.$store.dispatch('userRole/roleList',data).then(res=>{
+      this.$store.dispatch('userRole/roleList', data).then(res => {
         this.role_idArr = res.data.rows.map(item => ({
           value: item.id,
-          label: item.role_name 
+          label: item.role_name
         }));
-      }).catch(error=>{
+      }).catch(error => {
         this.$message({
           type: 'warning',
           message: '网络错误，请重试！'
@@ -395,18 +362,18 @@ export default {
       })
     },
     //1.3更新工作区域
-    update_city_arr_id(value){
+    update_city_arr_id(value) {
       console.log("工作区域ID已更新:", value);
       this.form.city_arr_id = value;
     },
     //1.5更新详细地址
-    update_address_arr_id(value){
+    update_address_arr_id(value) {
       console.log("详细地址ID已更新:", value);
       this.form.address_arr_id = value;
     },
     //1.5重置表单
-    clearData(){
-      
+    clearData() {
+
     },
     //表单收集 end ------------------------------------------------------------>
     //2.提交表单 start ------------------------------------------------------------>
@@ -415,13 +382,14 @@ export default {
       console.log(file, fileList);
     },
     handlePreview(file) {
+      console.log(aaa);
       console.log(file);
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
+      return this.$confirm(`确定移除 ${file.name}？`);
     },
     //获取token
     getTokenFromCookie() {
@@ -449,24 +417,24 @@ export default {
       console.log(this.form.other);
     },
     //提交表单
-    addData(){
-      this.form.sszq=this.form.sszq[0]
-      
+    addData() {
+      this.form.sszq = this.form.sszq[0]
+
       console.log(this.timeList)
       //1.格式化时间戳
       this.form.birthday = formatLocalDate(this.form.birthday);
-      if(this.form.long_time==0){
-      this.form.from_time = formatLocalDate(this.timeList[0]);
-      this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
-      // this.form.from_time = "";
-      // this.form.to_time = "";
-      delete this.form.from_time;
-      delete this.form.to_time;
+      if (this.form.long_time == 0) {
+        this.form.from_time = formatLocalDate(this.timeList[0]);
+        this.form.to_time = formatLocalDate(this.timeList[1]);
+      } else {
+        // this.form.from_time = "";
+        // this.form.to_time = "";
+        delete this.form.from_time;
+        delete this.form.to_time;
       }
       //判断用户工作区域是否为全国
-      if(this.isNational==1){
-      this.form.city_arr_id = [0];
+      if (this.isNational == 1) {
+        this.form.city_arr_id = [0];
       }
       console.log(this.form)
 
@@ -474,32 +442,32 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           //3.验证用户是否已经存在
-          this.$store.dispatch('userMember/verifyUserInfo',{user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
+          this.$store.dispatch('userMember/verifyUserInfo', { user_name: this.form.user_name }).then(res => {
+            if (res.code == 0) {
               //如果code为0表示用户不存在，提交表单
-              this.$store.dispatch('userMember/createUser',this.form).then(res=>{
-                if(res.code==200){
+              this.$store.dispatch('userMember/createUser', this.form).then(res => {
+                if (res.code == 200) {
                   console.log(res);
                   this.$message({
                     type: 'success',
                     message: '用户添加成功！'
                   });
                   this.goList();
-                }else{
+                } else {
                   this.$message({
                     type: 'warning',
                     message: res.message
                   });
                 }
               })
-            }else if(res.code==200){
+            } else if (res.code == 200) {
               //如果code==200 表示用户存在，阻止进一步提交
               this.$message({
                 type: 'warning',
                 message: '该账号已被注册，请更换其他账号！'
               });
             }
-          }).catch(error=>{
+          }).catch(error => {
             this.$message({
               type: 'warning',
               message: '网络错误，请重试！'
@@ -511,15 +479,15 @@ export default {
     //提交表单 start ------------------------------------------------------------>
     //3.编辑表单 start ------------------------------------------------------------>
     //获得网站列表
-    getWebsiteList(){
-      this.$store.dispatch('pool/getWebList',{page:1,pageSize:1000}).then(res=>{
-        if(res.code!=200){
+    getWebsiteList() {
+      this.$store.dispatch('pool/getWebList', { page: 1, pageSize: 1000 }).then(res => {
+        if (res.code != 200) {
           this.$message.error(res.message)
-        }else{
-          for(let item of res.data.rows){
+        } else {
+          for (let item of res.data.rows) {
             let data = {
-              value:item.id,
-              label:item.website_name
+              value: item.id,
+              label: item.website_name
             }
             this.webSiteList.push(data)
           }
@@ -527,8 +495,8 @@ export default {
       })
     },
     //获得用户信息
-    getUserInfo(){
-      this.$store.dispatch('userMember/getUser',{id:this.editId}).then(res=>{
+    getUserInfo() {
+      this.$store.dispatch('userMember/getUser', { id: this.editId }).then(res => {
         console.log(res);
         //回显数据
         this.form.type_id = res.data.type_id;
@@ -550,7 +518,7 @@ export default {
         this.form.sszq = Number(res.data.sszq);
 
         //还原有效期
-        if(res.data.long_time==0){
+        if (res.data.long_time == 0) {
           this.timeList = [
             res.data.from_time,
             res.data.to_time
@@ -558,7 +526,7 @@ export default {
           this.form.from_time = res.data.from_time;
           this.form.to_time = res.data.to_time;
           this.form.long_time = 0;
-        }else{
+        } else {
           this.form.from_time = "";
           this.form.to_time = "";
           this.form.long_time = 1;
@@ -568,7 +536,7 @@ export default {
         this.form.zip_code = res.data.zip_code;
         this.form.remark = res.data.remark;
         this.form.address_arr_id = res.data.address_arr_id;
-        
+
         // 处理文件列表
         const fileArrayString = res.data.other; // 假设这是一个字符串格式的数组
         const fileArray = JSON.parse(fileArrayString); // 解析为数组
@@ -579,7 +547,7 @@ export default {
           url: url,                // 文件的 URL
           status: 'success'        // 设置状态为 success
         }));
-      }).catch(error=>{
+      }).catch(error => {
         this.$message({
           type: 'warning',
           message: '网络错误，请重试！'
@@ -587,27 +555,28 @@ export default {
       })
     },
     //修改用户
-    editData(){
+    editData() {
       //1.格式化时间戳
-      if(this.form.long_time==0){
+      if (this.form.long_time == 0) {
         this.form.from_time = formatLocalDate(this.timeList[0]);
         this.form.to_time = formatLocalDate(this.timeList[1]);
-      }else{
+      } else {
         this.form.from_time = "";
         this.form.to_time = "";
       }
       this.$refs.form.validate(valid => {
         if (valid) {
           //1.验证用户是否存在
-          this.$store.dispatch('userMember/verifyUserInfo',{id:this.editId,user_name:this.form.user_name}).then(res=>{
-            if(res.code==0){
+          this.$store.dispatch('userMember/verifyUserInfo', { id: this.editId, user_name: this.form.user_name }).then(res => {
+            if (res.code == 0) {
               console.log(this.form);
               this.form.address_arr_id = JSON.parse(this.form.address_arr_id);
               //2.设置修改的用户id
               this.form.id = this.editId;
+              this.form.sszq = this.form.sszq[0]
               //3.提交用户修改
               //如果code为0表示用户不存在，提交表单
-              this.$store.dispatch('userMember/updateUser',this.form).then(res=>{
+              this.$store.dispatch('userMember/updateUser', this.form).then(res => {
                 console.log(res);
                 this.$message({
                   type: 'success',
@@ -615,14 +584,14 @@ export default {
                 });
                 this.goList();
               })
-            }else if(res.code==200){
+            } else if (res.code == 200) {
               //如果code==200 表示用户存在，阻止进一步提交
               this.$message({
                 type: 'warning',
                 message: '该账号已被注册，请更换其他账号！'
               });
             }
-          }).catch(error=>{
+          }).catch(error => {
             this.$message({
               type: 'warning',
               message: '网络错误，请重试！'
@@ -632,11 +601,11 @@ export default {
       })
     },
     //重置密码
-    resetPassword(){
+    resetPassword() {
       let password = Math.random().toString(36).slice(-6); // 随机生成6个字母的组合
 
-      this.$store.dispatch('userMember/resetPassword',{id:this.editId,password:password}).then(res=> {
-        if(res.code==200){
+      this.$store.dispatch('userMember/resetPassword', { id: this.editId, password: password }).then(res => {
+        if (res.code == 200) {
           this.$message({
             type: 'success',
             message: '密码重置为：' + password
@@ -650,50 +619,50 @@ export default {
       })
     },
     //编辑表单 end ------------------------------------------------------------>
-    goList(){
+    goList() {
       this.$router.push({
         path: '/userList',
       });
     },
 
 
-  
-  get_website_tag_arr_fun(){ //得到站点标识所有内容xx
-             
-            this.$store.dispatch('pool/get_website_tag_arr_actions',this.website_tag_params).then(res=> {
-                  console.log("res.data.listres.data.list",res.data.list)
-                  res.data.list.forEach(( per_obj ) => { 
 
-                        let new_per = {
-                              label: per_obj.name,
-                              value: per_obj.id,
-                        }
+    get_website_tag_arr_fun() { //得到站点标识所有内容xx
 
-                        this.options_arr.push( new_per )
-                  
-                  })
-                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
-                  // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
-            })
+      this.$store.dispatch('pool/get_website_tag_arr_actions', this.website_tag_params).then(res => {
+        console.log("res.data.listres.data.list", res.data.list)
+        res.data.list.forEach((per_obj) => {
 
-     },
+          let new_per = {
+            label: per_obj.name,
+            value: per_obj.id,
+          }
+
+          this.options_arr.push(new_per)
+
+        })
+        // console.log("get_website_tag_arr_funget_website_tag_arr_fun")
+        // console.log("get_website_tag_arr_funget_website_tag_arr_fun",this.options_arr)
+      })
+
+    },
 
 
 
   },
 
-  mounted(){
+  mounted() {
 
 
-      this.get_website_tag_arr_fun()//得到站点标识所有内容xx
+    this.get_website_tag_arr_fun()//得到站点标识所有内容xx
 
     this.getRoleList();
     //判断是新建还是回显
-    if(this.$route.query.id!=undefined){
+    if (this.$route.query.id != undefined) {
       this.editId = this.$route.query.id;
       console.log("编辑用户！")
       this.getUserInfo();
-    }else{
+    } else {
       console.log("添加用户！")
     }
     //设置token
@@ -705,42 +674,54 @@ export default {
 </script>
 
 <style scoped lang="less">
-  .PasswordBox {
+.PasswordBox {
+  display: flex;
+  align-items: center;
+
+  .el-form-item {
+    flex: 1;
+  }
+
+  .PasswordTitle {
+    width: 120px;
+    text-align: right;
+    margin-right: 10px;
+    margin-bottom: 22px;
+  }
+
+  .PasswordBody {
+    flex: 1;
     display: flex;
     align-items: center;
-    .el-form-item {
-      flex: 1;
-    }
-    .PasswordTitle {
-      width:120px;
-      text-align: right;
-      margin-right: 10px;
-      margin-bottom:22px;
-    }
-    .PasswordBody {
-      flex: 1;
-      display: flex;
-      align-items: center;
-    }
-    .show-pwd {
-      margin-left: 10px;
-    }
   }
-  .longTimeCheckbox {
+
+  .show-pwd {
     margin-left: 10px;
   }
-  //执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
-  ::v-deep .custom-form-item > .el-form-item__label {
-    line-height: 140px !important;
-  }
-  ::v-deep .custom-textarea .el-textarea__inner {
-    resize: none; /* 禁止用户拖拽调整大小 */
-  }
-  ::v-deep .custom-align-right .el-form-item__label {
-    text-align: right; /* 设置标签文字右对齐 */
-  }
-  ::v-deep .el-select {
-    width: 100%; /* 禁止用户拖拽调整大小 */
-  }
-  //执行v-deep穿透scope选择器 end------------------------------------------------------------>*/
-</style>
+}
+
+.longTimeCheckbox {
+  margin-left: 10px;
+}
+
+//执行v-deep穿透scope选择器 start------------------------------------------------------------>*/
+::v-deep .custom-form-item>.el-form-item__label {
+  line-height: 140px !important;
+}
+
+::v-deep .custom-textarea .el-textarea__inner {
+  resize: none;
+  /* 禁止用户拖拽调整大小 */
+}
+
+::v-deep .custom-align-right .el-form-item__label {
+  text-align: right;
+  /* 设置标签文字右对齐 */
+}
+
+::v-deep .el-select {
+  width: 100%;
+  /* 禁止用户拖拽调整大小 */
+}
+
+//执行v-deep穿透scope选择器 end------------------------------------------------------------>*/</style>

src/views/role/components/userInvestigate.vue

@@ -291,7 +291,7 @@ export default {
 
       formLabelWidth:"120px",
       editId:"",
-      uploadFileUrl:URL.testUrl+"/public/uploadFile",//获得上传地址
+      uploadFileUrl:URL.baseUrl+"/public/uploadFile",//获得上传地址
       headers: {},