修正代码

src/api/accountSettings.js

@@ -0,0 +1,3 @@
export const url = '/ajax/sys/manager'
export const modifyUrl = '/ajax/sys/manager' // 修改个人信息
export const passUrl = '/ajax/sys/manager/changepasswd' //  重置密码

src/api/login.js

@@ -1,96 +1,3 @@
import request from '@/utils/request'
export function login(account, pw, vc) {
  return request({
    url: '/ajax/sys/login',
    method: 'post',
    data: {
      account,
      pw
    }
  })
}
export function getInfo() {
  return request({
    url: '/ajax/sys/user',
    method: 'get'
  })
}
export function logout() {
  return request({
    url: '/ajax/sys/logout',
    method: 'get'
  })
}
export function isReg(params) {
  return request({
    url: '/ajax/sys/check',
    method: 'get',
    params
  })
}
// 找回密码
export function getResetMsgPhone(params) {
  return request({
    url: '/ajax/sys/resetPwMobile',
    method: 'get',
    params
  })
}
export function resetPwdByTel(pw, vc) {
  return request({
    url: '/ajax/sys/resetPasswordWithMobilePhone',
    method: 'post',
    data: {
      pw,
      vc
    }
  })
}
// 修改密码
export function changePw(params) {
  return request({
    url: '/ajax/sys/changePw',
    method: 'post',
    data: params
  })
}
// 获取修改个人信息
export function getMyself(params) {
  return request({
    url: '/ajax/sys/qo',
    method: 'get',
    params
  })
}
export function updateMyself(params) {
  return request({
    url: '/ajax/sys/update',
    method: 'post',
    data: params
  })
}
// 获取公告信息
export function getNotice() {
  return request({
    url: '/ajax/sys/notice',
    method: 'get'
  })
}
export function updateNotice(params) {
  return request({
    url: '/ajax/sys/notice',
    method: 'post',
    data: params
  })
}
export const loginUrl = '/ajax/sys/login'
export const getInfoUrl = '/ajax/sys/manager'
export const logoutUrl = '/ajax/sys/logout'

src/api/loginnew.js

@@ -1,3 +0,0 @@
export const loginUrl = '/ajax/sys/login'
export const getInfoUrl = '/ajax/sys/manager'
export const logoutUrl = '/ajax/sys/logout'

src/api/modifyAccountInformation.js

@@ -1,2 +0,0 @@
export const url = '/ajax/sys/manager'
export const modifyUrl = '/ajax/sys/manager'

src/api/modifyPassword.js

@@ -1 +0,0 @@
export default '/ajax/sys/manager/changepasswd' //  重置密码

src/api/pictureVc.js

@@ -1,5 +0,0 @@
import { comUrl } from '@/utils/index'
export function getPictureVC(flag) {
  return comUrl + '/ajax/PictureVC?t=' + new Date().getTime() + '&flag=' + flag + '&__timeout=' + 3 * 1000 * 60
}

src/components/searchBar/index.vue

