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

src/views/xnpgbg/dwxnfx.vue

@@ -102,14 +102,14 @@
         </el-table-column
         >
 
-<!--        <el-table-column align="center" label="案件侦办"-->
-<!--        >-->
-<!--          <template slot-scope="{ row }"-->
-<!--          ><span class="names" @click="goDetail(row, 'ajzbCount')">{{-->
-<!--              row.ajzbCount-->
-<!--            }}</span></template-->
-<!--          >-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="案件侦办"-->
+        <!--        >-->
+        <!--          <template slot-scope="{ row }"-->
+        <!--          ><span class="names" @click="goDetail(row, 'ajzbCount')">{{-->
+        <!--              row.ajzbCount-->
+        <!--            }}</span></template-->
+        <!--          >-->
+        <!--        </el-table-column>-->
         <el-table-column align="center" label="证据材料检查"
         >
           <template slot-scope="{ row }"
@@ -195,14 +195,14 @@
           >
         </el-table-column
         >
-<!--        <el-table-column align="center" label="大屏统计"-->
-<!--        >-->
-<!--          <template slot-scope="{ row }"-->
-<!--          ><span class="names" @click="goDetail(row, 'dptjCount')">{{-->
-<!--              row.dptjCount-->
-<!--            }}</span></template-->
-<!--          >-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column align="center" label="大屏统计"-->
+        <!--        >-->
+        <!--          <template slot-scope="{ row }"-->
+        <!--          ><span class="names" @click="goDetail(row, 'dptjCount')">{{-->
+        <!--              row.dptjCount-->
+        <!--            }}</span></template-->
+        <!--          >-->
+        <!--        </el-table-column>-->
       </el-table>
     </div>
   </div>
