bug修复

zhouwenxuan

2023-12-12 71cc4a7c66a9caa8f856edc55f16564fe2972a0a

bug修复

 src/components/Tinymce/Tinymce.vue

@@ -46,7 +46,7 @@
        },
        toolbar: {
            type: [String, Array],
            default: "undo redo |  formatselect  | upfile image  bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists  insertfile  table | removeformat fullscreen  "
            default: " styleselect fontsizeselect | undo redo |  upfile image  bold italic | fontselect |alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists  insertfile  table | removeformat fullscreen  "
        }
    },
    data() {
@@ -56,6 +56,7 @@
                language_url: "/tinymce/langs/zh_CN.js",
                language: "zh_CN",
                skin_url: "/tinymce/skins/ui/oxide", // skin路径
                content_css: '/tinymce/skins/content/default/content.css',
                height: 500, // 编辑器高度
                branding: false, // 是否禁用“Powered by TinyMCE”
                menubar: true, // 顶部菜单栏显示
@@ -64,10 +65,6 @@
                relative_urls: false,
                remove_script_host: true,
                statusbar: false,
                // images_upload_handler: (blobInfo, success, failure) => {
                //     console.log(blobInfo);
                //     this.handleImgUpload(blobInfo, success, failure);
                // },
                images_upload_handler: async (blobInfo, success, failure) => {
                    const formData = new FormData(); // 和后端协商后用formData格式进行传参
                    formData.append("file", blobInfo.blob());// 传递的参数
@@ -96,7 +93,7 @@
                }
            },
            myValue: this.value,
            // content_css: '/tinymce/skins/content/default/content.css',


        };
    },
@@ -112,6 +109,7 @@
        },
        // 可以添加一些自己的自定义事件，如清空内容
        clear() {

            this.myValue = "";
        },
    },

 src/layout/components/Register/index.vue

