wenhongquan 4 months ago
parent
commit
55c08ef8c4

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 南宁北排管理系统
+VITE_APP_TITLE = 安庆北排管理系统
 
 # 开发环境配置
 ENV = 'development'

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 南宁北排管理系统
+VITE_APP_TITLE = 安庆北排管理系统
 
 # 生产环境配置
 ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = 南宁北排管理系统
+VITE_APP_TITLE = 安庆北排管理系统
 
 NODE_ENV = production
 

+ 1 - 1
index.html

@@ -9,7 +9,7 @@
     <link rel="icon" href="/favicon.ico">
 
 
-    <title>南宁北排管理系统</title>
+    <title>安庆北排管理系统</title>
 <!--  <script src="https://g.alicdn.com/code/npm/@ali/dingtalk-h5-remote-debug-sdk/0.1.3/app.bundle.js"></script>-->
 <!--  <script>-->
 <!--    h5RemoteDebugSdk.init({-->

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
     "name": "ruoyi",
     "version": "3.8.2",
-    "description": "南宁北排管理系统",
+    "description": "安庆北排管理系统",
     "author": "crj",
     "license": "MIT",
     "scripts": {

BIN
src/assets/images/bg.png


+ 1 - 2
src/components/MapSelect/index.jsx

@@ -82,7 +82,6 @@ export default defineComponent({
     );
 
     onMounted(() => {
-
       if (props.formv.locations) {
         mapselect.value = false;
         setlocation();
@@ -163,7 +162,7 @@ export default defineComponent({
     const searchaddr = (name) => {
       mapselect.value = false;
       fetch(
-        `https://restapi.amap.com/v5/place/text?region=南宁市&keywords=${name}&key=${"1c7f1c8eda2ccbe7d0e125a7e2fc2a61"}`,
+        `https://restapi.amap.com/v5/place/text?region=安庆市&keywords=${name}&key=${"1c7f1c8eda2ccbe7d0e125a7e2fc2a61"}`,
         // `${
         //   import.meta.env.VITE_MAP_SERVER
         // }/service/lbs/search/v1/keywords?keywords=${name}&city=宿迁&citylimit=true&page_idx=1&page_size=10&key=${

+ 1 - 1
src/components/MapView/index.vue

@@ -25,7 +25,7 @@ export default defineComponent({
             map.value = new AMap.Map("container",{  //设置地图容器id
                 viewMode:"3D",    //是否为3D地图模式
                 zoom:10,           //初始化地图级别
-                center:[108.320004,22.82402], //初始化地图中心点位置
+                center:[117.115349,30.531828], //初始化地图中心点位置
             });
             window.map = map.value;
             ctx.emit('update:map', map);

+ 56 - 54
src/layout/components/AppMain.vue

@@ -1,54 +1,56 @@
-<template>
-  <section class="app-main">
-    <router-view v-slot="{ Component, route }">
-      <transition name="fade-transform" mode="out-in">
-        <keep-alive :include="cachedViews">
-          <component :is="Component" :key="route.path"/>
-        </keep-alive>
-      </transition>
-    </router-view>
-  </section>
-</template>
-
-<script setup>
-let store = useStore()
-const route = useRoute()
-store.dispatch('tagsView/addCachedView', route)
-const cachedViews = computed(() => {
-    return store.state.tagsView.cachedViews
-})
-</script>
-
-<style lang="scss" scoped>
-.app-main {
-  /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-
-.fixed-header + .app-main {
-  padding-top: 50px;
-}
-
-.hasTagsView {
-  .app-main {
-    /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
-  }
-
-  .fixed-header + .app-main {
-    padding-top: 84px;
-  }
-}
-</style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 17px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+    <router-view v-slot="{ Component, route }">
+      <transition name="fade-transform" mode="out-in">
+        <keep-alive :include="cachedViews">
+          <component :is="Component" :key="route.path"/>
+        </keep-alive>
+      </transition>
+    </router-view>
+  </section>
+</template>
+
+<script setup>
+let store = useStore()
+const route = useRoute()
+store.dispatch('tagsView/addCachedView', route)
+
+document.title = '安庆北排管理系统'
+const cachedViews = computed(() => {
+    return store.state.tagsView.cachedViews
+})
+</script>
+
+<style lang="scss" scoped>
+.app-main {
+  /* 50= navbar  50  */
+  min-height: calc(100vh - 50px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.fixed-header + .app-main {
+  padding-top: 50px;
+}
+
+.hasTagsView {
+  .app-main {
+    /* 84 = navbar + tags-view = 50 + 34 */
+    min-height: calc(100vh - 84px);
+  }
+
+  .fixed-header + .app-main {
+    padding-top: 84px;
+  }
+}
+</style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 17px;
+  }
+}
+</style>

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -24,7 +24,7 @@ defineProps({
   }
 })
 
-const title = ref('南宁北排');
+const title = ref('安庆北排');
 const store = useStore();
 const sideTheme = computed(() => store.state.settings.sideTheme);
 </script>

+ 5 - 5
src/views/detection/list/index.vue

@@ -577,8 +577,8 @@
               <el-form-item :label="`计划开始时间`">
                 <el-date-picker
                   v-model="detectioninfo.ext1.task.datestart"
-                  value-format="YYYY-MM"
-                  type="month"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="datetime"
                   placeholder="请选择"
                 />
               </el-form-item>
@@ -587,8 +587,8 @@
               <el-form-item :label="`计划结束时间`">
                 <el-date-picker
                   v-model="detectioninfo.ext1.task.dateend"
-                  value-format="YYYY-MM"
-                  type="month"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="datetime"
                   placeholder="请选择"
                 />
               </el-form-item>
@@ -844,7 +844,7 @@ const export1 = () => {
     {
       ...query,
     },
-    `【设施检测】南宁北排检测计划、根据、成果上报.xlsx`
+    `【设施检测】安庆北排检测计划、根据、成果上报.xlsx`
   );
 
 }

+ 1 - 1
src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">南宁北排管理系统</h3>
+      <h3 class="title">安庆北排管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

+ 1 - 1
src/views/maintain/detail/index.vue

@@ -1286,7 +1286,7 @@ const maintaininfo = ref({
   maintainRemark: "是东方闪电",
   maintainReportNp: 1,
   maintainType: 1,
-  maintainUnit: "南宁公交集团",
+  maintainUnit: "安庆公交集团",
   maintainYear: "2022",
   params: {},
   remark: null,

+ 4 - 2
src/views/maintain/list/index.vue

@@ -424,13 +424,15 @@
           <el-row style="margin-top: 10px">
             <el-col :span="12" style="text-align: right">
               <el-form-item :label="`计划开始时间`">
-                <el-date-picker v-model="maintaininfo.ext1.task.datestart" value-format="YYYY-MM" type="month"
+                <el-date-picker v-model="maintaininfo.ext1.task.datestart"   value-format="YYYY-MM-DD HH:mm:ss"
+                  type="datetime"
                   placeholder="请选择" />
               </el-form-item>
             </el-col>
             <el-col :span="12" style="text-align: right">
               <el-form-item :label="`计划结束时间`">
-                <el-date-picker v-model="maintaininfo.ext1.task.dateend" value-format="YYYY-MM" type="month"
+                <el-date-picker v-model="maintaininfo.ext1.task.dateend"   value-format="YYYY-MM-DD HH:mm:ss"
+                  type="datetime"
                   placeholder="请选择" />
               </el-form-item>
             </el-col>

+ 1 - 1
src/views/mb/maintain/detail/index.vue

@@ -607,7 +607,7 @@ const maintaininfo = ref({
   maintainRemark: "是东方闪电",
   maintainReportNp: 1,
   maintainType: 1,
-  maintainUnit: "南宁公交集团",
+  maintainUnit: "安庆公交集团",
   maintainYear: "2022",
   params: {},
   remark: null,

+ 1 - 1
src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">南宁北排管理系统</h3>
+      <h3 class="title">安庆北排管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="registerForm.username"

+ 1 - 1
src/views/screen/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="content" :style="zoom">
     <div class="header">
-      <div class="title"> <img src="@/assets/images/组_16@2x.png" /> 南宁北排综合生产数据平台</div>
+      <div class="title"> <img src="@/assets/images/组_16@2x.png" /> 安庆北排综合生产数据平台</div>
       <div class="right">
         <span>{{ timestring }}</span>
         <el-dropdown>

+ 1 - 1
src/views/system/facilities/index.vue

@@ -663,7 +663,7 @@ const exportexcel3 = () => {
     {
       ...q,
     },
-    `南宁北排管网公司设施台账.xlsx`
+    `安庆北排管网公司设施台账.xlsx`
   );
 
 

+ 2 - 2
vite.config.js

@@ -37,8 +37,8 @@ export default defineConfig(({ mode, command }) => {
         proxy: {
           // 'http://nnbpbg.xt.wenhq.top:8083'
           "/dev-api": {
-            // target: "http://39.104.26.229/api",
-            target:"http://localhost:8080/api",
+            target: "http://39.104.26.229/api",
+            // target:"http://localhost:8080/api",
             changeOrigin: true,
             rewrite: (p) => p.replace(/^\/dev-api/, ""),
           },