Merge branch 'master' of https://code.palacesun.com/wuchao/jilinzhongdianrenqun-web

src/api/common.js

@@ -18,11 +18,10 @@ export const getCityList = (data) => {
   })
 }
 
-// 上传图片到民政生产服务器
+// 上传图片到后台上传服务
 export const uploadPic = (data) => {
   return axios.request({
-    // url: 'http://10.40.20.11:5000/api/uc/csc/auditOrderService/uploadPic',
-    url: '/api/uc/mzsc/uploadService/uploadPic',
+    url: '/api/ac/jilinsscgsdp/uploadService/uploadFile',
     data: data,
     method: 'post'
   })

src/view/key-person/index.vue

@@ -20,23 +20,23 @@
         </Col>
         <Col span="8">
             <Card style="width:90%">
-         <div class="statistics-bar-top-ii" @click="toPage('/special/personMinor')">
-          <div class="i-top-ii">重点未成年人</div>
-          <div class="i-center-ii">{{ scoreData.minors.total }}人</div>
+        <div class="statistics-bar-top-iii" @click="toPage('/special/peopleInfo2')">
+          <div class="i-top-iii">刑满释放人员</div>
+          <div class="i-center-iii">{{ scoreData.released.total }}人</div>
         </div>
         <div style="width: 100%;height: 300px; margin-top: 20px;" ref="main" >
-            <div style="width: 100%;height: 100%; margin-top: 20px;" id="pie2"></div>
+             <div style="width: 100%;height: 100%; margin-top: 20px;" id="pie3"></div>
         </div>
         </Card>
         </Col>
         <Col span="8">
             <Card style="width:90%">
-        <div class="statistics-bar-top-iii" @click="toPage('/special/peopleInfo2')">
-          <div class="i-top-iii">刑满释放人员</div>
-          <div class="i-center-iii">{{ scoreData.released.total }}人</div>
+         <div class="statistics-bar-top-ii" @click="toPage('/special/personMinor')">
+          <div class="i-top-ii">重点未成年人</div>
+          <div class="i-center-ii">{{ scoreData.minors.total }}人</div>
         </div>
         <div style="width: 100%;height: 300px; margin-top: 20px;" ref="main" >
-             <div style="width: 100%;height: 100%; margin-top: 20px;" id="pie3"></div>
+            <div style="width: 100%;height: 100%; margin-top: 20px;" id="pie2"></div>
         </div>
         </Card>
         </Col>
@@ -110,7 +110,7 @@
                 <Col span="8">
                     <div class="statistics-bar-top-i">
                         <div class="i-top">严重精神病患者</div>
-                        <div class="i-center-i">{{ overdueWarningData.mentalPatient.total }}人</div>
+                        <div class="i-center-i">{{ scoreData.mentalPatient.total }}人</div>
                         <div>
                             <Row>
                                 <Col span="12">
@@ -134,7 +134,7 @@
                 <Col span="8">
                     <div class="statistics-bar-top-iii">
                         <div class="i-top-iii">刑满释放人员</div>
-                        <div class="i-center-iii">{{ overdueWarningData.released.total }}人</div>
+                        <div class="i-center-iii">{{ scoreData.released.total }}人</div>
                         <div>
                             <Row>
                                 <Col span="12">
@@ -158,7 +158,7 @@
                 <Col span="8">
                     <div class="statistics-bar-top-ii">
                         <div class="i-top-ii">重点未成年人</div>
-                        <div class="i-center-ii">{{ overdueWarningData.minors.total }}人</div>
+                        <div class="i-center-ii">{{ scoreData.minors.total }}人</div>
                         <div>
                             <Row>
                                 <Col span="12">