@@ -381,9 +381,14 @@ export default {
       this.initDate();
     },
     exportFile() {
-      this.formData.djsjJssj = util.dateToStr(this.formData.djsjJssj);
-      this.formData.djsjKssj = util.dateToStr(this.formData.djsjKssj);
+      if (this.formData.djsjJssj) {
+        this.formData.djsjJssj = util.dateToStr(this.formData.djsjJssj);
+      }
+      if (this.formData.djsjKssj) {
+        this.formData.djsjKssj = util.dateToStr(this.formData.djsjKssj);
+      }
       const {djsjJssj, djsjKssj, unitCode, yymcdm} = this.formData
+      console.log(this.formData)
       this.qeruestFile(`/ywsjTj/exportDwczTj?djsjJssj=${djsjJssj}&djsjKssj=${djsjKssj}&unitCode=${unitCode}&yymcdm=${yymcdm}`).then((res) => {
         let blob = new Blob([res]);
         let fileName = "单位操作统计.xlsx";

src/views/xnpgbg/grxnfx.vue

@@ -7,20 +7,20 @@
         </el-col>
       </el-row>
       <el-form
-        label-position="right"
-        label-width="140px"
-        ref="queryForm"
-        :model="formData"
+          label-position="right"
+          label-width="140px"
+          ref="queryForm"
+          :model="formData"
       >
         <el-row>
           <el-col :span="6">
             <el-form-item label="业务名称">
               <el-select v-model="formData.yymc" clearable>
                 <el-option
-                  v-for="item in queryTypeList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
+                    v-for="item in queryTypeList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
                 >
                 </el-option>
               </el-select>
@@ -29,11 +29,11 @@
           <el-col :span="10">
             <el-form-item label="操作日期">
               <el-date-picker
-                v-model="formData.daterange"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                  v-model="formData.daterange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
               >
               </el-date-picker>
             </el-form-item>
@@ -42,18 +42,19 @@
           <el-col :span="6">
             <el-button-group style="float: right; display: -webkit-inline-box">
               <el-button
-                plain
-                size="small"
-                @click="clearData"
-                style="width: 60%"
-                >重置</el-button
+                  plain
+                  size="small"
+                  @click="clearData"
+                  style="width: 60%"
+              >重置
+              </el-button
               >
               <el-button
-                type="primary"
-                size="small"
-                style="width: 60%"
-                @click="initDate"
-                >查询
+                  type="primary"
+                  size="small"
+                  style="width: 60%"
+                  @click="initDate"
+              >查询
               </el-button>
             </el-button-group>
           </el-col>
@@ -65,16 +66,16 @@
         <el-col :span="24">
           <span class="flTtitle">查询结果</span>
           <el-button
-            plain
-            class="zdybtn export"
-            style="float: right; margin-top: 1%; margin-right: 2% !important"
-            size="small"
-            @click="exportFile"
+              plain
+              class="zdybtn export"
+              style="float: right; margin-top: 1%; margin-right: 2% !important"
+              size="small"
+              @click="exportFile"
           >
             <i
-              class="fa fa-external-link"
-              aria-hidden="true"
-              style="margin-right: 5px"
+                class="fa fa-external-link"
+                aria-hidden="true"
+                style="margin-right: 5px"
             ></i>
             导出
           </el-button>
@@ -83,45 +84,47 @@
       </el-row>
 
       <el-table
-        v-loading="tableLoading"
-        element-loading-text="拼命加载中"
-        :data="tableData"
-        tooltip-effect="dark"
-        width="100%"
-        size="small"
-        border
+          v-loading="tableLoading"
+          element-loading-text="拼命加载中"
+          :data="tableData"
+          tooltip-effect="dark"
+          width="100%"
+          size="small"
+          border
       >
-        <el-table-column type="index" label="序号" width="50" />
-        <el-table-column align="center" label="身份证号" prop="sfzh" />
-        <el-table-column align="center" label="单位名称" prop="unitname" />
-        <el-table-column align="center" label="姓名" prop="xm" />
-        <el-table-column align="center" label="警号" prop="jh" />
-        <el-table-column align="center" label="联系电话" prop="lxdh" />
-        <el-table-column align="center" label="查询次数" prop="count" />
+        <el-table-column type="index" label="序号" width="50"/>
+        <el-table-column align="center" label="身份证号" prop="sfzh"/>
+        <el-table-column align="center" label="单位名称" prop="unitname"/>
+        <el-table-column align="center" label="姓名" prop="xm"/>
+        <el-table-column align="center" label="警号" prop="jh"/>
+        <el-table-column align="center" label="联系电话" prop="lxdh"/>
+        <el-table-column align="center" label="查询次数" prop="count"/>
         <el-table-column align="center" label="操作"
-          ><template slot-scope="{ row }">
+        >
+          <template slot-scope="{ row }">
             <span
-              @click="detail(row.sfzh)"
-              style="color: #409eff; margin-right: 5px; cursor: pointer"
-              >操作详情</span
+                @click="detail(row.sfzh)"
+                style="color: #409eff; margin-right: 5px; cursor: pointer"
+            >操作详情</span
             >
             <span @click="fx(row.sfzh)" style="color: #409eff; cursor: pointer"
-              >操作分析</span
+            >操作分析</span
             >
-          </template></el-table-column
+          </template>
+        </el-table-column
         >
       </el-table>
 
       <el-pagination
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page.sync="formData.page"
-        :page-sizes="[10]"
-        :page-size="formData.limit"
-        layout="sizes,prev, pager, next"
-        :small="true"
-        :total="dataCount"
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="formData.page"
+          :page-sizes="[10]"
+          :page-size="formData.limit"
+          layout="sizes,prev, pager, next"
+          :small="true"
+          :total="dataCount"
       >
       </el-pagination>
     </div>
@@ -144,25 +147,25 @@ export default {
       formData: {
         unitCode: "",
         yymc: "",
-        djsjKssj: this.$moment().subtract(3, "month").format("YYYY-MM-DD"),
-        djsjJssj: this.$moment().format("YYYY-MM-DD"),
+        djsjKssj: '',
+        djsjJssj: '',
         daterange: [],
         page: 1,
         limit: 100,
       },
       queryTypeList: [
-        { name: "个案侦办", value: "0101" },
-        { name: "证据材料检查", value: "0102" },
-        { name: "案件标注", value: "0103" },
-        { name: "合成研判工作台", value: "0301" },
-        { name: "工作指令", value: "0305" },
-        { name: "线索核办", value: "0404" },
-        { name: "刑嫌调控工作管理", value: "0501" },
-        { name: "阵地管控工作管理", value: "0502" },
-        { name: "业务效能工作评估", value: "0503" },
-        { name: "单位效能工作评估", value: "0504" },
-        { name: "个人效能工作评估", value: "0505" },
-        { name: "功能效能工作评估", value: "0506" },
+        {name: "个案侦办", value: "0101"},
+        {name: "证据材料检查", value: "0102"},
+        {name: "案件标注", value: "0103"},
+        {name: "合成研判工作台", value: "0301"},
+        {name: "工作指令", value: "0305"},
+        {name: "线索核办", value: "0404"},
+        {name: "刑嫌调控工作管理", value: "0501"},
+        {name: "阵地管控工作管理", value: "0502"},
+        {name: "业务效能工作评估", value: "0503"},
+        {name: "单位效能工作评估", value: "0504"},
+        {name: "个人效能工作评估", value: "0505"},
+        {name: "功能效能工作评估", value: "0506"},
       ],
     };
   },
@@ -171,6 +174,14 @@ export default {
   },
   methods: {
     exportFile() {
+      let dataRange = this.formData.daterange;
+      if (dataRange && dataRange.length > 0) {
+        this.formData.djsjKssj = dataRange[0];
+        this.formData.djsjJssj = dataRange[1];
+      } else {
+        this.formData.djsjKssj = ''
+        this.formData.djsjJssj = ''
+      }
       this.qeruestFile(this.formData, "/ywsjTj/exportRycczyxx").then((res) => {
         let blob = new Blob([res]);
         let fileName = "个人操作统计.xlsx";
@@ -215,11 +226,19 @@ export default {
       });
     },
     initDate() {
+      let dataRange = this.formData.daterange;
+      if (dataRange && dataRange.length > 0) {
+        this.formData.djsjKssj = dataRange[0];
+        this.formData.djsjJssj = dataRange[1];
+      } else {
+        this.formData.djsjKssj = ''
+        this.formData.djsjJssj = ''
+      }
       let self = this;
       this.tableLoading = true;
       let url = "/ywsjTj/queryRycczyxx";
       this.qeruestPost(this.formData, url).then((res) => {
-        let { code, data } = res;
+        let {code, data} = res;
         if (code == 200) {
           self.tableData = data.rows;
           self.dataCount = data.total;
@@ -263,7 +282,7 @@ export default {
             this.$message.error(res.msg);
           }
         });
-      } 
+      }
       // else if (this.formData.type == '2') {
 
       // } else if (this.formData.type == '3') {