提交

src/api/backstage/dataReport.js

@@ -23,6 +23,17 @@ export function exportAllProject(value) {
     data:value
   })
 }
+
+// 导出所有主题数据
+export function exportAllTheme(projectId,value) {
+  value.unshift(projectId)
+  return request({
+    url: '/backstage/dataReport/exportAllTheme',
+    method: 'post',
+    data:value
+  })
+}
+
 //获取全部项目
 export function getAllProjectList() {
   return request({
@@ -30,3 +41,9 @@ export function getAllProjectList() {
     method: 'get'
   })
 }
+export function getThemeListByProjectId(projectId) {
+  return request({
+    url: '/backstage/dataReport/getThemeListByProjectId?projectId='+projectId,
+    method: 'get'
+  })
+}
\ No newline at end of file

src/views/backstage/investigator/index.vue

@@ -78,6 +78,7 @@
       <el-table-column label="被打回任务数" align="center" prop="repulseJobNum" />
       <el-table-column label="待复查任务数" align="center" prop="notReviewedJobNum" />
       <el-table-column label="待审核任务数" align="center" prop="examineJobNum" />
+     <el-table-column label="密码" align="center" prop="realPassword" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-switch
@@ -310,6 +311,7 @@ export default {
       }).then(({ value }) => {
         resetUserPwd(row.userId, value).then(response => {
           this.msgSuccess("修改成功，新密码是：" + value);
+          this.getList();
         });
       }).catch(() => {});
     },

src/views/backstage/job/detail.vue

@@ -63,7 +63,7 @@
             <img
               :src="image.url"
               style="width: 100px;height: 100px; cursor:pointer"/>
-            <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+            <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0' ">备注：{{image.remark}}</div>
             <div style="margin-top: 20px" v-else>
               <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
             </div>
@@ -79,7 +79,7 @@
               <!--                               :options="playerOptions"-->
               <!--                               @play="apply(image.url)"-->
               <!--                 ></video-player>-->
-              <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+              <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0'">备注：{{image.remark}}</div>
               <div style="margin-top: 20px" v-else>
                 <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
               </div>
@@ -138,7 +138,7 @@
             <img
               :src="image.url"
               style="width: 100px;height: 100px; cursor:pointer"/>
-            <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+            <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0'">备注：{{image.remark}}</div>
             <div style="margin-top: 20px" v-else>
               <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
             </div>
@@ -149,7 +149,7 @@
             <div>
               <video style="width: 100%;  height: 200px;" autoplay controls :src="image.url"></video>
 
-              <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+              <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0'">备注：{{image.remark}}</div>
               <div style="margin-top: 20px" v-else>
                 <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
               </div>
@@ -175,7 +175,7 @@
           <img
             :src="image.url"
             style="width: 100px;height: 100px; cursor:pointer"/>
-          <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+          <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0'">备注：{{image.remark}}</div>
           <div style="margin-top: 20px" v-else>
             <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
           </div>
@@ -186,7 +186,7 @@
           <div>
             <video style="width: 100%;  height: 200px;" autoplay controls :src="image.url"></video>
 
-            <div style="margin-top: 20px" v-if="image.type == null">备注：{{image.remark}}</div>
+            <div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0'">备注：{{image.remark}}</div>
             <div style="margin-top: 20px" v-else>
               <div :style="{'color':image.type ==2?'red':'blue'}">备注：{{image.remark}}</div>
             </div>

src/views/backstage/job/index.vue

@@ -158,7 +158,7 @@
       </el-table-column>
       <el-table-column width="100px" label="整改审批状态" align="center" prop="rectifyStatus" >
         <template scope="scope">
-          <span v-if="scope.row.approveStatus != null && (scope.row.approveStatus == '1' ||scope.row.approveStatus == '2'||scope.row.approveStatus == '3' )">待审批</span>
+          <span v-if="scope.row.approveStatus != null && scope.row.approveStatus == '3'">待审批</span>
           <span v-if="scope.row.approveStatus != null && scope.row.approveStatus == '4'">已审批</span>
         </template>
       </el-table-column>
@@ -314,13 +314,9 @@
       <br><br>
       <div>
         <span>
-         主题: <el-cascader
-            style="width: 80%"
-            key="id"
-            v-model="exportLevelValue"
-            :options="exportLevelOptions"
-            :props="{ expandTrigger: 'hover',checkStrictly: true}"
-            clearable></el-cascader>
+         主题: <el-select multiple style="width: 80%" v-model="exportLevelValue" placeholder="请选择主题" clearable  >
+          <el-option v-for="item in themeListName" :label="item.name" :value="item.id"  />
+        </el-select>
         </span>
 
       </div>
