Merge branch 'master' of http://121.42.41.42:7070/r/epdc-admin-yushan

# Conflicts: # src/views/modules/epidemic/echarts.vue # src/views/modules/epidemic/epidemicreportuserinfo.vue # src/views/modules/vim/vaccinationinfo-add-or-update.vue
4 years ago · eeb1483064
14 changed files with 184 additions and 184 deletions
--- a/src/views/modules/epidemic/echarts.vue
+++ b/src/views/modules/epidemic/echarts.vue
@ -23,10 +23,10 @@

 <script>
 export default {
-  name: "hellowEcharts",
+  name: 'hellowEcharts',
  data () {
    return {
-      title: "平阴县",
+      title: '平阴县',
      outStreet: '',
      outStreetArr: [],
      barName: '',
@ -36,7 +36,7 @@ export default {
  },
  created: function () {
    this.getDailyTypeArrInfo()
-    this.getPeopleNumber("");
+    this.getPeopleNumber('')
  },
  mounted () {
    // this.drawLine();
@ -44,7 +44,7 @@ export default {
      tooltip: {},
      xAxis: {
        type: 'category',
-        data: ["外地人数", "返乡人数", "现住外地人数"]
+        data: ['外地人数', '返乡人数', '现住外地人数']
      },
      yAxis: {
        type: 'value'
@ -52,28 +52,28 @@ export default {
      series: [{
        data: [0, 0, 0],
        type: 'bar',
-        name:"人员情况",
+        name: '人员情况',
        label: {
          show: true,
          position: 'top',
          color: 'rgba(20, 101, 230, 1)'
-        },
+        }
      }]
    }
  },
  methods: {
    // 获取乡镇下拉信息(传参：4代表查“街道”)
    getDailyTypeArrInfo () {
-      this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
+      this.$http.get(`sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
        this.outStreetArr = res
      }).catch(() => {})
    },
    // 乡镇取值变化事件
    selectModel (event) {
-      if (event == ''){
+      if (event === '') {
        this.title = '平阴县'
        this.barName = '平阴县'
-        this.getPeopleNumber(event);
+        this.getPeopleNumber(event)
      }
      this.outStreetArr.find((item) => {
        if (item.dictValue === event) {
@ -85,10 +85,10 @@ export default {
      })
    },
    getPeopleNumber (item) {
-      if (item == ""){
+      if (item === '') {
        item = 0
      }
-      this.$http.get(`/sys/select/getPeopleNumber/`+item).then(({ data: res }) => {
+      this.$http.get(`select/getPeopleNumber/` + item).then(({ data: res }) => {
        if (res.code !== 0) {
          return this.$message.error(res.msg)
        }
--- a/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue
@ -494,7 +494,7 @@ export default {
      ],
      gender: [
        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' },
+        { dictValue: '女', dictName: '女' }
      ],
      vueLoading: true
    }
--- a/src/views/modules/epidemic/epidemicreportuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfo.vue
@ -280,19 +280,19 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './epidemicreportuserinfo-add-or-update'
 import InfoDetail from './epidemicreportuserinfoDetail'
-import qs from "qs";
-import Cookies from "js-cookie";
+import qs from 'qs'
+import Cookies from 'js-cookie'
 export default {
  mixins: [mixinViewModule],
  data () {
    return {
      mixinViewModuleOptions: {
-        getDataListURL: '/sys/epidemicuserinfo/page',
+        getDataListURL: 'sys/epidemicuserinfo/page',
        getDataListIsPage: true,
-        deleteURL: '/sys/epidemicuserinfo',
+        deleteURL: 'sys/epidemicuserinfo',
        deleteIsBatch: true,
-        exportURL: '/sys/epidemicuserinfo/export',
-        exportErrorInfoURL: '/sys/epidemicusererror/export'
+        exportURL: 'sys/epidemicuserinfo/export',
+        exportErrorInfoURL: 'sys/epidemicusererror/export'
      },
      dataForm: {
        id: '',
@ -402,13 +402,13 @@ export default {
    },
    // 获取乡镇下拉信息(传参：4代表查“街道”)
    getDailyTypeArrInfo () {
-      this.$http.get(`/sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
+      this.$http.get(`sys/epidemicreportuserinfo/selectStreet/4`).then(({ data: res }) => {
        this.outStreetArr = res
      }).catch(() => { })
    },
    getcompantyOptions () {
      this.$http
-          .get(`/sys/vaccinecompany/getCompantyList`)
+        .get(`sys/vaccinecompany/getCompantyList`)
        .then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
@ -428,7 +428,7 @@ export default {
    },
    getOptions () {
      this.$http
-        .get(`/sys/select/getSysArea`)
+        .get(`sys/select/getSysArea`)
        .then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
@ -475,13 +475,13 @@ export default {
            this.$message({
              type: 'success',
              message: '下载成功'
-            });
+            })
          }).catch(() => {
            this.$message({
              type: 'info',
              message: '已取消下载'
-            });
-          });
+            })
+          })
        } else {
          this.$message.error(response.msg)
        }
