Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/views/ajzcgzxnpg/queryGxqk.vue

@@ -55,7 +55,7 @@
             <el-button
                 @click.native.prevent="resetQuery(tableData[scope.$index].dwdm)"
                 type="text">
-              {{tableData[scope.$index].dwmc}}
+              {{ tableData[scope.$index].dwmc }}
             </el-button>
           </template>
         </el-table-column>
@@ -64,11 +64,19 @@
             label="线索总数"
         >
         </el-table-column>
+        <!--        <el-table-column-->
+        <!--          prop="bjxss"-->
+        <!--          label="办结数"-->
+        <!--          >-->
+        <!--        </el-table-column>-->
+        <el-table-column label="发现案件线索">
           <el-table-column
-          prop="bjxss"
-          label="办结数"
+              prop="ajs"
+              label="破获刑事案件数"
           >
           </el-table-column>
+        </el-table-column>
+        <el-table-column label="发现人员线索">
           <el-table-column
               prop="zzfzxys"
               label="有组织犯罪嫌疑数"
@@ -84,29 +92,30 @@
               label="无犯罪嫌疑数"
           >
           </el-table-column>
-        <el-table-column
-          prop="ajs"
-          label="破获刑事案件数"
-          >
-        </el-table-column>
+
           <el-table-column
               prop="xyrs"
               label="抓获犯罪嫌疑人数"
           >
           </el-table-column>
+        </el-table-column>
+        <el-table-column
+            prop="xxss"
+            label="发现新工作线索数"
+            width="150">
+        </el-table-column>
       </el-table>
     </div>
   </div>
 </template>
 
 <script>
-import { post } from "@/utils/http.js";
+import {post} from "@/utils/http.js";
 import url from "@/api/base";
 
 export default {
   name: "queryQxqk",
-  components: {
-  },
+  components: {},
   data() {
     return {
       header: "对侦查工作贡献情况",
@@ -134,8 +143,7 @@ export default {
       ],
     };
   },
-  computed: {
-  },
+  computed: {},
   created() {
     this.$store.commit("user/SET_Menu", this.Menu);
   },
@@ -151,7 +159,7 @@ export default {
             if (response.success === true) {
               self.tableData = response.data.rows;
               self.tableDataLength = response.data.rows.length
-            console.log('self.tableData', typeof(self.tableDataLength))
+              console.log('self.tableData', typeof (self.tableDataLength))
               self.closeLoading();
             } else {
               self.closeLoading();
@@ -186,9 +194,10 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.Content{
+.Content {
   padding: 20px;
-  .top, .bottom{
+
+  .top, .bottom {
     margin-bottom: 25px;
     padding: 0 20px;
     background: #fff;
@@ -197,7 +206,8 @@ export default {
     border: 1px solid #EAEAEA;
     box-shadow: none;
     opacity: 1;
-    .flTtitle{
+
+    .flTtitle {
       font-size: 15px;
       font-weight: bold;
       line-height: 21px;
@@ -206,13 +216,15 @@ export default {
       display: inline-block;
     }
   }
-  .top{
-    .zhi{
+
+  .top {
+    .zhi {
       display: inline-block;
       vertical-align: top;
       margin: 0 8px;
     }
-    .zdybtn{
+
+    .zdybtn {
       width: 76px;
       height: 32px;
       background: #FFFFFF;
@@ -225,15 +237,18 @@ export default {
       cursor: pointer;
       display: inline-block;
     }
-    .btn{
+
+    .btn {
       text-align: right;
       margin-right: 30px;
       margin-bottom: 15px;
     }
   }
-  .bottom{
+
+  .bottom {
     padding-bottom: 15px;
-    .info{
+
+    .info {
       font-size: 12px;
       font-family: Source Han Sans CN;
       font-weight: 400;
@@ -241,19 +256,23 @@ export default {
       color: #999999;
     }
   }
-  ::v-deep .el-input{
+
+  ::v-deep .el-input {
     width: auto !important;
-    .el-input__inner{
+
+    .el-input__inner {
       width: auto !important;
       height: 32px;
       line-height: 32px;
     }
   }
 }
-::v-deep .el-table .cell{
+
+::v-deep .el-table .cell {
   text-align: center;
 }
-::v-deep .el-table th{
+
+::v-deep .el-table th {
   background: #F5F7FA;
 }
 </style>

src/views/mxgl/cxmxlb/queryMxlb.vue

@@ -338,10 +338,10 @@ export default {
     },
     doQuery() {
       if (this.dateRange && this.dateRange.length > 0) {
-        if(this.dateRange[0]){
+        if (this.dateRange[0]) {
           this.form.djsjKssj = this.dateRange[0];
         }
-        if(this.dateRange[1]){
+        if (this.dateRange[1]) {
           this.form.djsjJssj = this.dateRange[1];
         }
       }
@@ -371,6 +371,10 @@ export default {
     clearData() {
       this.form.mxlx = "";
       this.form.mxmc = "";
+      this.dateRange = [];
+      this.form.unitcode = '';
+      this.form.djsjKssj = '';
+      this.form.djsjJssj = '';
     },
     headStyle() {
       return "text-align: center";

src/views/mxgl/mxclydy/fzjcgxlfx.vue

@@ -117,7 +117,12 @@
             prop: "dwStr",
           },
           {
-            label: "平均分",
+            label: "决策结果产出量",
+            width: "200",
+            prop: "pjf",
+          },
+          {
+            label: "精准度",
             width: "200",
             prop: "pjf",
           },

src/views/rwddzx/rwgl/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
   <div class="Content">
-    <right-content ref="rightContent"
+    <right-content ref="rightContent" v-loading="tableLoading"
                    :pageBs="pageBs"
                    :header="header"
                    :cxFormData="cxFormData"
@@ -89,6 +89,7 @@ export default {
   },
   data () {
     return {
+      tableLoading : false,
       page: {
         page: 1,
         limit: 10,
@@ -267,7 +268,6 @@ export default {
         yxms: "",
         cron: "",
         lycl: "",
-        yxms: "",
       },
     };
   },
@@ -356,12 +356,18 @@ export default {
       this.$alert("执行任务时会短暂影响系统性能，系统其它模块可能会受影响卡顿，请谨慎操作。", "可能业务风险", {
         confirmButtonText: "确定",
         type: "warning",
-        // callback: action => {
+        callback: action => {
+          this.tableLoading = true;
+
+          setTimeout(() => {
+            this.$message.success("执行成功")
+            this.tableLoading = false;
+          }, 1000)
           // this.$message({
           //   type: 'info',
           //   message: `action: ${ action }`
           // });
-        // }
+        }
       });
     },
     //编辑