0807

src/views/networkAccess/registration.vue

@@ -478,37 +478,37 @@
 
                 <a-col :span="10">
                 <div v-if="size>=1">
-                  <a-form-model-item label="新办手机号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
+                  <a-form-model-item label="新办号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
                     <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                    <a-input v-model="model.newPhone" placeholder="新办手机号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.newPhone" placeholder="新办号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
                     <!--                    </a-radio-group>-->
                   </a-form-model-item>
                 </div>
                   <div v-show="size>=2">
-                    <a-form-model-item label="新办手机号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone2" placeholder="新办手机号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone2" placeholder="新办号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=3">
-                    <a-form-model-item label="新办手机号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone3" placeholder="新办手机号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone3" placeholder="新办号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=4">
-                    <a-form-model-item label="新办手机号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone4" placeholder="新办手机号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone4" placeholder="新办号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=5">
-                    <a-form-model-item label="新办手机号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
+                    <a-form-model-item label="新办号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone5" placeholder="新办手机号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone5" placeholder="新办号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
@@ -559,7 +559,7 @@
 
           <a-result
             status="success"
-            title="无风险请继续操作!"
+            title="系统未发现异常，请受理人员进行进一步研判!"
             sub-title="success." v-if="riskShow"
           >
             <template #extra>
@@ -866,14 +866,14 @@ export default {
           text: '非高危',
           value: '1',
         }, {
-          text: '已报关停',
+          text: '上报关停',
           value: '2',
 
         }, {
-          text: '已报蓝名单',
+          text: '上报蓝名单',
           value: '3',
         },{
-          text: '已报紫名单',
+          text: '上报紫名单',
           value: '4',
         }],
       defaultValue: "",
@@ -1374,13 +1374,13 @@ export default {
             numberResultsListStr=numberResultsListStr+'非高危'
           }
           if (item==='2'){
-            numberResultsListStr=numberResultsListStr+'已报关停'
+            numberResultsListStr=numberResultsListStr+'上报关停'
           }
           if (item==='3'){
-            numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+            numberResultsListStr=numberResultsListStr+'上报蓝名单 '
           }
           if (item==='4'){
-            numberResultsListStr=numberResultsListStr+' 已报紫名单'
+            numberResultsListStr=numberResultsListStr+' 上报紫名单'
           }
         }
         result[i].numberResults=numberResultsListStr