@ -507,7 +507,7 @@ export default {
      }
    },
    showRegistFormat (row, column) {
-      if (row.isInoculate == 0) {
+      if (row.isInoculate === 0) {
        return '否'
      } else {
        return '是'
@ -527,7 +527,7 @@ export default {
    },
    // 打开导出弹框
    exports () {
-      this.dialogVisibleExcel = true;
+      this.dialogVisibleExcel = true
    }
  }
 }
--- a/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
+++ b/src/views/modules/epidemic/epidemicreportuserinfoDetail.vue
@ -493,7 +493,7 @@ export default {
      ],
      gender: [
        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' },
+        { dictValue: '女', dictName: '女' }
      ],
      vueLoading: true
    }
--- a/src/views/modules/epidemic/epidemicuserinfo.vue
+++ b/src/views/modules/epidemic/epidemicuserinfo.vue
@ -202,7 +202,7 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './regist'
 import InfoDetail from './epidemicreportuserinfoDetail'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
 export default {
  mixins: [mixinViewModule],

@ -356,13 +356,13 @@ export default {
            this.$message({
              type: 'success',
              message: '下载成功'
-            });
+            })
          }).catch(() => {
            this.$message({
              type: 'info',
              message: '已取消下载'
-            });
-          });
+            })
+          })
        } else {
          this.$message.error(response.msg)
        }
@ -401,7 +401,7 @@ export default {
    },
    // 打开导出弹框
    exports () {
-      this.dialogVisibleExcel = true;
+      this.dialogVisibleExcel = true
    }
  }
 }
--- a/src/views/modules/epidemic/regist.vue
+++ b/src/views/modules/epidemic/regist.vue
@ -174,14 +174,14 @@ export default {
      vaccinationStateOptions: [
        { value: 0, label: '未接种' },
        { value: 1, label: '接种中' },
-        {value: 2, label: '接种完成'},
+        { value: 2, label: '接种完成' }
      ],
      isAble: false,
      showFlagIn: true,
      showFlagOut: true,
      gender: [
        { dictValue: '男', dictName: '男' },
-        { dictValue: '女', dictName: '女' },
+        { dictValue: '女', dictName: '女' }
      ],
      vueLoading: true,
      id: ''
@ -278,7 +278,7 @@ export default {
      }).catch(() => { })
      if (this.dataForm.companyId !== this.historyCompanyId) {
        this.dataForm.vaccinationState = 1
-        return this.$message.warning("与上次接种疫苗厂家不同")
+        return this.$message.warning('与上次接种疫苗厂家不同')
      } else {
        if (this.dataForm.dose === this.maxDose) {
          this.dataForm.vaccinationState = 2
--- a/src/views/modules/property/group-detail.vue
+++ b/src/views/modules/property/group-detail.vue
@ -178,7 +178,7 @@ export default {
        if (res.code !== 0) {
          return this.$message.error(res.msg)
        }
-        if (res.data.resultCode == 1) {
+        if (res.data.resultCode === 1) {
          this.$confirm(res.data.resultMessage, '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@ -216,8 +216,8 @@ export default {
        if (!valid) {
          return false
        }
-        this.dataForm.areaCode = this.dataForm.allAreaCode[this.dataForm.allAreaCode.length - 1];
-        this.dataForm.allAreaCode = this.dataForm.allAreaCode.toString();
+        this.dataForm.areaCode = this.dataForm.allAreaCode[this.dataForm.allAreaCode.length - 1]
+        this.dataForm.allAreaCode = this.dataForm.allAreaCode.toString()
        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dept', this.dataForm).then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
--- a/src/views/modules/sys/reportmacode.vue
+++ b/src/views/modules/sys/reportmacode.vue
@ -120,7 +120,7 @@ export default {
      communityList: [],
      gridList: [],
      maCodeCategorys: [
-        { id: '0', name: '群众注册码' },
+        { id: '0', name: '群众注册码' }
      ]
    }
  },
@ -228,7 +228,7 @@ export default {
            })
        })
        .catch(() => {
-            loading.close()
+          // loading.close()
        })
    },
    clearDataForm () {
--- a/src/views/modules/vim/vaccinationinfo-add-or-update.vue
+++ b/src/views/modules/vim/vaccinationinfo-add-or-update.vue
@ -114,7 +114,7 @@ export default {
    },
    // 获取信息
    getInfo () {
-      this.$http.get(`/sys/vaccinationinfo/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`sys/vaccinationinfo/${this.dataForm.id}`).then(({ data: res }) => {
        if (res.code !== 0) {
          return this.$message.error(res.msg)
        }
@ -129,7 +129,7 @@ export default {
    },
    getSiteOptions () {
      this.$http
-          .get(`/sys/vaccinationsite/getSiteList`)
+        .get(`sys/vaccinationsite/getSiteList`)
        .then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
@ -143,7 +143,7 @@ export default {
    },
    getCompantyOptions () {
      this.$http
-        .get(`/sys/vaccinecompany/getCompantyList`)
+        .get(`sys/vaccinecompany/getCompantyList`)
        .then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
@ -161,7 +161,7 @@ export default {
        if (!valid) {
          return false
        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/vaccinationinfo/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('sys/vaccinationinfo/', this.dataForm).then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
          }