diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 52e8625..b5376f6 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -29,7 +29,7 @@
       <el-table-column label="巡查日期" prop="checkDate" />
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 52e8625..b5376f6 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -29,7 +29,7 @@
       <el-table-column label="巡查日期" prop="checkDate" />
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index cac10c8..18fa28b 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 52e8625..b5376f6 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -29,7 +29,7 @@
       <el-table-column label="巡查日期" prop="checkDate" />
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index cac10c8..18fa28b 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/project/projectInformation/details.vue b/src/views/project/projectInformation/details.vue
index b2833b6..cb90f22 100644
--- a/src/views/project/projectInformation/details.vue
+++ b/src/views/project/projectInformation/details.vue
@@ -502,7 +502,6 @@
   form.projectTypeName = item?.projectTypeName || '';
   form.time = res.data.startTime + '至' + res.data.endTime;
   viewMap(form.projectLocation);
-
   projectItemDescriptionConfigList.value = res?.data?.projectItemDescriptionList || [];
   console.log(projectItemDescriptionConfigList);
   projectContentList.value = props.projectContentType.slice(0, 3).map((item, i) => {

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 52e8625..b5376f6 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -29,7 +29,7 @@
       <el-table-column label="巡查日期" prop="checkDate" />
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index cac10c8..18fa28b 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/project/projectInformation/details.vue b/src/views/project/projectInformation/details.vue
index b2833b6..cb90f22 100644
--- a/src/views/project/projectInformation/details.vue
+++ b/src/views/project/projectInformation/details.vue
@@ -502,7 +502,6 @@
   form.projectTypeName = item?.projectTypeName || '';
   form.time = res.data.startTime + '至' + res.data.endTime;
   viewMap(form.projectLocation);
-
   projectItemDescriptionConfigList.value = res?.data?.projectItemDescriptionList || [];
   console.log(projectItemDescriptionConfigList);
   projectContentList.value = props.projectContentType.slice(0, 3).map((item, i) => {
diff --git a/src/views/system/MenuNotifi/Notification.vue b/src/views/system/MenuNotifi/Notification.vue
index 62f8798..cc3b588 100644
--- a/src/views/system/MenuNotifi/Notification.vue
+++ b/src/views/system/MenuNotifi/Notification.vue
@@ -7,13 +7,13 @@
           <el-option v-for="item in selectPoprleList" :key="item.id" :label="item.peopleLabel" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="通知状态" prop="noticeState">
-        <el-select v-model="queryParams.noticeState" placeholder="请选择通知状态">
+      <el-form-item label="通知状态" prop="msgState">
+        <el-select v-model="queryParams.msgState" placeholder="请选择通知状态">
           <el-option v-for="item in infoStaticList" :key="item.id" :label="item.staticLabel" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="消息状态" prop="msgState">
-        <el-select v-model="queryParams.msgState" placeholder="请选择消息状态">
+      <el-form-item label="消息状态" prop="readStatus">
+        <el-select v-model="queryParams.readStatus" placeholder="请选择消息状态">
           <el-option v-for="item in messageStaticList" :key="item.id" :label="item.messageLabel" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -43,18 +43,22 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="通知消息" prop="noticeMsg" width="550" />
-      <el-table-column label="通知状态" prop="noticeState">
+      <el-table-column label="通知消息" prop="noticeMsg" width="500" />
+      <el-table-column label="通知状态" prop="msgState">
         <template #default="scope">
           <span>
-            {{ scope.row.noticeState == '0' ? '已读' : scope.row.noticeState == '1' ? '未读' : '' }}
+            {{ scope.row.msgState == '0' ? '草稿待发布' : scope.row.msgState == '1' ? '发布' : '' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="消息状态" prop="msgState">
+      <el-table-column label="消息状态" prop="readStatus" width="300">
         <template #default="scope">
-          <span>
-            {{ scope.row.msgState == '0' ? '已读' : scope.row.msgState == '1' ? '未读' : '' }}
+          <span v-if="scope.row.readStatus == '0'">
+            {{ '未读' + ':' }}
+            <span v-for="(itme, index) in scope.row.unReadUsers" :key="index"> {{ itme.noticeUserName + ',' }}</span>
+          </span>
+          <span v-if="scope.row.readStatus == '1'">
+            {{ '全部已读' }}
           </span>
         </template>
       </el-table-column>
@@ -80,11 +84,16 @@
     <!-- 新增或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="160px" class="publicForm">
-        <el-form-item label="被通知人" prop="noticeUserId">
-          <el-select v-model="formData.noticeUserId" multiple clearable placeholder="请选择被通知人">
+        <el-form-item label="被通知人" prop="userIdArray">
+          <el-select v-model="formData.userIdArray" multiple clearable placeholder="请选择被通知人">
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
+        <el-form-item label="通知状态" prop="msgState">
+          <el-select v-model="formData.msgState" placeholder="请选择通知状态">
+            <el-option v-for="item in infoStaticList" :key="item.id" :label="item.staticLabel" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="通知消息" prop="noticeMsg">
           <el-input type="textarea" v-model="formData.noticeMsg" placeholder="请输入通知消息" />
         </el-form-item>
@@ -92,7 +101,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="saveInfo">存草稿</el-button>
+          <!-- <el-button type="primary" @click="saveInfo">存草稿</el-button> -->
           <el-button type="primary" @click="submitForm">确 定</el-button>
         </div>
       </template>
@@ -119,12 +128,13 @@
     pageNum: 1,
     pageSize: 10,
     noticeState: null, //通知状态
-    msgState: null, //消息状态
+    readStatus: null, //消息状态
     title: undefined,
     typeId: undefined,
   },
   rulesForm: {
-    postName: [{ required: true, message: '请输入', trigger: 'blur' }],
+    userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+    msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
     noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
   },
 });
@@ -132,31 +142,31 @@
 const infoStaticList = ref([
   {
     id: 0,
-    staticLabel: '已读',
+    staticLabel: '草稿待发布',
   },
   {
     id: 1,
-    staticLabel: '未读',
+    staticLabel: '发布',
   },
 ]);
 const messageStaticList = ref([
   {
     id: 0,
-    messageLabel: '已读',
+    messageLabel: '未读',
   },
   {
     id: 1,
-    messageLabel: '未读',
+    messageLabel: '全部已读',
   },
 ]);
 const userList = ref([]);
 //查询人员列表
 function getUserList() {
   listUser().then(res => {
-    userList.value = res.data || [];
-    userList.value.map(item => {
-      item.userId = String(item.userId);
-    });
+    userList.value = res.data;
+    // userList.value.map(item => {
+    //   item.userId = String(item.userId);
+    // });
   });
 }
 /** 获取查询数据列表 */
@@ -187,6 +197,7 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  formData.value.msgState = infoStaticList.value[1].id;
   dialogTitle.value = '新增项目通知';
 }
 /** 修改按钮操作 */
@@ -196,13 +207,13 @@
   // knowledgeDetail(postId).then(response => {
   //   dialogShow.value = true;
   dialogTitle.value = '修改项目通知';
+  formData.value = { ...row };
   //   nextTick(() => {
   //     formData.value = response.data;
   //   });
   // });
 }
-/** 存草稿按钮 */
-const saveInfo = () => {};
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {

diff --git a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
index 9facb6d..1e8f2b6 100644
--- a/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
+++ b/src/components/mapBoxSelectPosition/mapBoxSelectPosition.vue
@@ -106,22 +106,10 @@
 
           addWaterLabel();
           props.loadCallback && props.loadCallback();
-          if (props.previousPoint && props.previousPointName) {
-            let drewPoint = turf.featureCollection([turf.point(props.previousPoint.split(',').map(Number))]);
-            drewPoint.features[0].properties.name = props.previousPointName;
-            addPointToMap(drewPoint);
-            map.easeTo({
-              center: props.previousPoint.split(',').map(Number),
-              zoom: 14,
-            });
-          } else {
-            let timeout = setTimeout(() => {
-              let { pitch, center } = config.params.init;
-              pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
-              center && mapBoxSelectPositionMap.map.setCenter(center);
-              clearTimeout(timeout);
-            }, 1000);
-          }
+
+          let { pitch, center } = config.params.init;
+          pitch && mapBoxSelectPositionMap.map.setPitch(pitch);
+          center && mapBoxSelectPositionMap.map.setCenter(center);
 
           mapBoxSelectPositionMap.map.load = true;
         });
