Merge branch 'dev' of http://47.106.221.167:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/package.json

@@ -4,6 +4,8 @@
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",
+    "build1":"vue-cli-service build --mode test",
+    "build2":"vue-cli-service build --mode production",
     "lint": "vue-cli-service lint",
     "dev": "vue-cli-service serve"
   },

RMS-FrontEnd/src/config/index.js

@@ -1,5 +1,5 @@
 export default {
     baseURL: "/api",
     host: window.location.host,
-    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8081' : 'http://139.224.24.90:8083',
+    staticURL: process.env.NODE_ENV === 'production' ? 'http://139.224.24.90:8084' : 'http://139.224.24.90:8083',
 }

RMS-FrontEnd/src/views/layout/ReportAdmin.vue

@@ -18,7 +18,9 @@
           <el-main class="admin-main-box">
             <router-view></router-view>
           </el-main>
-          <Footer></Footer>
+          <el-footer style="height:44px" v-if="aside">
+            <Footer ></Footer>
+          </el-footer>
         </el-container>
       </el-container>
     </section>

RMS-FrontEnd/src/views/layout/index.vue

@@ -42,9 +42,12 @@
         <el-container>
           <el-header></el-header>
           <el-main class="admin-main-box">
-            <router-view style="100%"></router-view>
+            <router-view style=""></router-view>
           </el-main>
-          <Footer v-if="aside"></Footer>
+          <el-footer style="height:44px" v-if="aside">
+            <Footer ></Footer>
+          </el-footer>
+          
         </el-container>
       </el-container>
     </section>
@@ -210,6 +213,7 @@ export default {
   .wrapper {
     width: 100%;
     height: calc(100% - 71px);
+    // height: 100%;
 
     .el-menu-item.is-active {
       background: #ecf5ff !important;

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -289,7 +289,7 @@ export default {
     this.taskId = this.$s.getSession('params').taskId
     this.type = this.$s.getSession('params').type
     this.reportType = this.$s.getSession('params').reportType
-    this.reportStatus = this.$s.getSession('params').reportStatus
+    this.reportStatus = this.$s.getSession('params').reportStatus?this.$s.getSession('params').reportStatus:''
 
     this.reportId = this.$s.getSession('params').reportId
     console.log(this.$s.getSession('params'));

RMS-FrontEnd/src/views/report/components/Tabel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="data" border ref="table" :height="tableHeight-35" header-row-class-name="custom-table-header" @sort-change="sortChange">
+    <el-table :data="data" border ref="table" :height="tableHeight - 25" header-row-class-name="custom-table-header" @sort-change="sortChange">
       <el-table-column label="#" align="center" width="50px">
         <template slot-scope="scope">
           <span>{{ (scope.$index + 1) + ((params.current - 1) * params.size) }}</span>

RMS-FrontEnd/src/views/report/components/personnelList.vue

@@ -146,7 +146,7 @@ export default {
       this.getList()
     },
     handleClose2(){
-      this.allCheck = this.checkS
+      this.allCheck = this.checkS?JSON.parse(JSON.stringify(this.checkS)):[]
       this.check = []
       this.$emit('checked', this.allCheck)
       this.queryParams.name = ''

RMS-FrontEnd/src/views/report/components/sendCollaboration.vue

@@ -238,26 +238,28 @@ export default {
     },
     submit() {
       // 遍历checked数组，拼接名字邮箱
-      if (this.sign == 0) {//判断是协同人
-        this.queryParams.personEmail = ''
-        this.queryParams.handlePersonId = this.checked[0].id
-        this.clientForm.handlePersonIds = this.checked[0].name + "<" + this.checked[0].email + ">"
-      } else {
-        for (var i = 0; i < this.checked.length; i++) {
-          var a = this.checked[i].name + "<" + this.checked[i].email + ">"
-          console.log(a);
-          if (this.clientForm.syneryCCLists.indexOf(a) == -1) {
-            this.clientForm.syneryCCLists.push(a)
-            this.queryParams.syneryCCList.push({
-              ccId: this.checked[i].id,
-              ccEmail: this.checked[i].email,
-              ccName: this.checked[i].name
-            })
+      if(this.checked.length>0){
+        if (this.sign == 0) {//判断是协同人
+          this.queryParams.personEmail = ''
+          this.queryParams.handlePersonId = this.checked[0].id
+          this.clientForm.handlePersonIds = this.checked[0].name + "<" + this.checked[0].email + ">"
+        } else {
+          for (var i = 0; i < this.checked.length; i++) {
+            var a = this.checked[i].name + "<" + this.checked[i].email + ">"
+            console.log(a);
+            if (this.clientForm.syneryCCLists.indexOf(a) == -1) {
+              this.clientForm.syneryCCLists.push(a)
+              this.queryParams.syneryCCList.push({
+                ccId: this.checked[i].id,
+                ccEmail: this.checked[i].email,
+                ccName: this.checked[i].name
+              })
+            }
           }
-        }
 
+        }
       }
-
+      
       this.userInformation = false
     },
     //点击icon打开人员信息弹出框