From b7898acf56d0e7d8673cffd283ede924fc6f8219 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 2 Nov 2022 17:19:43 +0800
Subject: [PATCH] 11

---
 .../epidemic/travelPanshi/travelPanshi.vue    |  2 +-
 .../travelPanshi/travelPanshiDetail.vue       |  2 +-
 .../travelPanshi/travelPanshiForm.vue         | 14 +++---
 .../zhongdianxingcheng/detail.vue             | 16 +++---
 .../zhongdianxingcheng/zhongdianxingcheng.vue | 50 +++++++++----------
 5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
index 4a03e4b66..7d5da5cd9 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
@@ -192,7 +192,7 @@
                          show-overflow-tooltip
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="describe"
+        <el-table-column prop="describeContent"
                          header-align="center"
                          align="center"
                          label="来曹事由"
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
index 73edbe30f..130f71674 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
@@ -33,7 +33,7 @@
           </div>
           <div class="info-prop">
             <span class="info-title-3">来曹事由：</span>
-            <span>{{ formData.describe||'--'  }}</span>
+            <span>{{ formData.describeContent||'--'  }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-3">48小时核酸：</span>
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
index ecbab2883..dce1354cb 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -121,21 +121,21 @@
           </el-input>
         </el-form-item>
         <el-form-item label="来曹事由"
-                      prop="describe"
+                      prop="describeContent"
                       style="display: block">
           <el-input class="item_width_2"
                     placeholder="请输入来曹事由"
                     clearable
-                    v-model="formData.describe">
+                    v-model="formData.describeContent">
           </el-input>
         </el-form-item>
         <el-form-item label="48小时核酸"
                       prop="natOutcome"
                       style="display: block">
           <el-radio v-model="formData.natOutcome"
-                    label="1">阴性</el-radio>
+                    label="0">阴性</el-radio>
           <el-radio v-model="formData.natOutcome"
-                    label="2">阳性</el-radio>
+                    label="1">阳性</el-radio>
         </el-form-item>
 
         <el-form-item label="来到本地时间"
@@ -396,8 +396,8 @@ export default {
 
         registeredResidence: '',//户籍地（必填）
         sourceDetailAddress: '',//来源地--详细地址（必填）
-        describe: '',//来曹事由（必填）
-        natOutcome: '',//48小时核酸  1 阴性  2 阳性（必填）
+        describeContent: '',//来曹事由（必填）
+        natOutcome: '',//48小时核酸  0 阴性  1 阳性（必填）
         trafficType: '',//交通方式，来源字典表(traffic_type)	  （必填）
         sojournHistory: '',//7天内旅居史情况，字典表(sojourn_history)【磐石】 （非必填）
         isolateType: '',//隔离状态，字典表(isolate_type)【磐石】	 （非必填）
@@ -434,7 +434,7 @@ export default {
         sourceDetailAddress: [
           { required: true, message: '来源地详细地址不能为空', trigger: 'change' },
         ],
-        describe: [
+        describeContent: [
           { required: true, message: '来曹事由不能为空', trigger: 'change' },
         ],
         natOutcome: [
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
index c4a8538da..673928651 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
@@ -34,19 +34,19 @@
 
             <div class="info-prop">
               <span class="info-title-2">来曹事由：</span>
-              <span>{{ info.describe||'--' }}</span>
+              <span>{{ info.describeContent||'--' }}</span>
             </div>
             <div class="info-prop">
-              <span class="info-title-2">核酸检测结果：</span>
-              <span>{{ info.natOutcome||'--' }}</span>
+              <span class="info-title-2">48小时核酸：</span>
+              <span>{{ info.natOutComeName||'--' }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">7天旅居史：</span>
-              <span>{{ info.sojournHistory||'--' }}</span>
+              <span>{{ info.sojournHistoryName||'--' }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">隔离状态：</span>
-              <span>{{ info.isolateType||'--' }}</span>
+              <span>{{ info.isolateTypeName||'--' }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">来曹时间：</span>
@@ -91,7 +91,7 @@ export default {
         mobile: "",
         idCard: "",
         sourceAddress: "",
-        describe: "",
+        describeContent: "",
         natOutcome: "",
         sojournHistory: "",
         isolateType: "",
@@ -130,8 +130,8 @@ export default {
 
     //加载组织数据
     async getInfo () {
-      // const url = "/epmetuser/icTripReportRecord/emphasisTripDetail";
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail";
+      const url = "/epmetuser/tripreport/emphasisTripDetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icTripReportRecord/emphasisTripDetail";
       let params = {
         id: this.detailId,
       };
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
index b408c058f..4c6770756 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
@@ -112,43 +112,43 @@ export default {
           },
           {
             align: "center",
-            width: "5%",
+            width: "8%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "12%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "17%",
           },
           {
             align: "center",
-            width: "15%",
+            width: "18%",
           },
           {
             align: "center",
-            width: "15%",
+            width: "8%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "8%",
           },
           {
             align: "center",
-            width: "15%",
+            width: "10%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "8%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "8%",
           },
           {
             align: "center",
-            width: "10%",
+            width: "8%",
           },
         ],
         header: ["序号", "姓名", "手机号", "证件号", "来源地", "来曹事由", "48小时核酸", "来曹时间", "七天内旅居", "隔离状态", "操作"],
@@ -265,8 +265,8 @@ export default {
         this.$refs.pieChart.showLoading()
       }
 
-      // const url = "/epmetuser/tripreport/emphasisTripPieDetail";
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail";
+      const url = "/epmetuser/tripreport/emphasisTripPieDetail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/emphasisTripPieDetail";
       let params = {
         code: this.code,
 
@@ -275,16 +275,16 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        let dataTemp = [
-          { total: 50, dangerLevelName: '低风险', color: '#fac858', dangerLevel: '0' },
-          { total: 20, dangerLevelName: '中风险', color: '#fc8452', dangerLevel: '1' },
-          { total: 20, dangerLevelName: '高风险', color: '#ee6666', dangerLevel: '2' },
-        ]
+        // let dataTemp = [
+        //   { total: 50, dangerLevelName: '低风险', color: '#fac858', dangerLevel: '0' },
+        //   { total: 20, dangerLevelName: '中风险', color: '#fc8452', dangerLevel: '1' },
+        //   { total: 20, dangerLevelName: '高风险', color: '#ee6666', dangerLevel: '2' },
+        // ]
 
         this.pieData = []
         this.pieTotal = 0
 
-        dataTemp.forEach(element => {
+        data.forEach(element => {
           this.pieTotal = this.pieTotal + element.total
           let color = ''
           if (element.dangerLevel === '2') {
@@ -415,8 +415,8 @@ export default {
     //加载组织数据
     async getTable () {
 
-      // const url = "/epmetuser/tripreport/list";
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list";
+      const url = "/epmetuser/tripreport/list";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/tripreport/list";
       let params = {
         code: this.code,
         dangerLevel: this.dangerLevel,
@@ -437,11 +437,11 @@ export default {
             item.mobile ? item.mobile : '',
             item.idCard ? item.idCard : '',
             item.sourceAddress ? item.sourceAddress : '',
-            item.describe ? item.describe : '',
-            item.natOutcome ? item.natOutcome : '',
-            item.arriveDate ? item.arriveDate : 0,
-            item.sojournHistory ? item.sojournHistory : '',
-            item.isolateType ? item.isolateType : '',
+            item.describeContent ? item.describeContent : '',
+            item.natOutComeName ? item.natOutComeName : '',
+            item.arriveDate ? item.arriveDate : '',
+            item.sojournHistoryName ? item.sojournHistoryName : '',
+            item.isolateTypeName ? item.isolateTypeName : '',
             { type: "operate", list: ["查看"] },
           ];
         });