Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/api/resource.js

-import { get, post,delete_util } from "../util/http_util";
+import { get, post, delete_util } from "../util/http_util";
 
 //#region 公共
 //服务前缀
@@ -44,9 +44,9 @@ export function queryQuestionTree() {
  * @param {*} treeId 
  * @returns 
  */
-export function queryQuestion(pageNum, pageSize, content, treeId) {
+export function queryQuestion(pageNum, pageSize, content, treeId, startDate, endDate) {
     let url = `${PREFIX}/queryQuestion`;
-    url += addParam({ pageNum, pageSize, content, treeId });
+    url += addParam({ pageNum, pageSize, content, treeId, startDate, endDate });
     return get(url);
 }
 
@@ -89,8 +89,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} measure 
  * @returns 
  */
- export function addNewQuestion(param){
-    return post(`${PREFIX}/addQuestion`,param);
+export function addNewQuestion(param) {
+    return post(`${PREFIX}/addQuestion`, param);
 }
 
 /**
@@ -102,8 +102,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} measure 
  * @returns 
  */
- export function UpdateQuestion(param){
-    return post(`${PREFIX}/updateQuestion`,param);
+export function UpdateQuestion(param) {
+    return post(`${PREFIX}/updateQuestion`, param);
 }
 
 /**
@@ -114,8 +114,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} parentCode
  * @returns 
  */
- export function addQuestionTreeNode(param){
-    return post(`${PREFIX}/addQuestionTreeNode`,param);
+export function addQuestionTreeNode(param) {
+    return post(`${PREFIX}/addQuestionTreeNode`, param);
 }
 
 /**
@@ -126,8 +126,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} parentCode
  * @returns 
  */
- export function updateQuestionTreeNode(param){
-    return post(`${PREFIX}/updateQuestionTreeNode`,param);
+export function updateQuestionTreeNode(param) {
+    return post(`${PREFIX}/updateQuestionTreeNode`, param);
 }
 
 /**
@@ -135,7 +135,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} id 
  * @returns 
  */
- export function removeQuestionTreeNode(id){
+export function removeQuestionTreeNode(id) {
     return delete_util(`${PREFIX}/removeQuestionTreeNode?id=${id}`);
 }
 
@@ -144,15 +144,15 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} ids
  * @returns 
  */
- export function removeQuestion(ids){
-    return delete_util(`${PREFIX}/removeQuestion`,ids);
+export function removeQuestion(ids) {
+    return delete_util(`${PREFIX}/removeQuestion`, ids);
 }
 
 /**
  * 想定作业查询选项树
  * @returns 
  */
- export function queryQuestionOptionsTree(type){
+export function queryQuestionOptionsTree(type) {
     return get(`${PREFIX}/queryQuestionOptionsTree?type=${type}`);
 }
 
@@ -164,8 +164,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} name
  * @returns 
  */
- export function addWebsite(param){
-    return post(`${PREFIX_Sentiment}/addWebsite`,param);
+export function addWebsite(param) {
+    return post(`${PREFIX_Sentiment}/addWebsite`, param);
 }
 
 /**
@@ -173,8 +173,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} ids
  * @returns 
  */
- export function removeWebsite(ids){
-    return delete_util(`${PREFIX_Sentiment}/removeWebsite`,ids);
+export function removeWebsite(ids) {
+    return delete_util(`${PREFIX_Sentiment}/removeWebsite`, ids);
 }
 
 /**
@@ -185,8 +185,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} name
  * @returns 
  */
- export function editWebsite(ids){
-    return post(`${PREFIX_Sentiment}/updateWebsite`,ids);
+export function editWebsite(ids) {
+    return post(`${PREFIX_Sentiment}/updateWebsite`, ids);
 }
 
 /**
@@ -195,8 +195,8 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} name
  * @returns 
  */
- export function addCountry(param){
-    return post(`${PREFIX_Sentiment}/addSource`,param);
+export function addCountry(param) {
+    return post(`${PREFIX_Sentiment}/addSource`, param);
 }
 
 /**
@@ -205,7 +205,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} name
  * @returns 
  */
- export function editCountry(param){
+export function editCountry(param) {
     return post(`${PREFIX_Sentiment}/updateSource?id=${param.id}&name=${param.name}`);
 }
 
@@ -214,7 +214,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} id
  * @returns 
  */
- export function removeCountry(id){
+export function removeCountry(id) {
     return post(`${PREFIX_Sentiment}/removeSource?id=${id}`);
 }
 
@@ -225,9 +225,9 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} parentId
  * @returns 
  */
- export function addQuestionOptionsTreeNode(label,type,parentId){
+export function addQuestionOptionsTreeNode(label, type, parentId) {
     let url = `${PREFIX}/addQuestionOptionsTreeNode`;
-    url += addParam({ label, type, parentId});
+    url += addParam({ label, type, parentId });
     return post(url);
 }
 
@@ -236,7 +236,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} id
  * @returns 
  */
- export function removeQuestionOptionsTreeNode(id){
+export function removeQuestionOptionsTreeNode(id) {
     return delete_util(`${PREFIX}/removeQuestionOptionsTreeNode?id=${id}`);
 }
 
@@ -246,7 +246,7 @@ export function queryAnswerQuestionRecord(questionId, pageNum, pageSize) {
  * @param {*} id
  * @returns 
  */
- export function updateQuestionOptionsTreeNode(label,id){
+export function updateQuestionOptionsTreeNode(label, id) {
     return post(`${PREFIX}/updateQuestionOptionsTreeNode?label=${label}&id=${id}`);
 }
 //#endregion
\ No newline at end of file

src/view/ddkz/components/chatRoomMemberDialog.vue

@@ -115,7 +115,7 @@ export default {
 <style lang="scss">
 .info-personInfo {
     width: 100%;
-    height: 40%;
+    height: 42%;
     overflow-y: auto;
 
     .title {
@@ -230,7 +230,7 @@ export default {
         }
     }
     .personInfo-footer{
-        width: 100%;
+        width: 98%;
         height: 50px;
         text-align: right;
     }

src/view/ddkz/components/noticeDialog.vue

@@ -138,7 +138,9 @@ export default {
         text-align: center;
 
         .el-dialog__headerbtn {
-            top: 40px;
+            top: 35px;
+            right: 30px;
+            font-size: 25px;
         }
     }
 

src/view/sjgl/ddkzConfig/ddkzConfigApprove.vue

@@ -85,7 +85,7 @@ export default {
             })
         },
         searchChatList() {
-            if (this.form.dateRange.length == 2) {
+            if (this.form.dateRange&&this.form.dateRange.length == 2) {
                 this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, this.form.dateRange[0], this.form.dateRange[1], this.userInfo.account, this.form.status);
             } else {
                 this.getApprovalPendingFn(this.form.chatRoomName, this.pageObj.currentPage, this.pageObj.pageSize, null, null, this.userInfo.account, this.form.status);
@@ -94,7 +94,7 @@ export default {
         getApprovalPendingFn(...params) {
             getApprovalPending(...params).then(res => {
                 this.meetingList = res.records;
-                this.pageObj.currentPage = res.currentPage;
+                this.pageObj.currentPage = res.currPage;
                 this.pageObj.pageSize = res.pageSize;
                 this.pageObj.total = res.total;
             }).catch(error => {

src/view/sjgl/ddkzConfig/ddkzConfigList.vue

@@ -129,7 +129,7 @@ export default {
             });
         },
         searchChatList() {
-            if (this.form.dateRange.length == 2) {
+            if (this.form.dateRange&&this.form.dateRange.length == 2) {
                 this.queryChatRoomListFn({ startTime: this.form.dateRange[0], endTime: this.form.dateRange[1], userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })
             } else {
                 this.queryChatRoomListFn({ userId: this.userInfo.account, status: this.form.status == '' ? null : this.form.status, keyword: this.form.keyword == '' ? null : this.form.keyword })

src/view/user/yhgl.vue

@@ -47,8 +47,8 @@
           </tbody>
         </table> -->
 
-        <el-table class="myTable" ref="multipleTable" :data="data_table"  style="width: 100%" stripe
-          height="100%" @selection-change="handleSelectionChange">
+        <el-table class="myTable" ref="multipleTable" :data="data_table" style="width: 100%" stripe height="100%"
+          @selection-change="handleSelectionChange">
           <el-table-column type="selection" align="center" :selectable="handleDisable"></el-table-column>
           <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
           <el-table-column prop="account" label="登录用户名" align="center"></el-table-column>
@@ -672,7 +672,7 @@ export default {
           return Promise.resolve();
         }
       }).then(res => {
-        post("api/rest/system/user/register", this.new_user)
+        return post("api/rest/system/user/register", this.new_user)
       }).then(res => {
         this.$message.success("新增成功！");
         this.centerDialogVisible = false;
@@ -685,6 +685,9 @@ export default {
           this.$message.warning("数据验证失败");
         } else {
           this.$message.warning(err.message);
+          if (err.code == 9061) {
+            this.new_user.mail && removeUser(this.new_user.mail);//如果创建了邮箱这里删除一下
+          }
         }
       });
     },

src/view/xxxl/tklb.vue

@@ -198,13 +198,14 @@ export default {
     //题库修改弹出框
     handleEdit(item) {
       let _this = this;
-      _this.form_edit = {
-        name: item.questionsName,
-        id: item.id,
-      };
+
       _this.centerDialogVisible_edit = true;
       setTimeout(function () {
         _this.$refs.numberValidateForm1.resetFields();
+        _this.form_edit = {
+          name: item.questionsName,
+          id: item.id,
+        };
       }, 200)
     },
     //题库删除
@@ -247,7 +248,7 @@ export default {
     handleCurrentChange_qw(pageNum) {
       let _this = this;
       let paramDatas = {
-        questionsName: _this.input == "" ? null : _this.input,
+        questionName: _this.input == "" ? null : _this.input,
         pageNum: pageNum,
         pageRow: _this.pageRow,
       };

src/view/xxxl/xdzylb.vue

@@ -3,11 +3,11 @@
     <div class="top-div">
       <el-input v-model="wd_name" suffix-icon="el-icon-search" placeholder="请输入关键字"></el-input>
       <div class="block sjxz">
-        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="sc_time" type="daterange" range-separator="至"
-          start-placeholder="上传起始时间" end-placeholder="上传结束时间" :default-time="['00:00:00', '23:59:59']">
+        <el-date-picker value-format="yyyy-MM-dd" v-model="sc_time" type="daterange" range-separator="至"
+          start-placeholder="上传起始时间" end-placeholder="上传结束时间">
         </el-date-picker>
       </div>
-      <div class="button-discuss" @click="searchs()">搜索</div>
+      <div class="button-discuss" @click="searchList()">搜索</div>
     </div>
     <div class="bottom-div">
       <div class="table-div">
@@ -171,17 +171,17 @@ export default {
     history_div(row) {
       this.dialogVisible_lsjl = true;
       queryAnswerQuestionRecord(row.id, 1, 10).then((res) => {
-          this.tableData_history = res.list.map((e) => {
-            return {
-              qkfx: e.fullAnalysis,
-              czcs: e.fullMeasure,
-              create: e.answerer,
-              time: e.createTime,
-              qkfxScore: e.score1 * 100,
-              czcsScore: e.score2 * 100,
-            };
-          });
-        })
+        this.tableData_history = res.list.map((e) => {
+          return {
+            qkfx: e.fullAnalysis,
+            czcs: e.fullMeasure,
+            create: e.answerer,
+            time: e.createTime,
+            qkfxScore: e.score1 * 100,
+            czcsScore: e.score2 * 100,
+          };
+        });
+      })
         .catch((err) => {
           this.$message.warning(err.message);
         });
@@ -235,6 +235,10 @@ export default {
       let _this = this;
       _this.handleCurrentChange_lb(1);
     },
+    //搜索列表
+    searchList() {
+      this.handleCurrentChange_lb(1);
+    },
     //pageSize改变事件
     handleSizeChange(val) {
       this.pageSize = val;
@@ -256,7 +260,7 @@ export default {
         name: _this.wd_name == "" ? null : _this.wd_name,
       };
 
-      queryQuestion(pageNum, this.pageSize, this.wd_name, this.treeId)
+      queryQuestion(pageNum, this.pageSize, _this.paramData.name, this.treeId, _this.paramData.beginTime, _this.paramData.endTime)
         .then((res) => {
           this.tableData = res.list;
           this.total = res.totals;
@@ -407,6 +411,7 @@ export default {
   overflow: hidden;
   background-size: 100% 100%;
   color: white;
+
   .el-tabs--card>.el-tabs__header {
     border-bottom: 1px solid #146a80;
   }