@@ -30,7 +30,7 @@
    },
    methods: {
      change(value) {
        this.$emit(this.relevant.fun, value)
        this.$emit('eventName', value)
      },
      remoteMethod(query) {
        if (query !== '') {

src/permission.js

@@ -23,6 +23,11 @@ router.beforeEach((to, from, next) => {
              router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
              next({ ...to, replace: true })
            })
          } else {
            store.dispatch('FedLogOut').then(() => {
              Message.error('登录状态失效，请重新登录')
              router.push({ path: '/' })
            })
          }
        }).catch((err) => {
          store.dispatch('FedLogOut').then(() => {

src/store/modules/user.js

@@ -1,4 +1,4 @@
import { loginUrl, logoutUrl, getInfoUrl } from '@/api/loginnew'
import { loginUrl, logoutUrl, getInfoUrl } from '@/api/login'
import http from '@/utils/request'
import Cookies from 'js-cookie'

src/utils/index.js

@@ -59,3 +59,9 @@ export function arrToStr(arr) {
    return strs
  }
}
export const type = {
  '1': '平台新闻',
  '2': '采访专栏',
  '3': '政策法规',
  '4': '通知公告'
}

src/utils/queryName.js

@@ -0,0 +1,33 @@
import request from './request'
import { queryUserOne } from '@/api/sysSetting'
const cacheModule = {
  cache: {},
  temporaryStorage: {},
  getUserInfo(id) {
    const funArray = this.temporaryStorage[id]
    request.get(queryUserOne, { id }, response => {
      delete this.temporaryStorage[id]
      if (response.success && response.data) {
        this.cache[id] = response.data
        for (const fun of funArray.values()) {
          fun(this.cache[id])
        }
      }
    })
  },
  Judge(id, callback) {
    if (this.cache[id]) {
      callback(this.cache[id])
    } else {
      if (this.temporaryStorage[id]) {
        this.temporaryStorage[id].push(callback)
      } else {
        this.temporaryStorage[id] = [callback]
        this.getUserInfo(id)
      }
    }
  }
}
export default cacheModule

src/views/accountSettings/modifyAccountInformation.vue

@@ -60,7 +60,7 @@
</template>
<script>
  import { url, modifyUrl } from '@/api/modifyAccountInformation'
  import { url, modifyUrl } from '@/api/accountSettings'
  export default {
    data() {
      var checkPhone = (rule, value, callback) => {
@@ -85,10 +85,10 @@
        },
        rules2: {
          account: [
            { message: '请填写账号', required: true }
            { message: '请填写账号', required: true, trigger: 'blur' }
          ],
          name: [
            { message: '请填写用户名', required: true }
            { message: '请填写用户名', required: true, trigger: 'blur' }
          ],
          phone: [
            { validator: checkPhone, trigger: 'blur', required: true }
@@ -97,13 +97,13 @@
            { type: 'email', message: '联系邮箱格式有误，请检查后重新填写', trigger: 'blur' }
          ],
          job: [
            { message: '请填写职位', required: true }
            { message: '请填写职位', required: true, trigger: 'blur' }
          ],
          dep: [
            { message: '请填写所在部门', required: true }
            { message: '请填写所在部门', required: true, trigger: 'blur' }
          ],
          comp: [
            { message: '请填写所在机构', required: true }
            { message: '请填写所在机构', required: true, trigger: 'blur' }
          ]
        }
      }

src/views/accountSettings/modifyPassword.vue

@@ -24,7 +24,7 @@
</template>
<script>
  import url from '@/api/modifyPassword'
  import { passUrl } from '@/api/accountSettings'
  export default {
    data() {
      var validatePass = (rule, value, callback) => {
@@ -68,7 +68,7 @@
      submitForm(formName) {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            this.$http.post(url, { npw: this.ruleForm2.pass }, (response) => {
            this.$http.post(passUrl, { npw: this.ruleForm2.pass }, (response) => {
              if (response.success) {
                this.$confirm('密码已修改，快去登录吧！', '修改密码', {
                  confirmButtonText: '确定',

src/views/contentPub/draftList.vue

@@ -14,7 +14,7 @@
        </el-select>
      </div>
      <complex-table :tableData="tableData" :tableItem="tableItem" :operatingList='operatingList' :total='total'
        v-on:sortSingleExpert="sortSingleExpert" v-on:jump="jump" v-on:current="current" v-on:edit="edit"></complex-table>
        v-on:deleteFun="deleteFun" v-on:jump="jump" v-on:current="current" v-on:edit="edit"></complex-table>
    </div>
  </div>
</template>
@@ -22,13 +22,12 @@
<script>
  import complexTable from '@/components/complexTable'
  import { pageInquireUrl, deleteUrl, inquireContentUrl } from '@/api/content'
  import { queryUserOne } from '@/api/sysSetting'
  import { parseTime } from '@/utils/index'
  import { parseTime, type } from '@/utils/index'
  import ret from '@/utils/comTable'
  import cacheModule from '@/utils/queryName'
  export default {
    data() {
      return {
        searchText: '',
        selectMode: '',
        info: {
          title: '',
@@ -37,13 +36,6 @@
          pageSize: 20,
          pageNo: 1
        },
        type: {
          '1': '平台新闻',
          '2': '采访专栏',
          '3': '政策法规',
          '4': '通知公告'
        },
        formData: {},
        operatingList: [ // 在子组件中遍历事件
          {
            text: '编辑',
@@ -52,11 +44,10 @@
          },
          {
            text: '删除',
            event: 'sortSingleExpert',
            event: 'deleteFun',
            icon: 'danger'
          }
        ],
        dataList: [], //  拉去专家数据存到dataList这个数组里面
        tableData: [], //  每一页的存储的数据
        total: 0, //  页码总数
        tableItem: [ // 表头信息
@@ -75,8 +66,8 @@
            width: '160'
          },
          {
            prop: 'createTime',
            tit: '发布时间',
            prop: 'modifyTime',
            tit: '最后修改时间',
            width: '160'
          },
          {
@@ -87,7 +78,7 @@
      }
    },
    created() {
      this.publishList()
      this.draftList()
    },
    components: {
      complexTable //  表子页面
@@ -95,40 +86,38 @@
    methods: {
      change(value) {
        this.info.catalog = value
        this.publishList()
        this.draftList()
      },
      publishList() {
        this.$http.get(pageInquireUrl, this.info, (response) => { //  拉去专家信息列表，总数据存在dataList，tableData存每一页的信息
      draftList() {
        this.$http.get(pageInquireUrl, this.info, (response) => { //  拉去草稿信息列表，tableData存每一页的信息
          if (response.success && response.data) {
            const epData = response.data.data
            const res = response.data
            const epData = res.data
            for (let i = 0; i < epData.length; i++) {
              epData[i].createTime = parseTime(epData[i].createTime).substr(0, 16)
              epData[i].catalog = this.type[epData[i].catalog]
              this.$http.get(queryUserOne, { id: epData[i].modifier }, (response) => {
                if (response.success) {
                  epData[i].modifier = response.data.name
                }
              epData[i].modifyTime = parseTime(epData[i].modifyTime).substr(0, 16)
              epData[i].catalog = type[epData[i].catalog]
              cacheModule.Judge(epData[i].modifier, info => {
                epData[i].modifier = info.name
              })
            }
            this.dataList = epData
            this.total = Math.ceil(epData / 20)
            if (this.total > 1) {
              this.tableData = this.dataList.slice(0, 20)
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = this.dataList
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            }
          } else {
            this.$sort.total = 0
            this.total = 0
            this.tableData = []
          }
        })
      },
      edit(obj) {
      edit(obj) { //  编辑草稿信息
        this.$router.push({ path: 'content/publish', query: { id: obj.id }})
      },
      sortSingleExpert(obj) { //  点击单个特约专家信息
      deleteFun(obj) { //  点击删除单个草稿内容信息
        this.$confirm('确定删除该条内容？', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -138,7 +127,7 @@
          this.$http.get(deleteUrl, { id: obj.id }, response => {
            if (response.success) {
              if (response.data) {
                this.publishList()
                this.draftList()
                this.$message({
                  message: '删除成功',
                  type: 'success'
@@ -162,16 +151,11 @@
        })
      },
      jump(id) { // 点击超练级跳转
        console.log(id)
        this.$router.push({ path: 'content/publish', query: { id }})
      },
      current(val) { // 点击页码
        if (val < this.total) {
          this.tableData = this.dataList.slice(20 * (val - 1), 20 * val)
        } else {
          const array = this.dataList.slice(20 * val)
          ret.gapFilling(array)
          this.tableData = array
        }
        this.info.pageNo = val
        this.draftList()
      }
    }
  }

src/views/contentPub/pubList.vue

@@ -22,7 +22,7 @@
        </el-select>
      </div>
      <complex-table :tableData="tableData" :tableItem="tableItem" :operatingList='operatingList' :total='total'
        v-on:sortSingleExpert="sortSingleExpert" v-on:jump="jump" v-on:current="current"></complex-table>
        v-on:deleteFun="deleteFun" v-on:jump="jump" v-on:current="current"></complex-table>
    </div>
  </div>
</template>
@@ -30,13 +30,13 @@
<script>
  import complexTable from '@/components/complexTable'
  import { pageInquireUrl, deleteUrl, inquireContentUrl } from '@/api/content'
  import { queryUserOne } from '@/api/sysSetting'
  import { parseTime } from '@/utils/index'
  import { parseTime, type } from '@/utils/index'
  import ret from '@/utils/comTable'
  import cacheModule from '@/utils/queryName'
  export default {
    data() {
      return {
        searchText: '',
        searchText: '', //  搜索文字
        selectMode: '',
        info: {
          title: '',
@@ -45,21 +45,13 @@
          pageSize: 20,
          pageNo: 1
        },
        type: {
          '1': '平台新闻',
          '2': '采访专栏',
          '3': '政策法规',
          '4': '通知公告'
        },
        formData: {},
        operatingList: [ // 在子组件中遍历事件
          {
            text: '删除',
            event: 'sortSingleExpert',
            event: 'deleteFun',
            icon: 'danger'
          }
        ],
        dataList: [], //  拉去专家数据存到dataList这个数组里面
        tableData: [], //  每一页的存储的数据
        total: 0, //  页码总数
        tableItem: [ // 表头信息
@@ -102,15 +94,15 @@
    },
    methods: {
      change(value) {
        console.log(value)
        this.info.catalog = value
        this.searchText = this.info.title
        this.publishList()
      },
      search() {
        this.info.title = this.searchText
        this.publishList()
      },
      publishList() {
      publishList() { //  内容发布中的列表
        const arr = [
          {
            num: 1
@@ -125,36 +117,33 @@
            num: 4
          }
        ]
        this.$http.get(pageInquireUrl, this.info, (response) => { //  拉去专家信息列表，总数据存在dataList，tableData存每一页的信息
        this.$http.get(pageInquireUrl, this.info, (response) => { //  拉去发布内容信息列表，tableData存每一页的信息
          if (response.success && response.data) {
            const epData = response.data.data
            console.log(epData)
            const res = response.data
            const epData = res.data
            for (let i = 0; i < epData.length; i++) {
              epData[i].createTime = parseTime(epData[i].createTime).substr(0, 16)
              epData[i].catalog = this.type[epData[i].catalog]
              epData[i].catalog = type[epData[i].catalog]
              Object.assign(epData[i], arr[i])
              this.$http.get(queryUserOne, { id: epData[i].creator }, (response) => {
                if (response.success) {
                  epData[i].creator = response.data.name
                }
              cacheModule.Judge(epData[i].creator, info => {
                epData[i].creator = info.name
              })
            }
            this.dataList = epData
            this.total = Math.ceil(epData / 20)
            if (this.total > 1) {
              this.tableData = this.dataList.slice(0, 20)
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = this.dataList
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            }
          } else {
            this.$sort.total = 0
            this.total = 0
            this.tableData = []
          }
        })
      },
      sortSingleExpert(obj) { //  点击单个特约专家信息
      deleteFun(obj) { // 点击删除单个内容
        this.$confirm('确定删除该条内容？', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -192,13 +181,8 @@
        console.log(id)
      },
      current(val) { // 点击页码
        if (val < this.total) {
          this.tableData = this.dataList.slice(20 * (val - 1), 20 * val)
        } else {
          const array = this.dataList.slice(20 * val)
          ret.gapFilling(array)
          this.tableData = array
        }
        this.info.pageNo = val
        this.publishList()
      }
    }
  }

src/views/contentPub/publish.vue

@@ -20,9 +20,9 @@
            <el-form-item label="作者/来源" prop="source">
              <el-input v-model.number="ruleForm2.source" placeholder="请填写作者/来源" maxlength=20></el-input>
            </el-form-item>
            <searchTemplate :relevant=relevantExperts v-on:expert="expert"></searchTemplate>
            <searchTemplate :relevant=relevantInstitutions v-on:institution="institution"></searchTemplate>
            <searchTemplate :relevant=relevantCompanies v-on:company="company"></searchTemplate>
            <searchTemplate :relevant=relevantExperts v-on:eventName="expert"></searchTemplate>
            <searchTemplate :relevant=relevantInstitutions v-on:eventName="institution"></searchTemplate>
            <searchTemplate :relevant=relevantCompanies v-on:eventName="company"></searchTemplate>
          </el-col>
          <el-col :span="12">
            <el-form-item style="text-align:right" prop="imgUrl">
@@ -36,6 +36,9 @@
        <el-form-item class="traftButton">
          <el-button type="info" @click="draft">保存草稿</el-button>
        </el-form-item>
        <el-form-item class="traftButton" v-if="$route.query.id">
          最后修改时间：{{modifyTime}}
        </el-form-item>
        <el-form-item class="publishButton">
          <el-button type="primary" @click="submitForm('ruleForm2')">发布</el-button>
          <el-button type="danger" @click="deleteContent" v-if="$route.query.id">删除</el-button>
@@ -49,6 +52,7 @@
  import searchTemplate from '@/components/searchBar'
  import uploadFile from '@/components/uploadFile'
  import UE from '@/components/editorUE'
  import { parseTime } from '@/utils/index'
  import { uploadPhotoUrl, publishUrl, draftFirstUrl, draftUrl, draftPublishUrl, deleteUrl, inquireContentUrl } from '@/api/content'
  export default {
    data() {
@@ -77,6 +81,7 @@
        }
      }
      return {
        modifyTime: '',
        draftFlag: true,
        upImgsStr: '',
        id: '',
@@ -89,21 +94,18 @@
        relevantExperts: {
          url: '',
          placeholder: '请选择关联专家',
          fun: 'expert',
          label: '相关专家',
          prop: 'professors'
        },
        relevantInstitutions: {
          url: '',
          placeholder: '请选择关联机构',
          fun: 'institution',
          label: '相关机构',
          prop: 'orgs'
        },
        relevantCompanies: {
          url: '',
          placeholder: '请选择关联企业',
          fun: 'company',
          label: '相关企业',
          prop: 'comps'
        },
@@ -148,6 +150,9 @@
              comps: []
            }
            this.upImgsStr = info.imgUrl
            if (this.id) {
              this.modifyTime = parseTime(info.modifyTime).substr(0, 19)
            }
          }
        })
      }
@@ -175,8 +180,6 @@
          this.$refs.ruleForm2.validateField('title')
        }
        if (value === '1' || value === '2') {
          console.log(value, typeof value)
          console.log(this.rules2)
          this.rules2.imgUrl.push({ message: '请上传封面图片', required: true, trigger: 'blur' })
        } else {
          this.rules2.imgUrl = []
@@ -305,7 +308,6 @@
            }).catch(() => {
            })
          } else {
            console.log('error submit!!')
            return false
          }
        })

src/views/contentPub/recycleBin.vue

@@ -17,7 +17,7 @@
        </el-select>
      </div>
      <complex-table :tableData="tableData" :tableItem="tableItem" :operatingList='operatingList' :total='total'
        v-on:sortSingleExpert="sortSingleExpert" v-on:jump="jump" v-on:current="current" v-on:edit="edit"></complex-table>
        v-on:deleteFun="deleteFun" v-on:jump="jump" v-on:current="current" v-on:restore="restore"></complex-table>
    </div>
  </div>
</template>
@@ -25,39 +25,31 @@
<script>
  import complexTable from '@/components/complexTable'
  import { thoroughDeleteAll, thoroughDeleteSingleUrl, recycleBinInquireUrl, restoreUrl, inquireContentUrl } from '@/api/content'
  import { queryUserOne } from '@/api/sysSetting'
  import { parseTime } from '@/utils/index'
  import { parseTime, type } from '@/utils/index'
  import ret from '@/utils/comTable'
  import cacheModule from '@/utils/queryName'
  export default {
    data() {
      return {
        searchText: '',
        selectMode: '',
        info: {
          catalog: '',
          pageSize: 20,
          pageNo: 1
        },
        type: {
          '1': '平台新闻',
          '2': '采访专栏',
          '3': '政策法规',
          '4': '通知公告'
        },
        formData: {},
        operatingList: [ // 在子组件中遍历事件
          {
            text: '恢复',
            event: 'edit',
            event: 'restore',
            icon: 'primary'
          },
          {
            text: '彻底删除',
            event: 'sortSingleExpert',
            event: 'deleteFun',
            icon: 'danger'
          }
        ],
        dataList: [], //  拉去专家数据存到dataList这个数组里面
        tableData: [], //  每一页的存储的数据
        total: 0, //  页码总数
        tableItem: [ // 表头信息
@@ -96,7 +88,7 @@
      }
    },
    created() {
      this.publishList()
      this.recycleBinList()
    },
    components: {
      complexTable //  表子页面
@@ -104,39 +96,39 @@
    methods: {
      change(value) {
        this.info.catalog = value
        this.publishList()
        this.recycleBinList()
      },
      publishList() {
        this.$http.get(recycleBinInquireUrl, this.info, (response) => { //  拉去专家信息列表，总数据存在dataList，tableData存每一页的信息
      recycleBinList() {
        this.$http.get(recycleBinInquireUrl, this.info, (response) => { //  拉去回收站信息列表，tableData存每一页的信息
          if (response.success && response.data) {
            const epData = response.data.data
            const res = response.data
            const epData = res.data
            for (let i = 0; i < epData.length; i++) {
              epData[i].createTime = parseTime(epData[i].createTime).substr(0, 16)
              epData[i].invalidTime = parseTime(epData[i].invalidTime).substr(0, 16)
              epData[i].catalog = this.type[epData[i].catalog]
              this.$http.get(queryUserOne, { id: epData[i].creator }, (response) => {
                if (response.success) {
                  epData[i].creator = response.data.name
                }
              epData[i].catalog = type[epData[i].catalog]
              cacheModule.Judge(epData[i].creator, info => {
                epData[i].creator = info.name
              })
              cacheModule.Judge(epData[i].invalidOperator, info => {
                epData[i].invalidOperator = info.name
              })
            }
            this.dataList = epData
            this.total = Math.ceil(epData / 20)
            if (this.total > 1) {
              this.tableData = this.dataList.slice(0, 20)
            this.total = res.total
            if (epData.length === 20) {
              this.tableData = epData
            } else {
              const array = this.dataList
              const array = epData
              ret.gapFilling(array)
              this.tableData = array
            }
          } else {
            this.$sort.total = 0
            this.total = 0
            this.tableData = []
          }
        })
      },
      edit(obj) {
        console.log(obj)
      restore(obj) {
        this.$confirm(`确定恢复${obj.title}内容？`, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -146,9 +138,9 @@
          this.$http.get(restoreUrl, { id: obj.id }, response => {
            if (response.success) {
              if (response.data) {
                this.publishList()
                this.recycleBinList()
                this.$message({
                  message: '恢复成功成功',
                  message: '恢复成功',
                  type: 'success'
                })
              } else {
@@ -169,7 +161,7 @@
        }).catch(() => {
        })
      },
      deleteAll() {
      deleteAll() { //  删除全部回收站信息
        this.$confirm('确定全部彻底删除回收站内容？', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -178,7 +170,7 @@
        }).then(() => {
          this.$http.get(thoroughDeleteAll, '', response => {
            if (response.success) {
              this.publishList()
              this.recycleBinList()
              this.$message({
                message: '全部删除成功',
                type: 'success'
@@ -188,7 +180,7 @@
        }).catch(() => {
        })
      },
      sortSingleExpert(obj) { //  点击单个特约专家信息
      deleteFun(obj) { //  彻底删除单个内容信息
        console.log(obj)
        this.$confirm('确定彻底删除该条回收站内容？', '提示', {
          confirmButtonText: '确定',
@@ -198,7 +190,7 @@
        }).then(() => {
          this.$http.get(thoroughDeleteSingleUrl, { id: obj.id }, response => {
            if (response.success) {
              this.publishList()
              this.recycleBinList()
              this.$message({
                message: '删除成功',
                type: 'success'
@@ -212,13 +204,8 @@
        this.$router.push({ path: 'viewRecycling', query: { id }})
      },
      current(val) { // 点击页码
        if (val < this.total) {
          this.tableData = this.dataList.slice(20 * (val - 1), 20 * val)
        } else {
          const array = this.dataList.slice(20 * val)
          ret.gapFilling(array)
          this.tableData = array
        }
        this.info.pageNo = val
        this.recycleBinList()
      }
    }
  }

src/views/contentPub/viewRecyclingBins.vue

@@ -25,9 +25,12 @@
        <el-form-item label="文章正文" prop="cnt" class="editBox">
          <div class="editContent" v-html="ruleForm2.cnt"></div>
        </el-form-item>
        <el-form-item class="deleTime">
          最后删除时间：{{modifyTime}}
        </el-form-item>
        <el-form-item class="publishButton">
          <el-button type="primary" @click="submitForm('ruleForm2')">恢复</el-button>
          <el-button @click="resetForm('ruleForm2')">彻底删除</el-button>
          <el-button type="primary" @click="restore">恢复</el-button>
          <el-button @click="completeDelete">彻底删除</el-button>
        </el-form-item>
      </el-form>
      <div class="fileBox">
@@ -39,10 +42,13 @@
</template>
<script>
  import { inquireContentUrl } from '@/api/content'
  import { inquireContentUrl, restoreUrl, thoroughDeleteSingleUrl } from '@/api/content'
  import { parseTime } from '@/utils/index'
  export default {
    data() {
      return {
        modifyTime: '',
        id: '',
        ruleForm2: {
          title: '',
          source: '',
@@ -57,6 +63,7 @@
    },
    created() {
      const id = this.$route.query.id
      this.id = id
      this.$http.get(inquireContentUrl, { id }, (response) => {
        if (response.success && response.data) {
          const info = response.data
@@ -70,28 +77,72 @@
            orgs: '',
            comps: ''
          }
          this.modifyTime = parseTime(info.modifyTime).substr(0, 19)
        }
      })
    },
    methods: {
      submitForm(formName) {
        this.$refs[formName].validate((valid) => {
          if (valid) {
            alert('submit!')
          } else {
            console.log('error submit!!')
            return false
          }
      restore(formName) {
        this.$confirm(`确定恢复${this.ruleForm2.title}内容？`, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
          center: true
        }).then(() => {
          this.$http.get(restoreUrl, { id: this.id }, response => {
            if (response.success) {
              if (response.data) {
                this.$router.go(-1)
                this.$message({
                  message: '恢复成功',
                  type: 'success'
                })
              } else {
                this.$http.get(inquireContentUrl, { id: this.id }, (response) => {
                  if (response.success && response.data) {
                    const info = response.data
                    if (!info.actived) {
                      this.$message({
                        message: '状态改变',
                        type: 'warning'
                      })
                    }
                  }
                })
              }
            }
          })
        }).catch(() => {
        })
      },
      resetForm(formName) {
        this.$refs[formName].resetFields()
      completeDelete() {
        this.$confirm('确定彻底删除该条回收站内容？', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
          center: true
        }).then(() => {
          this.$http.get(thoroughDeleteSingleUrl, { id: this.id }, response => {
            if (response.success) {
              this.$router.go(-1)
              this.$message({
                message: '删除成功',
                type: 'success'
              })
            }
          })
        }).catch(() => {
        })
      }
    }
  }
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
  .deleTime {
    text-align: right
  }
  .formTable {
    width: 943px
  }

src/views/cooperationAgency/index.vue

@@ -111,8 +111,8 @@
              // })
            }
            this.dataList = epData
            this.total = Math.ceil(epData / 20)
            if (this.total > 1) {
            this.total = epData.length
            if (this.total >= 20) {
              this.tableData = this.dataList.slice(0, 20)
            } else {
              const array = this.dataList
@@ -136,7 +136,7 @@
        console.log(id)
      },
      current(val) { // 点击页码
        if (val < this.total) {
        if (val < Math.ceil(this.total / 20)) {
          this.tableData = this.dataList.slice(20 * (val - 1), 20 * val)
        } else {
          const array = this.dataList.slice(20 * val)

src/views/login/index.vue

@@ -21,7 +21,7 @@
          <svg-icon icon-class="password-view" v-show="falg" /></span>
      </el-form-item>
      <el-form-item>
        <el-button class="log-btn" type="primary" :loading="loading" @click.native.prevent="handleLogin">登录</el-button>
        <el-button class="log-btn" type="primary" :loading="loading" @click.native.prevent.enter="handleLogin">登录</el-button>
      </el-form-item>
    </el-form>
  </div>

src/views/specialExperts/index.vue

@@ -118,8 +118,8 @@
              // })
            }
            this.dataList = epData
            this.total = Math.ceil(epData / 20)
            if (this.total > 1) {
            this.total = epData.length
            if (this.total >= 20) {
              this.tableData = this.dataList.slice(0, 20)
            } else {
              const array = this.dataList
@@ -143,7 +143,7 @@
        console.log(id)
      },
      current(val) { // 点击页码
        if (val < this.total) {
        if (val < Math.ceil(this.total / 20)) {
          this.tableData = this.dataList.slice(20 * (val - 1), 20 * val)
        } else {
          const array = this.dataList.slice(20 * val)