junhong 6 days ago
parent 5e98f0f915
commit 98f39290a3
  1. 2
      src/layout/components/AppMain.vue
  2. 1
      src/permission.js
  3. 1
      src/views/constructionScheduling/progress-monitoring/index.vue
  4. 2
      src/views/large-screen/index.vue
  5. 4
      vite.config.js

@ -4,7 +4,7 @@
<router-view v-slot="{ Component, route }"> <router-view v-slot="{ Component, route }">
<transition name="fade-transform" mode="out-in"> <transition name="fade-transform" mode="out-in">
<keep-alive :include="tagsViewStore.cachedViews"> <keep-alive :include="tagsViewStore.cachedViews">
<component v-if="!route.meta.link" :is="Component" :key="route.path"/> <component v-if="!route.meta.link" :is="Component" :key="route.fullPath"/>
</keep-alive> </keep-alive>
</transition> </transition>
</router-view> </router-view>

@ -16,6 +16,7 @@ const indexArr = ["/index", "/"]
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
if (getToken()) { if (getToken()) {
to.meta.title && useSettingsStore().setTitle(to.meta.title) to.meta.title && useSettingsStore().setTitle(to.meta.title)
/* has token*/ /* has token*/
if (to.path === '/login') { if (to.path === '/login') {

@ -131,6 +131,7 @@ function getList(params) {
// max-height: calc(100% - 150px); // max-height: calc(100% - 150px);
overflow: auto; overflow: auto;
/* 子元素超出宽度时换行 */ /* 子元素超出宽度时换行 */
} }
.app-container { .app-container {

@ -33,7 +33,7 @@
<span>总工期</span> <span>总工期</span>
</div> </div>
<div class="data-font jbborder"> <div class="data-font jbborder">
<span class="number-font">{{ parseFloat(state.gk.gcjd).toFixed(0) <span class="number-font">{{ state.gk.gcjd=='NaN'?0:parseFloat(state.gk.gcjd).toFixed(0)
}}<span>%</span></span> }}<span>%</span></span>
<span>工程进度</span> <span>工程进度</span>
</div> </div>

@ -43,9 +43,9 @@ export default defineConfig(({ mode, command }) => {
}, },
proxy: { proxy: {
'/dev-api': { '/dev-api': {
target: 'http://192.168.2.39:8581', // target: 'http://192.168.2.39:8581',
// target: 'http://192.168.2.223:8080', // target: 'http://192.168.2.223:8080',
// target: 'http://39.100.74.100:8581', target: 'http://39.100.74.100:8581',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')
} }

Loading…
Cancel
Save