跳转

src/api/sstt.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getSsttToken(params) {
+  return request({
+    url: '/api/admin/sso/get-token',
+    method: 'get',
+    params:params
+  })
+}
+
+export function getSsttIndex(params) {
+  return request({
+    url: '/api/admin/sso/schedule-index',
+    method: 'get',
+    params:params
+  })
+}

src/views/book/sstt.vue

@@ -0,0 +1,39 @@
+<template>
+</template>
+
+<script>
+  import {
+    getSsttToken
+  } from "@/api/sstt";
+  export default{
+    data(){
+      return{
+        window: {
+          width: 0,
+          height: 0,
+          top: 0,
+          left: 0
+        },
+      }
+    },
+    created() {
+      this.window.width = screen.availWidth * 0.95
+      this.window.height = screen.availHeight * 0.95
+      this.window.top = (window.screen.height - 30 - this.window.height) / 2
+      this.window.left = (window.screen.width - 10 - this.window.width) / 2
+      this.toSstt()
+    },
+    methods:{
+      async toSstt(){
+        let res = await getSsttToken()
+        let url = 'https://sstt.115.langye.net/admin/#/login?sstt_token='+res.sstt_token
+        let seeBuy = window.open(url, 'follow',
+          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+          )
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

src/views/component/table.vue

@@ -316,6 +316,8 @@ export default {
       title: "",
       op,
       select: {
+        page: 1, 
+        page_size: 40,
         table_name: "",
         filter: [
           {
@@ -350,7 +352,7 @@ export default {
 
     async exportExcel(sheetName) {
       const res = await index(
-        Object.assign(this.select, { page: 1, page_size: 9999 })
+        Object.assign(this.select, { page: 1, page_size: 99999 })
       );
       if (res.data) {
         let headers = this.exportForm.map((i) => {

src/views/dashboard/index.vue

@@ -84,7 +84,8 @@
         }).catch()
         await getRecordsCharts().then((res) => {
           for(var k of res){
-            this.record_data.x.push(k.value)
+            let value = k.value=='茅山旅游度假区'?'茅山':k.value
+            this.record_data.x.push(value)
             this.record_data.y.push(k.record_total)
           }
         }).catch()

src/views/jsc/components/echartsPie.vue

@@ -59,7 +59,7 @@
                     '#ef6567',
                     '#f9c956',
                     '#c968e1',
-                    '#2135f6',
+                    '#00ffff',
                     '#d9c9a3'
                   ];
                   return colorList[colors.dataIndex];
@@ -80,4 +80,4 @@
 </script>
 
 <style>
-</style>
+</style>

src/views/jsc/index.vue

@@ -27,7 +27,7 @@
         <div style="height:30%" class='jscL2'>
           <div class='comtitle'>
             <img src="../../assets/jsc/icon2.png" alt="">
-            街道残疾人数
+            镇街道残疾人数
           </div>
           <div class="jscL2chart">
             <echartsPie ref="echartsPie" :pieData='peopleData' :radiusType='radiusType'></echartsPie>

src/views/record/components/addRecord.vue

@@ -123,6 +123,36 @@
             </el-select>
           </div>
         </div>
+      </template>
+      <template v-slot:hobily>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>特长：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.hobily" placeholder="请输入特长" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:isjob>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>就业情况：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.isjob" placeholder="请输入就业情况" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>就业单位：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.company" placeholder="请输入就业单位" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
       </template>
       <template v-slot:household>
         <div class="xy-table-item">
@@ -363,7 +393,10 @@
           idcard: "",
           mobile: "",
           telephone: "",
-          education: "",
+          education: "",
+          hobily:"",
+           isjob:'',
+            company:"",
           household: "",
           address: "",
           reside: "",
@@ -452,7 +485,10 @@
           idcard: res?.idcard,
           mobile: res?.mobile,
           telephone: res?.telephone,
-          education: res?.education,
+          education: res?.education,
+          hobily:res?.hobily,
+          isjob:res?.isjob,
+          company:res?.company,
           household: res?.household,
           address: res?.address,
           reside: res?.reside,

src/views/record/index.vue

@@ -68,7 +68,10 @@
   } from "@/api/system/customFormField";
   import {
     getparameter
-  } from "@/api/system/dictionary";
+  } from "@/api/system/dictionary";
+  import {
+    getSsttToken
+  } from "@/api/sstt";
   export default {
     components: {
       addRecord,
@@ -76,9 +79,10 @@
       imports
     },
     data() {
-      return {
+      return {
+
         select: {
-          pageSize: 10,
+          pageSize: 40,
           pageIndex: 1,
           keyword: "",
           street:''

src/views/record/personinfo.vue

@@ -114,7 +114,9 @@
         }
         if(res.idcard_workflows_idcard_relation.length>0){
           for(var k of res.idcard_workflows_idcard_relation){
+
             if(k.work_status=='通过'){
+              console.log(k)
               workflows+=`<p>${k.created_at?.substring(0,10)}/${k.guanlianbiaoming}<p>`
             }
           }

src/views/viewrecords/components/addViewRecord.vue

@@ -192,6 +192,36 @@
             </el-select>
           </div>
         </div>
+      </template>
+      <template v-slot:hobily>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>特长：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.hobily" placeholder="请输入特长" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:isjob>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>就业情况：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.isjob" placeholder="请输入就业情况" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>就业单位：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.company" placeholder="请输入就业单位" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
       </template>
       <template v-slot:household>
         <div class="xy-table-item">
@@ -445,7 +475,10 @@
           idcard: "",
           mobile: "",
           telephone: "",
-          education: "",
+          education: "",
+          hobily:"",
+           isjob:'',
+            company:"",
           household: "",
           address: "",
           reside: "",
@@ -560,7 +593,11 @@
           idcard: res?.idcard,
           mobile: res?.mobile,
           telephone: res?.telephone,
-          education: res?.education,
+          education: res?.education,
+          education: res?.education,
+          hobily:res?.hobily,
+          isjob:res?.isjob,
+          company:res?.company,
           household: res?.household,
           address: res?.address,
           reside: res?.reside,
@@ -607,7 +644,11 @@
           idcard: res?.idcard,
           mobile: res?.mobile,
           telephone: res?.telephone,
-          education: res?.education,
+          education: res?.education,
+          education: res?.education,
+          hobily:res?.hobily,
+          isjob:res?.isjob,
+          company:res?.company,
           household: res?.household,
           address: res?.address,
           reside: res?.reside,