@@ -391,7 +391,18 @@
    if(!verifyPhone(value)){
      callback(new Error('手机号格式有误'))
    }else{
      checkPhone({phone:value}).then((res)=>{
        let param = {}
        if(state.title=='新增/注册') {
            param = {
                phone:value
            }
        }else if(state.title=='编辑'){
            param = {
                phone:value,
                id: state.registerForm.id
            }
        }
      checkPhone(param).then((res)=>{
        if(res.data == false){
          callback(new Error('该手机号已被绑定用户，请更换其他手机号'))
        }else{
@@ -411,7 +422,18 @@
    if(!verifyUsername(value)){
      callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
    }else{
      checkUserName({username:value}).then((res)=>{
        let param = {}
        if(state.title=='新增/注册') {
            param = {
                username:value
            }
        }else if(state.title=='编辑'){
            param = {
                username:value,
                id: state.registerForm.id
            }
        }
      checkUserName(param).then((res)=>{
        if(res.data == false){
          callback(new Error('用户名已被占用，请更换其他用户名'))
        }else{
@@ -482,6 +504,7 @@
const isAbleEdit = ref(false);
const openDialog=(type, value)=>{
  state.title = type === 'add' ? '新增/注册' : type ==='edit' ? '编辑' : '查看' ;
    getArea()
  if(type === 'edit' || type == 'view') {
    state.registerForm.id = value.id
    state.registerForm.username = value.username
@@ -502,6 +525,8 @@
            state.registerForm.agency[i] = info[i]
          }
        }
        getArea()

        state.registerForm.agency.business = info.business.split(',').map(Number)
          if(state.registerForm.agency.attribute === 0){
              state.registerForm.agency.area = [info.city,info.district].filter(item => { return item && item.trim() })
@@ -618,10 +643,11 @@
    if (valid) {
      loading.value = true;
      if(state.title == '新增/注册'){
        const {confirmPassword, ...data} = state.registerForm
        const {confirmPassword,id, ...data} = state.registerForm
        data.password = Base64.encode(data.password)
        data.agency.business = data.agency.business.join(',')
        delete data.agency.area
          delete data.agency.id
        register(data).then(res => {
          if(res.code == 200){
            const username = state.registerForm.username
@@ -630,7 +656,9 @@
              type: "success",
            }).then(() => {
                emit("getList")

              dialogVisible.value = false
                state.registerForm.agency.attribute = 0
              proxy.$refs.registerRef.resetFields()
              proxy.$refs.registerRef.clearValidate()
              state.fileList = []
@@ -661,6 +689,7 @@
                  })
                  emit("getList")
                  dialogVisible.value = false
                  state.registerForm.agency.attribute = 0
                  proxy.$refs.registerRef.resetFields()
                  proxy.$refs.registerRef.clearValidate()
                  state.fileList = []
@@ -681,6 +710,7 @@
}

const closeDialog = ()=>{
    state.registerForm.agency.attribute = 0
  proxy.$refs.registerRef.resetFields()
  proxy.$refs.registerRef.clearValidate()
  state.fileList = []

 src/router/index.js

@@ -73,21 +73,21 @@
    component: () => import('@/views/safetyReview/baseSet/area/index.vue'),
    hidden: true
  },
  // {
  //   path: '',
  //   component: Layout,
  //   redirect: '/index',
  //   children: [
  //     {
  //       path: '/index',
  //       component: () => import('@/views/index'),
  //       name: 'Index',
  //       meta: { title: '首页',icon: 'form', affix: true }
  //     }
  //   ]
  // },
  {
    path: '',
    component: Layout,
    redirect: '/index',
    children: [
      {
        path: '/index',
        component: () => import('@/views/index'),
        name: 'Index',
        meta: { title: '首页',icon: 'form', affix: true }
      }
    ]
  },
  {
    path: '/institution',
    component: Layout,
    redirect: '/institution',
    children: [

 src/views/components/home.vue

@@ -140,7 +140,7 @@
const getPubList = async ()=>{
  const res = await getPublish({title: '', content: '', pageNum: 1, pageSize: 5})
  if(res.code == 200){
    state.pubList = res.data.list.filter(item => item.publication == 0)
    state.pubList = res.data.list
  }else{
    ElMessage.warning(res.message)
  }

 src/views/components/laws.vue

@@ -23,9 +23,10 @@
      </div>
      <div class="pag-container" v-if="state.total&&state.total>0">
        <el-pagination
            :page-sizes="[10,15,20,25]"
            :page-sizes="[10,15,20]"
            layout="total, sizes, prev, pager, next, jumper"
            :total="state.total"
            :current-page="state.querys.pageNum"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
        />
@@ -80,6 +81,7 @@
}

const handleSizeChange = (val) => {
    state.querys.pageNum = 1;
  state.querys.pageSize = val
  getData()
}
@@ -88,6 +90,7 @@
  getData()
}
const search = () => {
    state.querys.pageNum = 1;
    getData()
}
const reset = () => {

 src/views/components/notice.vue

@@ -14,9 +14,10 @@
      </div>
      <div class="pag-container" v-if="state.total&&state.total>0">
        <el-pagination
            :page-sizes="[10,15,20,25]"
            :page-sizes="[10,15,20]"
            layout="total, sizes, prev, pager, next, jumper"
            :total="state.total"
            :current-page="state.querys.pageNum"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
        />
@@ -60,6 +61,7 @@
}, { immediate: true });

const handleSizeChange = (val) => {
    state.querys.pageNum = 1
  state.querys.pageSize = val
  getData()
}

 src/views/components/publish.vue

@@ -19,8 +19,8 @@
            </el-select>
          </el-form-item>
        </el-form>
        <el-button type="primary" :icon="Search" class="searchBtn">搜索</el-button>
        <el-button type="primary" :icon="Refresh" class="resetBtn">重置</el-button>
        <el-button type="primary" :icon="Search" class="searchBtn" @click="search">搜索</el-button>
        <el-button type="primary" :icon="Refresh" class="resetBtn" @click="reset">重置</el-button>
      </div>
      <div class="list">
        <div v-for="item in state.dataList" @click="openDetails('机构公示',item.id)">
@@ -35,7 +35,7 @@
      </div>
      <div class="pag-container" v-if="state.total&&state.total>0">
        <el-pagination
            :page-sizes="[10,15,20,25]"
            :page-sizes="[10,15,20]"
            layout="total, sizes, prev, pager, next, jumper"
            :total="state.total"
            @size-change="handleSizeChange"
@@ -84,7 +84,7 @@
const getData = async ()=>{
  const res = await getPublish(state.querys)
  if(res.code == 200){
    state.dataList = res.data.list.filter(item => item.publication == 0)
    state.dataList = res.data.list
    state.total = res.data.total
  }else{
    ElMessage.warning(res.message)
@@ -92,6 +92,7 @@
}

const handleSizeChange = (val) => {
    state.querys.pageNum = 1;
  state.querys.pageSize = val
  getData()
}
@@ -99,6 +100,20 @@
  state.querys.pageNum = val
  getData()
}
const search = () => {
    state.querys.pageNum = 1;
    getData()
}
const reset = () => {
    state.querys = {
        name: '',
        area: '',
        bussiness: '',
        pageNum: 1,
        pageSize: 10
    }
    getData()
}

const openDetails = (type,id)=>{
  emit('openDetails',type,id)

 src/views/error/404.vue

@@ -17,7 +17,7 @@
        <div class="bullshit__info">
          对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
        </div>
        <router-link to="/index" class="bullshit__return-home">
        <router-link to="/homePage" class="bullshit__return-home">
          返回首页
        </router-link>
      </div>

 src/views/safetyReview/institution/institution.vue

@@ -79,7 +79,9 @@
        dataList.value = res.data.list.map(item => {
            return {
                ...item,
                publicMsg: item.publication ===0 ? '取消公示' : "公示"
                publicMsg: item.publication ===0 ? '取消公示' : "公示",
                issueDate: item.issueDate.substring(0,10),
                validDate: item.validDate.substring(0,10)
            }
        })
        total.value = res.data.total
@@ -89,6 +91,7 @@
    loading.value = false;
}
const handleSizeChange = (val) => {
    data.queryParams.pageNum = 1
    data.queryParams.pageSize = val
    getList()
}

 src/views/safetyReview/law/components/lawDialog.vue

@@ -181,11 +181,13 @@
            return;
        }
        if(title.value === '新增'){
            state.form.pubDate = state.form.pubDate.concat(" 00:00:00")
            state.form.pubDate = state.form.pubDate.substring(0,19)
            const param = {
                content: state.form.content,
                lawType: state.form.lawType,
                pubAgency: state.form.pubAgency,
                pubDate: state.form.pubDate.concat(" 00:00:00"),
                pubDate: state.form.pubDate,
                subTitle: state.form.subTitle,
                title: state.form.title
            }
@@ -200,11 +202,13 @@
            }
            emit("getList")
            reset();
            showEditor.value=false
            myEditor.value.clear();
            lawRef.value.clearValidate();
            dialogVisible.value = false;
        }else if(title.value === '编辑') {
            state.form.pubDate = state.form.pubDate.concat(" 00:00:00")
            state.form.pubDate = state.form.pubDate.substring(0,19)
            const res = await editLaw(state.form)
            if(res.code === 200){
                ElMessage({
@@ -216,6 +220,7 @@
            }
            emit("getList")
            reset();
            showEditor.value=false
            myEditor.value.clear();
            lawRef.value.clearValidate();
            dialogVisible.value = false;

 src/views/safetyReview/law/law.vue

@@ -79,6 +79,7 @@
    loading.value = false;
}
const handleSizeChange = (val) => {
    data.queryParams.pageNum = 1
    data.queryParams.pageSize = val
    getList()
}

 src/views/safetyReview/notice/components/noticeDialog.vue

@@ -67,6 +67,7 @@
})

const openDialog = async (type, value) => {
    dialogVisible.value = true;
    // state.noticeForm.noticeContent = ""
    isReview.value = false;
    showEditor.value = false
@@ -96,7 +97,7 @@
    if(type === 'add'){
        reset()
    }
    dialogVisible.value = true;


}
const getEditorData = (val) =>{
@@ -168,6 +169,7 @@
            }
            emit("getList")
            reset();
            showEditor.value=false
            myEditor.value.clear();
            noticeRef.value.clearValidate();
            dialogVisible.value = false;
@@ -188,6 +190,7 @@
            }
            emit("getList")
            reset();
            showEditor.value=false
            myEditor.value.clear();
            noticeRef.value.clearValidate();
            dialogVisible.value = false;

 src/views/safetyReview/userManage/expertUsers/components/expertDialog.vue

@@ -190,7 +190,18 @@
        if(!verifyPhone(value)){
            callback(new Error('手机号格式有误'))
        }else{
            checkPhone({phone:value,id: state.form.id}).then((res)=>{
            let param = {}
            if(state.title=='新增') {
                param = {
                    phone:value
                }
            }else if(state.title=='编辑'){
                param = {
                    phone:value,
                    id: state.form.id
                }
            }
            checkPhone(param).then((res)=>{
                if(res.data == false){
                    callback(new Error('该手机号已被绑定用户，请更换其他手机号'))
                }else{
@@ -208,7 +219,18 @@
        if(!verifyUsername(value)){
            callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
        }else{
            checkUserName({username:value,id: state.form.id}).then((res)=>{
            let param = {}
            if(state.title=='新增') {
                param = {
                    username:value
                }
            }else if(state.title=='编辑'){
                param = {
                    username:value,
                    id: state.form.id
                }
            }
            checkUserName(param).then((res)=>{
                if(res.data == false){
                    callback(new Error('用户名已被占用，请更换其他用户名'))
                }else{

 src/views/safetyReview/userManage/superviseUsers/components/superviseDialog.vue

@@ -78,7 +78,18 @@
    if(!verifyPhone(value)){
      callback(new Error('手机号格式有误'))
    }else{
      checkPhone({phone:value,id: state.form.id}).then((res)=>{
        let param = {}
        if(state.title=='新增') {
            param = {
                phone:value
            }
        }else if(state.title=='编辑'){
            param = {
                phone:value,
                id: state.form.id
            }
        }
      checkPhone(param).then((res)=>{
        if(res.data == false){
          callback(new Error('该手机号已被绑定用户，请更换其他手机号'))
        }else{
@@ -96,7 +107,18 @@
    if(!verifyUsername(value)){
      callback(new Error('用户名须使用字母+数字，长度在5-16之间'))
    }else{
      checkUserName({username:value,id: state.form.id}).then((res)=>{
        let param = {}
        if(state.title=='新增') {
            param = {
                username:value
            }
        }else if(state.title=='编辑'){
            param = {
                username:value,
                id: state.form.id
            }
        }
      checkUserName(param).then((res)=>{
        if(res.data == false){
          callback(new Error('用户名已被占用，请更换其他用户名'))
        }else{
@@ -189,6 +211,7 @@
          if(res.code == 200){
            ElMessage.success(res.message)
            emit('getList')
              state.form.userType = 0
            superRef.value.clearValidate();
            superRef.value.resetFields();
            dialogVisible.value = false;
@@ -202,6 +225,7 @@
          if(res.code == 200){
            ElMessage.success(res.message)
            emit('getList')
              state.form.userType = 0
            superRef.value.clearValidate();
            superRef.value.resetFields();
            dialogVisible.value = false;
@@ -227,6 +251,7 @@
}

const handleClose = () => {
    state.form.userType = 0
    superRef.value.clearValidate();
    superRef.value.resetFields()
    dialogVisible.value = false;