Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght

# Conflicts:
#	xichongSys/src/views/Core/candode.vue

xichongSys/src/http/axios.js

@@ -18,6 +18,11 @@ export default function $axios(options) {
     // request 拦截器
     instance.interceptors.request.use(
       config => {
+        if(localStorage.getItem("token")){
+          Cookies.set('token',localStorage.getItem("token"))
+          console.log(localStorage.getItem("token"))
+         
+        }
         let token = Cookies.get('token')
         // 1. 请求开始的时候可以结合 vuex 开启全屏 loading 动画
         // console.log(store.state.loading)
@@ -25,8 +30,9 @@ export default function $axios(options) {
         // 2. 带上token
         if (token) {
           config.headers.token = token
-        } else {
          
+        } else {
+         console.log("重定向到登录页面")
           // 重定向到登录页面
           router.push('/login')
         }

xichongSys/src/router/index.js

@@ -203,6 +203,11 @@ router.beforeEach((to, from, next) => {
  
   // 登录界面登录成功之后，会把用户信息保存在会话
   // 存在时间为会话生命周期，页面关闭即失效。
+  if(localStorage.getItem("token")){
+    Cookies.set('token',localStorage.getItem("token"))
+   
+   
+  }
   let token = Cookies.get('token')
   let userName = sessionStorage.getItem('user')
   if (to.path === '/login') {

xichongSys/src/utils/global.js

@@ -5,10 +5,11 @@
  */
 
 // 后台管理系统服务器地址
+// export const baseUrl2 = 'http://xclc.rensheju.com'
+// //export const baseUrl = 'http://xc.rensheju.com'
+// export const baseUrl = 'http://172.16.10.33:9002'
 export const baseUrl2 = 'http://xclc.rensheju.com'
-//export const baseUrl = 'http://xc.rensheju.com'
-export const baseUrl = 'http://172.16.10.33:9002'
-
+export const baseUrl = 'http://xc.rensheju.com'
 
 export default {
     baseUrl,

xichongSys/src/views/Core/KtTable.vue

@@ -10,6 +10,20 @@
         :fixed="column.fixed" :key="column.prop" :type="column.type" :formatter="column.formatter"
         :sortable="column.sortable==null?true:column.sortable">
       </el-table-column>
+      <el-table-column
+        v-if="showSeal"
+        label="签章">
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.sealStr !== null && scope.row.sealStr != ''"
+            placement="left"
+            title=""
+            trigger="hover">
+            <img slot="reference" :src="'data:image/jpg;base64,' + scope.row.sealStr" height="50px" width="50px" class="head_pic">
+            <img :src="'data:image/jpg;base64,' + scope.row.sealStr" height="200px" width="200px" class="head_pic"/>
+          </el-popover>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
         <template slot-scope="scope">
           <kt-button v-if="scope.row.name!=='admin'" icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
@@ -94,7 +108,11 @@ export default {
     showBatchDelete: {  // 是否显示操作组件
       type: Boolean,
       default: true
-    }
+    },
+    showSeal: {  // 是否显示操作组件
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {

xichongSys/src/views/Intro/Intro.vue

 <template>
-  <el-carousel :interval="100000" type="card"  class="carousel" height="70vh" >
+  <el-carousel :interval="100000000000000000"  style="margin-top:30px" type="card"  class="carousel" height="70vh" >
     <el-carousel-item class="carousel-item-intro"  style="width:85%; height:100%;position:absolute;left:-18%;">
       <div class="ddiv1">
         <div class="div1" id="echartContainer1">
         </div>
-        <div class="nextpage">
+        <div class="nextpage" style="margin-top:50px">
           <p style="display:none">{{count}}</p>
-          <el-button  class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
-          <el-button  class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
+          <el-button size="mini"  class="gopagediv1" @click="goPageClick1"> 上一页</el-button>
+          <el-button size="mini" class="gopagediv1" @click="nextPageClick1"> 下一页</el-button>
         </div>
       </div>
     </el-carousel-item>
-    <el-carousel-item class="carousel-item-func"  style="width:85%;height:100%;position:absolute;left:-18%">
+    <!-- <el-carousel-item class="carousel-item-func"  style="width:85%;height:100%;position:absolute;left:-18%">
       <div class="ddiv2">
         <div class="div2" id="echartContainer2" ></div>
       </div>
@@ -19,7 +19,7 @@
       </div>
     </el-carousel-item>
     <el-carousel-item class="carousel-item-env"  style="width:85%;height:100%;position:absolute;left:-18%;">
-    </el-carousel-item>
+    </el-carousel-item> -->
   </el-carousel>
 </template>
 
@@ -267,7 +267,7 @@
           this.echartzz=JSON.parse(sessionStorage.getItem("lj"));
           this.chartinfo(this.chartdata);
         }else {
-          alert('已经到最后一页了');
+          this.$message.error('已经是最后一页了');
         }
 
       },
@@ -278,7 +278,7 @@
         this.chartdata.chartsize=10;
         console.log(this.count);
         if(this.count<1){
-          alert('已经第一页了');
+          this.$message.error('已经是第一页了');
         }else{
           this.echartzz=JSON.parse(sessionStorage.getItem("lj"));
           this.chartinfo(this.chartdata);
@@ -296,7 +296,7 @@
 
 <style>
   .carousel-item-intro {
-    background-color: #EFF3F4;
+    background-color:#a3b3b965;
     -webkit-border-radius: 25px;
     border-radius: 25px;
     -moz-border-radius: 15px;
@@ -329,8 +329,7 @@
     height:65%;
     margin-top: 5%;
   }
-  .nextpage{
-  }
+  
 
   .ddiv2{
     margin: auto;

xichongSys/src/views/Myvue/authRecordphone.vue

 <template>
 <div>
     <div class="sele">
-   <Candode v-on:childByValue="childByValue"></Candode>
-   <el-input v-model="idcard" style="width:50%" size="mini" clearable placeholder="请输入身份证号"></el-input>
-   <el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" @click="serch">搜索</el-button>
+   <Candode v-on:childByValue="childByValue" style="width:30%"></Candode>
+   <el-input v-model="idcard" style="width:30%" size="mini" clearable placeholder="请输入身份证号"></el-input>
+   
+    <div class="s"  style="width:30%">
+  <el-select size="mini" @change="torz" clearable  v-model="state" placeholder="所有状态">
+    <el-option
+      v-for="item3 in stateList"
+      :key="item3.value"
+      :label="item3.label"
+      :value="item3.value">
+    </el-option>
+  </el-select>
+</div>
+<el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search" @click="serch">搜索</el-button>
    </div>
   <el-table
     :data="tableData"
@@ -33,20 +44,23 @@
      
     
   </el-table>
+  <div style="width:100%;height:80px;overflow:scroll;margin-bottom:20px">
   <el-pagination
   	class="pone"
       :page-size='10'
-      layout="total, prev, pager, next, jumper"
+      layout="total, prev, pager, next"
       :total="totals"
       :current-page.sync="Page"
       @current-change="current_change"
+      small
 >
 
     </el-pagination>
     </div>
+  </div>
 </template>
 
-<style>
+<style scoped>
 .op{
   display: flex;
   align-items: center;
@@ -76,11 +90,10 @@
   .el-timeline{
     padding-left: 20px
   }
-  .add{
-      margin-left: 20px
-  }
+  
   .sele{
-      display: flex
+      display: flex;
+      margin-top: 10px
   }
 </style>
 

xichongSys/src/views/Myvue/infoChange.vue

@@ -257,7 +257,7 @@ export default {
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },

xichongSys/src/views/Myvue/insuranceCancellationAudit.vue

@@ -239,6 +239,7 @@
               this.$router.push({
                 name: "参保注销审核"
               });
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -304,6 +305,7 @@
                   message: res.message
                 });
               }
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {

xichongSys/src/views/Myvue/insuredReg.vue

@@ -155,6 +155,7 @@ export default {
             message: res.message
           });
           }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -216,6 +217,7 @@ export default {
             message: res.message
           });
           }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -248,7 +250,7 @@ export default {
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },

xichongSys/src/views/Myvue/receivePersonnel.vue

@@ -223,12 +223,12 @@
 
   .idc {
     margin-left: 20px;
-    /*min-width: 200px;*/
+    min-width: 200px;
   }
 
   .nam {
     margin-left: 20px;
-    /*min-width: 200px;*/
+    min-width: 200px;
   }
 
   .grantState {

xichongSys/src/views/Myvue/supPaymentAudit.vue

@@ -164,6 +164,7 @@
                 message: res.message
               });
             }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -223,6 +224,7 @@
                   message: res.message
                 });
               }
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -254,7 +256,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },

