Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -104,7 +104,7 @@
       >导 出</el-button>
       <el-button
         @click="dialogVisible = false"
-        class="confirmBtn"
+        class="cancelBtn"
         type="primary"
       >取 消</el-button>
     </span>
@@ -332,8 +332,16 @@ export default {
     display: none;
   }
 }
-.confirmBtn {
+.confirmBtn,
+.cancelBtn {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
+.cancelBtn {
+  background-color: #055fe7;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -322,7 +322,7 @@
       >导 出</el-button>
       <el-button
         @click="dialogVisible = false"
-        class="confirmBtn"
+        class="cancelBtn"
         type="primary"
       >取 消</el-button>
       <!-- <el-button
@@ -904,8 +904,16 @@ export default {
   //   padding-left: 5px;
   // }
 }
-.confirmBtn {
+.confirmBtn,
+.cancelBtn {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
+.cancelBtn {
+  background-color: #055fe7;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/fcx.vue

@@ -988,7 +988,7 @@ export default {
             let failInfo = response.data.ret.failInfo
             this.$message({
               dangerouslyUseHTMLString: true,
-              message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div>`,
+              message: `发查询成功<div>本次发送成功${successBarcode.length}条，<span style='color:red'>发送失败${failInfo.length}条</span></div><div style='color:red'>${failInfo}</div> `,
               type: 'success'
             });
             cityOptions = []
@@ -1487,4 +1487,8 @@ export default {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/fztm.vue

@@ -233,4 +233,8 @@ export default {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/ggrytm.vue

@@ -241,4 +241,8 @@ export default {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/gz.vue

@@ -302,4 +302,8 @@ export default {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/tjddl.vue

@@ -319,4 +319,8 @@ export default {
   width: 72px;
   height: 40px;
 }
+.confirmBtn {
+  background-color: #fff;
+  color: #333333;
+}
 </style>
\ No newline at end of file

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -483,6 +483,7 @@ export default {
 /deep/.el-button {
   width: 142px;
   height: 40px;
+  color: #333333;
   background: #ffffff;
   border-radius: 4px;
   border: 1px solid #aeb5c2;
@@ -490,6 +491,7 @@ export default {
 /deep/.el-button--primary {
   border-color: #055fe7;
   background: #055fe7;
+  color: #fff;
   width: 72px;
   height: 40px;
 }

src/views/AllPersonnelBase/modules/xzry.vue

@@ -473,7 +473,7 @@
       slot="footer"
       class="dialog-footer"
     >
-      <el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button>
+      <el-button @click="submitForm('ruleForm')">提交</el-button>
       <el-button
         @click="resetForm('ruleForm')"
         type="primary"
@@ -738,15 +738,17 @@ export default {
   }
 }
 /deep/.el-button {
-  width: 142px;
+  width: 72px;
   height: 40px;
   background: #ffffff;
+  color: #333333;
   border-radius: 4px;
   border: 1px solid #aeb5c2;
 }
 /deep/.el-button--primary {
   border-color: #055fe7;
   background: #055fe7;
+  color: #fff;
   width: 72px;
   height: 40px;
 }

src/views/drFPTX/Index.vue

@@ -824,16 +824,22 @@ export default {
     },
     // 选中
     handelSelect () {
+      // let self = this
 
-      console.log('重复文件过滤', this.nowSelectData)
+      // console.log('重复文件过滤1', this.nowSelectData)
+      // console.log('重复文件过滤2', this.selectArr)
 
       // if (this.selectArr.length > 0) {
       //   for (var i = 0; i <= this.selectArr.length; i++) {
+      //     // console.log(this.selectArr[i].name);
+      //     // console.log(9999, this.nowSelectData[i].name);
       //     // 重复文件过滤
-      //     let existFile = this.nowSelectData.slice(0, this.nowSelectData.length - 1).find(f => f.name === this.selectArr[i].name)
+      //     console.log(this.nowSelectData);
+      //     console.log(this.nowSelectData.slice(0, self.nowSelectData.length));
+      //     let existFile = this.nowSelectData.slice(0, self.nowSelectData.length).find(f => f.name === self.selectArr[i].name)
       //     console.log('existFile', existFile)
       //     if (existFile) {
-      //       this.$message.error('当前文件已经存在!');
+      //       this.$message.error('请去除重复文件!');
       //       this.nowSelectData.pop()
       //     }
       //   }

vue.config.js

@@ -92,12 +92,12 @@ module.exports = {
         // target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
         // target: "http://172.18.108.2:8099/", // 张 认定
         // target: "http://192.168.128.110:8099", // 湖南-张
-        target: "http://192.168.128.114:8099",  // 湖南-马
+        // target: "http://192.168.128.114:8099",  // 湖南-马
         // target: "http://192.168.128.116:8099",  // 湖南-王
         // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/   ma
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
-        // target: "http://www.meetfood.cn:2390/",  // 湖南-线上
+        target: "http://www.meetfood.cn:2390/",  // 湖南-线上
 
         ws: true,
         changeOrigin: true,