@@ -336,7 +332,7 @@
 
 <script>
 import { selectCheckTarget,getCheckTarget,selectRectifyTarget,getRectifyTarget, distributeRectificationJob, rollbackJob, auditJob, getList,listJob, getJob, delJob, addJob, updateJob, exportJob } from "@/api/backstage/job";
-import {exportAllProject,getProjectList,getAllProjectList } from "@/api/backstage/dataReport";
+import {exportAllProject,getProjectList,getAllProjectList,getThemeListByProjectId,exportAllTheme } from "@/api/backstage/dataReport";
 
 export default {
   name: "Job",
@@ -345,7 +341,9 @@ export default {
       exportLevelValue:[],
       exportLevelOptions:[],
       projectIdSelect:null,
+      themeIdSelectList:[],
       projectListName:[],
+      themeListName:[],
       exportOpen:false,
       rectifyTargetValueOptions:[],
       checkTargetValueOptions:[],
@@ -584,6 +582,11 @@ export default {
     },
     //提交导出
     exportSubmit(){
+      if(this.projectIdSelect == null){
+        this.$message.error("请先选择导出项目");
+        return;
+      }
+      
       if(this.exportLevelValue == null){
         this.$message.error("请先选择导出的项目主题");
         return;
@@ -595,12 +598,7 @@ export default {
         type: "warning"
       }).then(() =>{
         
-       var data = {
-          "ids":this.exportLevelValue,
-          "projectId":this.projectIdSelect
-        };
-
-        return exportAllProject(data);
+        return exportAllTheme(this.projectIdSelect,this.exportLevelValue);
       }).then(response => {
         this.download(response.msg);
         this.exportOpen = false;
@@ -731,11 +729,14 @@ export default {
       });
     },
     selectProject(){
-       console.log(this.projectIdSelect)     
         getProjectList(this.projectIdSelect).then(res=>{
         this.exportLevelOptions = res.data;
       })
-    }
+       getThemeListByProjectId(this.projectIdSelect).then(res=>{
+        this.themeListName = res.data;
+      })
+    },
+   
   }
 };
 </script>

src/views/backstage/point/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名称" prop="name">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.totalLevelName"
           placeholder="请输入名称"
           clearable
           size="small"
@@ -60,11 +60,17 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="统计点类型" prop="type">-->
-<!--        <el-select v-model="queryParams.type" placeholder="请选择统计点类型" clearable size="small">-->
-<!--          <el-option label="请选择字典生成" value="" />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+     <el-form-item label="统计点类型" prop="type">
+       <el-select v-model="queryParams.type" placeholder="请选择统计点类型" clearable size="small">
+        <el-option label="省级" value="1" />
+        <el-option label="市级" value="2" />
+        <el-option label="县级" value="3" />
+        <el-option label="乡级" value="4" />
+        <el-option label="村级" value="5" />
+        <el-option label="自然村" value="6" />
+
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -211,7 +217,7 @@
             <el-input show-password type="password" v-model="form.password" autocomplete="off" placeholder="密码要求：8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
             <el-progress :percentage="passwordPercent" :format="passwordPercentFormat"></el-progress>
           </el-form-item>
-          <el-form-item label="再次输入密码" prop="comfirmPassword">
+          <el-form-item　v-if="this.isAdd === true" label="再次输入密码" prop="comfirmPassword">
             <el-input show-password type="password" placeholder="请再次输入密码" v-model="form.comfirmPassword" autocomplete="off"></el-input>
           </el-form-item>
 
@@ -401,6 +407,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isAdd: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -413,6 +420,7 @@ export default {
         latitude: null,
         superiorId: null,
         type: null,
+        totalLevelName:null,
       },
       // 表单参数
       form: {
@@ -506,6 +514,7 @@ export default {
       this.statisticsPointsType = '';//初始化统计点类型
       this.passwordPercent = 0;//初始化密码进度条
       this.addStatisticsTypeStatus = true;
+      this.isAdd = true;
     },
     //选择新增类型确定按钮
     handleAddStatisticsPointsType(){
@@ -537,6 +546,7 @@ export default {
       this.passwordPercent = 0;//初始化密码进度条
       this.reset();
       const id = row.id || this.ids;
+      this.isAdd = false;
       getPoint(id).then(response => {
         this.form = response.data;
         this.form.levelValue = JSON.parse(response.data.levelValue)

vue.config.js

@@ -37,9 +37,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-    // target: `http://localhost:7788`,
-   //  target: `http://152.136.125.222:8095/investigation`,  //正式
-      target: 'https://faces.diaosaas.com/investigation', //测试
+     // target: `http://localhost:7788`,
+    // target: `http://152.136.125.222:8095/investigation`,  //正式
+     target: 'https://faces.diaosaas.com/investigation', //测试
       changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''