xichongSys/src/views/Myvue/traRelationsAudit.vue

@@ -152,6 +152,7 @@
                 message: res.message
               });
             }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -211,6 +212,7 @@
                   message: res.message
                 });
               }
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -242,7 +244,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },

xichongSys/src/views/Myvue/treatmentApplicationAudit.vue

@@ -86,6 +86,14 @@
             </div>
           </el-image>
         </div>
+        <div class="block">
+          <p class="demonstration">个人照片</p>
+          <el-image :src="urls[4]">
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </div>
       </div>
     </div>
     <div style="text-align:center;margin-bottom:40px" v-show="show">
@@ -174,6 +182,7 @@
                 message: res.message
               });
             }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -234,6 +243,7 @@
                   message: res.message
                 });
               }
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -265,7 +275,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },
@@ -315,6 +325,11 @@
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.signpic);
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
       this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
+      if (this.form.personPhoto != null && this.form.personPhoto !== '') {
+        this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + this.form.personPhoto);
+      } else {
+        this.urls.push("");
+      }
       this.form.sex = this.form.sex === 1 ? "男" : "女";
     }
   }

xichongSys/src/views/Myvue/upgradeReoAudit.vue

@@ -159,6 +159,7 @@
                 message: res.message
               });
             }
+            this.$router.back();
             // 关闭当前标签
             let closeAll = document.querySelectorAll(".el-icon-close");
             for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -218,6 +219,7 @@
                   message: res.message
                 });
               }
