Merge branch 'dev_maxt' of http://47.92.108.28/changchao/founder_vue into dev_maxt

src/views/jump/jump.vue

@@ -33,8 +33,8 @@ export default {
         }
       }).then(res => {
         if (res.code == 200) {
-          self.ruleForm2.account = res.data.account
-          // self.ruleForm2.password = res.data.password
+          self.ruleForm2.account = res.data.user.account
+          // self.ruleForm2.password = res.data.user.password
           self.ruleForm2.password = '0'
           self.$store.dispatch('user/login', self.ruleForm2).then((res) => {
             if (res.success == true) {
@@ -47,7 +47,6 @@ export default {
                 }
               })
             }
-
           }).catch(() => {
           })
         } else {

src/views/magl/bndfasTs.vue

@@ -558,11 +558,67 @@ export default {
         this.emitTableThead = this.form.shrThead
         this.emitPage = this.form.bndfasTsPageName
         break
-      case 'maxz' || 'ladsp':
-        this.title = '受害人年龄段及性别划分：'
+      case 'maxz':
+        this.title = '今日命案新增数：'
         this.emitFormData = this.form.bndfasTsFormData
-        this.emitUrl = '/matjTs/toShrTjRyxx'
-        this.emitTableThead = this.form.shrThead
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'ladsp':
+        this.title = '立案待审批数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'laspwtg':
+        this.title = '立案审批未通过数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'zczjdsp':
+        this.title = '侦查终结待审批数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'zczjdspwtg':
+        this.title = '侦查终结待审批未通过数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'lajjcq':
+        this.title = '立案即将超期：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'laycq':
+        this.title = '已超期数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'zczjjjcq':
+        this.title = '侦查终结即将超期：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
+        this.emitPage = this.form.bndfasTsPageName
+        break
+      case 'zczjycq':
+        this.title = '侦查终结已超期数：'
+        this.emitFormData = this.form.bndfasTsFormData
+        this.emitUrl = '/matjTs/toGztTjAjxx'
+        this.emitTableThead = this.form.bndfasTsThead
         this.emitPage = this.form.bndfasTsPageName
         break
       default:

src/views/magl/sjfx.vue

@@ -391,7 +391,6 @@ export default {
       this.shrnldjxbhfInit()
     },
     gztToTs(id, val) {
-      debugger
       let routeData
       if (val != 0) {
         routeData = this.$router.resolve({
@@ -675,7 +674,6 @@ export default {
       x.map((v, i) => {
         obj[x[i]] = code[i]
       })
-      console.log(obj)
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById('bnqyfpaqk'))
       // 绘制图表
@@ -889,6 +887,7 @@ export default {
       let self = this
       this.bndzadjpafxLoading = true
       self.requestPost(JSON.stringify(self.formData), self.zadjUrl).then(response => {
+        debugger
         if (response.data.success === true) {
           let yData = []
           yData.push({ value: response.data.data['tcNum'], name: '图财', itemStyle: { color: '#FD7038' } })
@@ -1463,7 +1462,6 @@ export default {
           self.gztList[3].value = response.data.data.laspwtgCount // --立案审批未通过
           self.gztList[0].value = response.data.data.jrmaxzCount // --今日命案新增
           self.gztList[1].value = response.data.data.ladspCount // --立案待审批
-          // self.gztList[6].value2 = response.data.data.total
         } else {
           self.$message({
             type: 'error',
@@ -1620,7 +1618,6 @@ export default {
     this.bnfasjfxInit()//本年发案时间分析
     this.bnqyfpaqkInit()//本年区域发、破案情况
     window.addEventListener('mousewheel', this.handleScroll, false)
-
   }
 }
 </script>