@@ -1804,12 +1804,13 @@ export default {
       //信息窗口实例
       var infoWindow = new AMap.InfoWindow({offset: new AMap.Pixel(0, -30)});
       //遍历生成多个标记点
+      var marker;
       data.forEach((val, key) => {
         console.log("属性：" + key + ",值：" + data.get(key));
         console.log("wordAddressname".indexOf("name"));
         console.log(key.includes("name"));
         if (!key.includes("name")) {
-          var marker = new AMap.Marker({
+            marker = new AMap.Marker({
             position: data.get(key),//不同标记点的经纬度
             map: map
           });
@@ -2541,13 +2542,13 @@ export default {
       //       numberResultsListStr=numberResultsListStr+'非高危'
       //     }
       //     if (item==='2'){
-      //       numberResultsListStr=numberResultsListStr+'已报关停'
+      //       numberResultsListStr=numberResultsListStr+'上报关停'
       //     }
       //     if (item==='3'){
-      //       numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+      //       numberResultsListStr=numberResultsListStr+'上报蓝名单 '
       //     }
       //     if (item==='4'){
-      //       numberResultsListStr=numberResultsListStr+' 已报紫名单'
+      //       numberResultsListStr=numberResultsListStr+' 上报紫名单'
       //     }
       //   }
       //   dataLists[0].numberResults=numberResultsListStr

src/views/networkAccess/registrationSelect.vue

@@ -476,37 +476,37 @@
 
                 <a-col :span="10">
                 <div v-if="size>=1">
-                  <a-form-model-item label="新办手机号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
+                  <a-form-model-item label="新办号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
                     <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                    <a-input v-model="model.newPhone" placeholder="新办手机号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.newPhone" placeholder="新办号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
                     <!--                    </a-radio-group>-->
                   </a-form-model-item>
                 </div>
                   <div v-show="size>=2">
-                    <a-form-model-item label="新办手机号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone2" placeholder="新办手机号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone2" placeholder="新办号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=3">
-                    <a-form-model-item label="新办手机号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone3" placeholder="新办手机号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone3" placeholder="新办号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=4">
-                    <a-form-model-item label="新办手机号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone4" placeholder="新办手机号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone4" placeholder="新办号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=5">
-                    <a-form-model-item label="新办手机号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
+                    <a-form-model-item label="新办号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone5" placeholder="新办手机号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone5" placeholder="新办号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
@@ -557,7 +557,7 @@
 
           <a-result
             status="success"
-            title="无风险请继续操作!"
+            title="系统未发现异常，请受理人员进行进一步研判!"
             sub-title="success." v-if="riskShow"
           >
             <template #extra>
@@ -864,14 +864,14 @@ export default {
           text: '非高危',
           value: '1',
         }, {
-          text: '已报关停',
+          text: '上报关停',
           value: '2',
 
         }, {
-          text: '已报蓝名单',
+          text: '上报蓝名单',
           value: '3',
         },{
-          text: '已报紫名单',
+          text: '上报紫名单',
           value: '4',
         }],
       defaultValue: "",
@@ -1373,13 +1373,13 @@ export default {
             numberResultsListStr=numberResultsListStr+'非高危'
           }
           if (item==='2'){
-            numberResultsListStr=numberResultsListStr+'已报关停'
+            numberResultsListStr=numberResultsListStr+'上报关停'
           }
           if (item==='3'){
-            numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+            numberResultsListStr=numberResultsListStr+'上报蓝名单 '
           }
           if (item==='4'){
-            numberResultsListStr=numberResultsListStr+' 已报紫名单'
+            numberResultsListStr=numberResultsListStr+' 上报紫名单'
           }
         }
         result[i].numberResults=numberResultsListStr
@@ -2548,13 +2548,13 @@ export default {
       //       numberResultsListStr=numberResultsListStr+'非高危'
       //     }
       //     if (item==='2'){
-      //       numberResultsListStr=numberResultsListStr+'已报关停'
+      //       numberResultsListStr=numberResultsListStr+'上报关停'
       //     }
       //     if (item==='3'){
-      //       numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+      //       numberResultsListStr=numberResultsListStr+'上报蓝名单 '
       //     }
       //     if (item==='4'){
-      //       numberResultsListStr=numberResultsListStr+' 已报紫名单'
+      //       numberResultsListStr=numberResultsListStr+' 上报紫名单'
       //     }
       //   }
       //   dataLists[0].numberResults=numberResultsListStr

src/views/networkAccess/registrationUpdate.vue

@@ -476,37 +476,37 @@
 
                 <a-col :span="10">
                 <div v-if="size>=1">
-                  <a-form-model-item label="新办手机号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
+                  <a-form-model-item label="新办号码"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone" >
                     <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                    <a-input v-model="model.newPhone" placeholder="新办手机号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.newPhone" placeholder="新办号码" @blur="check3('newPhone')" id="newPhone"  :disabled="isDisabled"></a-input>
                     <!--                    </a-radio-group>-->
                   </a-form-model-item>
                 </div>
                   <div v-show="size>=2">
-                    <a-form-model-item label="新办手机号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码2"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone2" placeholder="新办手机号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone2" placeholder="新办号码" @blur="check3('newPhone2')" id="newPhone2" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=3">
-                    <a-form-model-item label="新办手机号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码3"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone3" placeholder="新办手机号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone3" placeholder="新办号码" @blur="check3('newPhone3')" id="newPhone3":disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=4">
-                    <a-form-model-item label="新办手机号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
+                    <a-form-model-item label="新办号码4"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"  >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone4" placeholder="新办手机号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone4" placeholder="新办号码" @blur="check3('newPhone4')" id="newPhone4" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
                   <div v-show="size>=5">
-                    <a-form-model-item label="新办手机号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
+                    <a-form-model-item label="新办号码5"    :labelCol="{ span:10 }"   :wrapperCol="{ span:12 }"  prop="phone"   >
                       <!--                    <a-radio-group v-model="model.newPhone" button-style="solid">-->
-                      <a-input v-model="model.newPhone5" placeholder="新办手机号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
+                      <a-input v-model="model.newPhone5" placeholder="新办号码" @blur="check3('newPhone5')" id="newPhone5" :disabled="isDisabled"></a-input>
                       <!--                    </a-radio-group>-->
                     </a-form-model-item>
                   </div>
@@ -557,7 +557,7 @@
 
           <a-result
             status="success"
-            title="无风险请继续操作!"
+            title="系统未发现异常，请受理人员进行进一步研判!"
             sub-title="success." v-if="riskShow"
           >
             <template #extra>
@@ -864,14 +864,14 @@ export default {
           text: '非高危',
           value: '1',
         }, {
-          text: '已报关停',
+          text: '上报关停',
           value: '2',
 
         }, {
-          text: '已报蓝名单',
+          text: '上报蓝名单',
           value: '3',
         },{
-          text: '已报紫名单',
+          text: '上报紫名单',
           value: '4',
         }],
       defaultValue: "",
@@ -1372,13 +1372,13 @@ export default {
             numberResultsListStr=numberResultsListStr+'非高危'
           }
           if (item==='2'){
-            numberResultsListStr=numberResultsListStr+'已报关停'
+            numberResultsListStr=numberResultsListStr+'上报关停'
           }
           if (item==='3'){
-            numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+            numberResultsListStr=numberResultsListStr+'上报蓝名单 '
           }
           if (item==='4'){
-            numberResultsListStr=numberResultsListStr+' 已报紫名单'
+            numberResultsListStr=numberResultsListStr+' 上报紫名单'
           }
         }
         result[i].numberResults=numberResultsListStr
@@ -2543,13 +2543,13 @@ export default {
       //       numberResultsListStr=numberResultsListStr+'非高危'
       //     }
       //     if (item==='2'){
-      //       numberResultsListStr=numberResultsListStr+'已报关停'
+      //       numberResultsListStr=numberResultsListStr+'上报关停'
       //     }
       //     if (item==='3'){
-      //       numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+      //       numberResultsListStr=numberResultsListStr+'上报蓝名单 '
       //     }
       //     if (item==='4'){
-      //       numberResultsListStr=numberResultsListStr+' 已报紫名单'
+      //       numberResultsListStr=numberResultsListStr+' 上报紫名单'
       //     }
       //   }
       //   dataLists[0].numberResults=numberResultsListStr

src/views/networkAccess/userStatistics.vue

@@ -239,14 +239,14 @@ export default {
           text: '非高危',
           value: '1',
         }, {
-          text: '已报关停',
+          text: '上报关停',
           value: '2',
 
         }, {
-          text: '已报蓝名单',
+          text: '上报蓝名单',
           value: '3',
         },{
-          text: '已报紫名单',
+          text: '上报紫名单',
           value: '4',
         }],
       company:'',
@@ -267,8 +267,8 @@ export default {
       currentTab: 'all',
       tabAll: '全部（0）',
       tabUndo: '非高危（0）',
-      tabUncheck: '已报蓝紫名单（0）',
-      tabChecked: '已报关停（0）',
+      tabUncheck: '上报蓝紫名单（0）',
+      tabChecked: '上报关停（0）',
       tabDelCheck: "已删除（0）",
       allCount: 0,
       tabUndoCount: 0,
@@ -334,16 +334,17 @@ export default {
           dataIndex: 'businessAddress'
           //scopedSlots: {customRender: 'sysBusinessHall'}
 
-        }, {
-          title: '更新人',
-          align: "center",
-          sorter: true,
-          dataIndex: 'updateBy'
-        }, {
-          title: '更新人营业厅',
-          align: "center",
-          sorter: true,
-          dataIndex: 'newBusinessAddress'
+        },
+        // {
+        //   title: '更新人',
+        //   align: "center",
+        //   sorter: true,
+        //   dataIndex: 'updateBy'
+        // }, {
+        //   title: '更新人营业厅',
+        //   align: "center",
+        //   sorter: true,
+        //   dataIndex: 'newBusinessAddress'
           //scopedSlots: {customRender: 'newBusinessAddress'}
           // },
           // {
@@ -445,7 +446,8 @@ export default {
           //   sorter: true,
           //   dataIndex: 'updateTime'
           // },
-        }, {
+      //  },
+      {
           title: '办理电话',
           align: "center",
           sorter: true,
@@ -463,9 +465,9 @@ export default {
             if (text == '1') {
               return '非高危';
             } else if (text == '2') {
-              return '已报蓝紫名单';
+              return '上报蓝紫名单';
             } else if (text == '3') {
-              return '已报关停';
+              return '上报关停';
             }
             return '';
           }*/
@@ -494,11 +496,11 @@ export default {
     statusFilter(status) {
       const statusMap = {
         '1': '非高危',
-        '2': '已报关停',
-        '3': '已报蓝名单',
-        '4': '已报紫名单',
-        '3,4':'已报蓝/紫名单',
-        '4,3':'已报蓝/紫名单',
+        '2': '上报关停',
+        '3': '上报蓝名单',
+        '4': '上报紫名单',
+        '3,4':'上报蓝/紫名单',
+        '4,3':'上报蓝/紫名单',
       }
       return statusMap[status]
     }
@@ -685,8 +687,8 @@ export default {
           that.tabAll = '全部（' + result.count + '）';
           console.log(that.tabAll)
           that.tabUndo = '非高危（' + result.unCount + '）';
-          that.tabUncheck = '已报蓝紫名单（' + result.uncheckCount + '）';
-          that.tabChecked = '已报关停（' + result.closeCount + '）';
+          that.tabUncheck = '上报蓝紫名单（' + result.uncheckCount + '）';
+          that.tabChecked = '上报关停（' + result.closeCount + '）';
           that.tabDelCheck = '已删除（' + result.delCount + '）';
         } else {