+              this.$router.back();
               // 关闭当前标签
               let closeAll = document.querySelectorAll(".el-icon-close");
               for(let j = 0, len = closeAll.length; j < len; j++) {
@@ -249,7 +251,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入'
+            message: '已取消输入'
           });
         });
       },

xichongSys/src/views/Sys/Role.vue

@@ -17,7 +17,7 @@
 	<!--表格内容栏-->
 	<kt-table :height="220" permsEdit="sys:role:edit" permsDelete="sys:role:delete" :highlightCurrentRow="true" :stripe="false"
 		:data="pageResult" :columns="columns" :showBatchDelete="false" @handleCurrentChange="handleRoleSelectChange"
-		@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete">
+		@findPage="findPage" @handleEdit="handleEdit" @handleDelete="handleDelete" :showSeal="true">
 	</kt-table>
 	<!-- </el-col> -->
 	<!--新增编辑界面-->
@@ -29,10 +29,32 @@
 			<el-form-item label="角色名" prop="name">
 				<el-input v-model="dataForm.name" auto-complete="off"></el-input>
 			</el-form-item>
-			<el-form-item label="备注 " prop="remark">
+			<el-form-item label="备注" prop="remark">
 				<el-input v-model="dataForm.remark" auto-complete="off" type="textarea"></el-input>
 			</el-form-item>
-
+      <el-form-item label="签章" prop="seal" align="left">
+        <el-popover
+          v-if="dataForm.sealStr !== null && dataForm.sealStr != ''"
+          placement="left"
+          title=""
+          trigger="hover">
+          <img slot="reference" :src="'data:image/jpg;base64,' + dataForm.sealStr" height="50px" width="50px" class="head_pic">
+          <img :src="'data:image/jpg;base64,' + dataForm.sealStr" height="200px" width="200px" class="head_pic"/>
+        </el-popover>
+        <el-upload
+          align="left"
+          class="upload-demo"
+          ref="upload"
+          action=""
+          accept=".png,.jpg"
+          :on-change="changeSeal"
+          :limit="1"
+          :file-list="sealUrl"
+          :auto-upload="false">
+          <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传jpg/png文件</div>
+        </el-upload>
+      </el-form-item>
 		</el-form>
 		<div slot="footer" class="dialog-footer">
 			<el-button :size="size" @click.native="dialogVisible = false">{{$t('action.cancel')}}</el-button>
@@ -84,7 +106,8 @@ export default {
 				{prop:"name", label:"角色名", minWidth:120},
 				{prop:"remark", label:"备注", minWidth:120},
 				{prop:"createBy", label:"创建人", minWidth:120},
-				{prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
+        {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat},
+        // {prop:"seal", label:"签章", minWidth:120}
 				// {prop:"lastUpdateBy", label:"更新人", minWidth:100},
 				// {prop:"lastUpdateTime", label:"更新时间", minWidth:120, formatter:this.dateFormat}
 			],
@@ -103,7 +126,9 @@ export default {
 			dataForm: {
 				id: 0,
 				name: '',
-				remark: ''
+				remark: '',
+        seal: '',
+        sealStr: ''
 			},
 			selectRole: {},
 			menuData: [],
@@ -115,7 +140,10 @@ export default {
 			defaultProps: {
 				children: 'children',
 				label: 'name'
-			}
+			},
+      sealUrl: [],
+      sealVisible: false,
+      imageUrl: '',
 		}
 	},
 	methods: {
@@ -156,6 +184,7 @@ export default {
 				if (valid) {
 					this.$confirm('确认提交吗？', '提示', {}).then(() => {
 						this.editLoading = true
+            console.log(this.dataForm);
             let params = Object.assign({}, this.dataForm)
 						this.$api.role.save(params).then((res) => {
 							this.editLoading = false
@@ -270,8 +299,32 @@ export default {
 		// 时间格式化
       	dateFormat: function (row, column, cellValue, index){
           	return format(row[column.property])
-      	}
-
+      	},
+    changeSeal(file) {
+		  var This = this;
+		  this.sealUrl.length = 0;
+		  this.sealUrl.push(file);
+      if (this.sealUrl.length > 0) {
+        var aa;
+        aa = this.convertImageToBase64();
+        console.log(aa);
+        console.log(this.dataForm);
+      }
+    },
+    convertImageToBase64() {
+		  var This = this;
+		  var base64;
+		  let reader = new FileReader();
+		  reader.readAsDataURL(this.sealUrl[0].raw);
+		  reader.onload = function (e) {
+		    console.log(this.result.substring(this.result.indexOf(",") + 1));
+		    base64 =  this.result.substring(this.result.indexOf(",") + 1);
+		    This.sealUrl[0] = this.result.substring(this.result.indexOf(",") + 1);
+      }
+      console.log(This.sealUrl[0]);
+      console.log(base64);
+      return base64;
+    }
 	},
 	mounted() {
 	}
@@ -289,4 +342,28 @@ export default {
 	color: rgb(20, 89, 121);
 
 }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
 </style>