@@ -277,12 +265,28 @@
         map.getSource('drewPoint').setData(geojson);
       }
     };
+    watch(
+      () => [props.previousPoint, props.previousPointName],
+      val => {
+        if (!!val.length) {
+          let initeTimeout = setTimeout(() => {
+            let drewPoint = turf.featureCollection([turf.point(val[0].split(',').map(Number))]);
+            drewPoint.features[0].properties.name = val[1];
+            addPointToMap(drewPoint);
+            map.easeTo({
+              center: val[0].split(',').map(Number),
+              zoom: 14,
+            });
+            clearTimeout(initeTimeout);
+          }, 1000);
+        }
+      }
+    );
     onMounted(() => {
       initeMap();
       nextTick(() => {
         allData.inputShow = props.isNeedInput;
       });
-      console.log(props.previousPoint, props.previousPointName);
     });
 
     onBeforeUnmount(() => {
diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 298085d..ab472df 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -23,10 +23,10 @@
           permissionStore.generateRoutes();
           router.push({ path: '/chengguanweiScreen' });
         } else {
-          router.push('/door');
+          router.push('/chengguanweiScreen');
         }
       } else {
-        router.push('/door');
+        router.push('/chengguanweiScreen');
       }
     })
     .catch(error => {
diff --git a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
index a715836..e980b33 100644
--- a/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
+++ b/src/views/longoPeration/Patrolmanagement/inspectiontasks.vue
@@ -115,7 +115,7 @@
           </el-table-column>
           <el-table-column label="任务开始时间" prop="planStartDatetime" />
           <el-table-column label="任务结束时间" prop="planEndDatetime" />
-          <el-table-column label="任务状态" prop="status">
+          <el-table-column label="任务状态1" prop="status">
             <template #default="scope">
               <span>
                 {{
@@ -132,7 +132,12 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="超时时间" prop="expiredDays" />
+          <el-table-column label="超时时间" prop="expiredDays">
+            <template #default="scope">
+              <span v-if="scope.row.expiredDays < 1"> 未超时 </span>
+              <span v-else style="color: red">超时 {{ scope.row.expiredDays }} 天 </span>
+            </template>
+          </el-table-column>
           <el-table-column label="任务下发时间" prop="issuedDatetime" width="200" />
           <el-table-column label="操作" width="240">
             <template #default="scope">
diff --git a/src/views/longoPeration/YSLedger.vue b/src/views/longoPeration/YSLedger.vue
index 52e8625..b5376f6 100644
--- a/src/views/longoPeration/YSLedger.vue
+++ b/src/views/longoPeration/YSLedger.vue
@@ -29,7 +29,7 @@
       <el-table-column label="巡查日期" prop="checkDate" />
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/longoPeration/duChaLedger.vue b/src/views/longoPeration/duChaLedger.vue
index cac10c8..18fa28b 100644
--- a/src/views/longoPeration/duChaLedger.vue
+++ b/src/views/longoPeration/duChaLedger.vue
@@ -34,7 +34,7 @@
       </el-table-column>
       <el-table-column label="项目名称" prop="projectCodes" width="400">
         <template #default="scope">
-          <p v-for="item in scope.row.projectList">{{ item.projectAbbreviation }}</p>
+          <p v-for="item in scope.row.projectList">{{ item.projectName }}</p>
         </template>
       </el-table-column>
       <el-table-column label="巡查人员" prop="planUserIds">
diff --git a/src/views/project/projectInformation/details.vue b/src/views/project/projectInformation/details.vue
index b2833b6..cb90f22 100644
--- a/src/views/project/projectInformation/details.vue
+++ b/src/views/project/projectInformation/details.vue
@@ -502,7 +502,6 @@
   form.projectTypeName = item?.projectTypeName || '';
   form.time = res.data.startTime + '至' + res.data.endTime;
   viewMap(form.projectLocation);
-
   projectItemDescriptionConfigList.value = res?.data?.projectItemDescriptionList || [];
   console.log(projectItemDescriptionConfigList);
   projectContentList.value = props.projectContentType.slice(0, 3).map((item, i) => {
diff --git a/src/views/system/MenuNotifi/Notification.vue b/src/views/system/MenuNotifi/Notification.vue
index 62f8798..cc3b588 100644
--- a/src/views/system/MenuNotifi/Notification.vue
+++ b/src/views/system/MenuNotifi/Notification.vue
@@ -7,13 +7,13 @@
           <el-option v-for="item in selectPoprleList" :key="item.id" :label="item.peopleLabel" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="通知状态" prop="noticeState">
-        <el-select v-model="queryParams.noticeState" placeholder="请选择通知状态">
+      <el-form-item label="通知状态" prop="msgState">
+        <el-select v-model="queryParams.msgState" placeholder="请选择通知状态">
           <el-option v-for="item in infoStaticList" :key="item.id" :label="item.staticLabel" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="消息状态" prop="msgState">
-        <el-select v-model="queryParams.msgState" placeholder="请选择消息状态">
+      <el-form-item label="消息状态" prop="readStatus">
+        <el-select v-model="queryParams.readStatus" placeholder="请选择消息状态">
           <el-option v-for="item in messageStaticList" :key="item.id" :label="item.messageLabel" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -43,18 +43,22 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="通知消息" prop="noticeMsg" width="550" />
-      <el-table-column label="通知状态" prop="noticeState">
+      <el-table-column label="通知消息" prop="noticeMsg" width="500" />
+      <el-table-column label="通知状态" prop="msgState">
         <template #default="scope">
           <span>
-            {{ scope.row.noticeState == '0' ? '已读' : scope.row.noticeState == '1' ? '未读' : '' }}
+            {{ scope.row.msgState == '0' ? '草稿待发布' : scope.row.msgState == '1' ? '发布' : '' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="消息状态" prop="msgState">
+      <el-table-column label="消息状态" prop="readStatus" width="300">
         <template #default="scope">
-          <span>
-            {{ scope.row.msgState == '0' ? '已读' : scope.row.msgState == '1' ? '未读' : '' }}
+          <span v-if="scope.row.readStatus == '0'">
+            {{ '未读' + ':' }}
+            <span v-for="(itme, index) in scope.row.unReadUsers" :key="index"> {{ itme.noticeUserName + ',' }}</span>
+          </span>
+          <span v-if="scope.row.readStatus == '1'">
+            {{ '全部已读' }}
           </span>
         </template>
       </el-table-column>
@@ -80,11 +84,16 @@
     <!-- 新增或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="160px" class="publicForm">
-        <el-form-item label="被通知人" prop="noticeUserId">
-          <el-select v-model="formData.noticeUserId" multiple clearable placeholder="请选择被通知人">
+        <el-form-item label="被通知人" prop="userIdArray">
+          <el-select v-model="formData.userIdArray" multiple clearable placeholder="请选择被通知人">
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
           </el-select>
         </el-form-item>
+        <el-form-item label="通知状态" prop="msgState">
+          <el-select v-model="formData.msgState" placeholder="请选择通知状态">
+            <el-option v-for="item in infoStaticList" :key="item.id" :label="item.staticLabel" :value="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="通知消息" prop="noticeMsg">
           <el-input type="textarea" v-model="formData.noticeMsg" placeholder="请输入通知消息" />
         </el-form-item>
@@ -92,7 +101,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="info" @click="cancelForm">取 消</el-button>
-          <el-button type="primary" @click="saveInfo">存草稿</el-button>
+          <!-- <el-button type="primary" @click="saveInfo">存草稿</el-button> -->
           <el-button type="primary" @click="submitForm">确 定</el-button>
         </div>
       </template>
@@ -119,12 +128,13 @@
     pageNum: 1,
     pageSize: 10,
     noticeState: null, //通知状态
-    msgState: null, //消息状态
+    readStatus: null, //消息状态
     title: undefined,
     typeId: undefined,
   },
   rulesForm: {
-    postName: [{ required: true, message: '请输入', trigger: 'blur' }],
+    userIdArray: [{ required: true, message: '请选择被通知人', trigger: 'blur' }],
+    msgState: [{ required: true, message: '请选择通知状态', trigger: 'blur' }],
     noticeMsg: [{ required: true, message: '请输入通知消息', trigger: 'blur' }],
   },
 });
@@ -132,31 +142,31 @@
 const infoStaticList = ref([
   {
     id: 0,
-    staticLabel: '已读',
+    staticLabel: '草稿待发布',
   },
   {
     id: 1,
-    staticLabel: '未读',
+    staticLabel: '发布',
   },
 ]);
 const messageStaticList = ref([
   {
     id: 0,
-    messageLabel: '已读',
+    messageLabel: '未读',
   },
   {
     id: 1,
-    messageLabel: '未读',
+    messageLabel: '全部已读',
   },
 ]);
 const userList = ref([]);
 //查询人员列表
 function getUserList() {
   listUser().then(res => {
-    userList.value = res.data || [];
-    userList.value.map(item => {
-      item.userId = String(item.userId);
-    });
+    userList.value = res.data;
+    // userList.value.map(item => {
+    //   item.userId = String(item.userId);
+    // });
   });
 }
 /** 获取查询数据列表 */
@@ -187,6 +197,7 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
+  formData.value.msgState = infoStaticList.value[1].id;
   dialogTitle.value = '新增项目通知';
 }
 /** 修改按钮操作 */
@@ -196,13 +207,13 @@
   // knowledgeDetail(postId).then(response => {
   //   dialogShow.value = true;
   dialogTitle.value = '修改项目通知';
+  formData.value = { ...row };
   //   nextTick(() => {
   //     formData.value = response.data;
   //   });
   // });
 }
-/** 存草稿按钮 */
-const saveInfo = () => {};
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
diff --git a/vite.config.js b/vite.config.js
index ea36ec6..d814042 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -6,9 +6,9 @@
 
 const Timestamp = new Date().getTime(); //随机时间戳
 
-// const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
+const targetUrl = 'http://192.168.16.254:7200'; //孙逢时
 // const targetUrl = 'http://192.168.20.52:7300'; //杨辉
-const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
+// const targetUrl = 'https://server2.wh-nf.cn:8082/prod-api'; //线上
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode, command }) => {