Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	04.系统编码/Frontend/src/uilts/axios.ts

04.系统编码/Frontend/.idea/workspace.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="">
+    <list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/SystemManagement.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/SystemManagement.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/uilts/axios.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/axios.ts" afterDir="false" />
-    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -31,12 +27,16 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
     <property name="ts.external.directory.path" value="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\node_modules\typescript\lib" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\src" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\src\uilts" />
       <recent name="D:\project\NanJingLamanRadarProject\04.系统编码\Frontend\public\images" />
@@ -79,7 +79,7 @@
       <workItem from="1638441956659" duration="5371000" />
       <workItem from="1638447904778" duration="262000" />
       <workItem from="1638496246090" duration="1527000" />
-      <workItem from="1638497917929" duration="1734000" />
+      <workItem from="1638497917929" duration="12367000" />
     </task>
     <task id="LOCAL-00001" summary="2021 12 01">
       <created>1638357539757</created>

04.系统编码/Frontend/src/components/DecisionSupport.vue

@@ -37,6 +37,9 @@
                                 </div>
                                 <p class="image-tip">暂无图片</p>
                             </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </el-col>
                 </el-row>
@@ -51,6 +54,15 @@
                         :initial-index="1"
                         fit="contain"
                         >
+                            <template #error>
+                                <div class="image-slot">
+                                    <img src="/images/null-picture.png" />
+                                </div>
+                                <p class="image-tip">暂无图片</p>
+                            </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </div>
                 </div>
@@ -74,36 +86,36 @@ import { post } from '../uilts/axios';
                 items: [{
                     title: '比湿',
                     imgName: 'TFLD_Q2',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '风速和风向',
                     imgName: 'TFLD_V10',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '降水',
                     imgName: 'TFLD_RAIN',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '平均气温',
                     imgName: 'TFLD_T2',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '最低温度',
                     imgName: 'TFLD_TN',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '最高温度',
                     imgName: 'TFLD_TX',
-                    imgUrl: '/images/null-picture.png',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }],
-                indicatorImg: '/images/decision-support/pollution-indicator/pollution-indicator.png',
+                indicatorImg: '/product/picture/images/decision-support/pollution-indicator/pollution-indicator.png',
-                indicatorPreview: ['/images/decision-support/pollution-indicator/pollution-indicator.png']
+                indicatorPreview: ['/product/picture/images/decision-support/pollution-indicator/pollution-indicator.png']
             })
 
             onMounted(() => {

04.系统编码/Frontend/src/components/Login.vue

@@ -23,6 +23,7 @@ import {reactive, toRefs} from "vue";
 import { post } from "./../uilts/axios";
 import { useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
+import { setStaff } from "../uilts/storage";
 
 export default {
   name: 'Login',
@@ -61,7 +62,7 @@ export default {
               type: 'error'
             });
           }else {
-            console.log(res)
+            setStaff('login_staff', res.data)
             router.push("/MicrowaveRadiation")
           }
         })

04.系统编码/Frontend/src/components/MicrowaveRadiation.vue

@@ -74,7 +74,7 @@
             <div class="picture-view">
                 <span class="arrow arrow-prev" @click="onPrevImgClick"><img src="/images/prev-btn.png" /></span>
                 <span class="arrow arrow-next" @click="onNextImgClick"><img src="/images/next-btn.png" /></span>
-                <span class="save-btn"><img src="/images/save.png" /></span>
+                <a href="/images/picture1.png" download class="save-btn"><img src="/images/save.png" /></a>
                 <div class="picture-container">
                     <h2 class="title">{{title}}</h2>
                     <div class="picture">
@@ -90,6 +90,9 @@
                                 </div>
                                 <p class="image-tip">暂无图片</p>
                             </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </div>
                 </div>
@@ -118,7 +121,7 @@
                 hours: [],
                 times: [],
                 currentTime: null,
-                imgUrl: '/images/null-picture.png',
+                imgUrl: '/images/default-picture.png',
                 srcList: [],
                 isPlay: false,
                 title: null,

04.系统编码/Frontend/src/components/RamanLidar.vue

@@ -71,6 +71,9 @@
                                 </div>
                                 <p class="image-tip">暂无图片</p>
                             </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </div>
                 </div>
@@ -97,7 +100,7 @@
                 hours: [],
                 times: [],
                 currentTime: null,
-                imgUrl: '/images/null-picture.png',
+                imgUrl: '/images/default-picture.png',
                 srcList: [],
                 isPlay: false,
                 title: null,

04.系统编码/Frontend/src/components/Shared/Header.vue

@@ -21,14 +21,39 @@
                 <router-link to="/SystemManagement">系统管理</router-link>
             </div>
         </div>
+          <span @click="Logout">退出登录</span>
     </div>
 </template>
 
 <script lang="ts">
+
+    import { reactive, onMounted, toRefs } from "vue";
+    import { useRouter } from 'vue-router';
+    import { clear } from "../../uilts/storage";
+
     export default {
       name: 'Header',
       setup() {
-            return {}
+        const router = useRouter();
+        let options = reactive({
+          currentPath: 'MicrowaveRadiation'
+        })
+
+        const onNavClick = (path) => {
+          options.currentPath = path;
+          router.push({path: path});
+        }
+
+        const Logout = () => {
+          clear()
+          router.replace('/Login')
+        }
+
+        return {
+          ...toRefs(options),
+          onNavClick,
+          Logout
+        }
       }
     }
 </script>
@@ -40,6 +65,13 @@
         display: flex;
         align-items: center;
         color: #ffffff;
+      span{
+        padding: 10px;
+        cursor: pointer;
+        border: 1px solid grey;
+        background-color: #498DF0;
+        border-radius: 10px;
+      }
         .logo {
             margin-left: 0.2rem;
             display: flex;

04.系统编码/Frontend/src/components/SynergyEvaluation.vue

@@ -99,6 +99,9 @@
                                 </div>
                                 <p class="image-tip">暂无图片</p>
                             </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </el-col>
                 </el-row>
@@ -118,6 +121,9 @@
                                 </div>
                                 <p class="image-tip">暂无图片</p>
                             </template>
+                            <template #placeholder>
+                                <div class="image-placeholder">正在加载...</div>
+                            </template>
                         </el-image>
                     </el-col>
                 </el-row>
@@ -144,86 +150,86 @@ import { post } from '../uilts/axios';
                 currentYear: '2000',
                 currentSurfaceTemperatureTime: 'time0130',
                 srcList: [],
-                imgUrl: '/images/null-picture.png',
+                imgUrl: '/images/default-picture.png',
                 imgUrls: [],
                 items: [{
                     title: '地表温度（01:30）',
                     type: 'temperature0130',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '地表温度（10:30）',
                     type: 'temperature1030',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '地表温度（13:30）',
                     type: 'temperature1330',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '地表温度（22:30）',
                     type: 'temperature2230',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '反照率',
                     type: 'albedo',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     title: '蒸散发',
                     type: 'evaporation',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }],
                 trendItems: [{
                     type: 'month_01',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_02',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_03',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_04',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_05',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_06',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_07',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_08',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_09',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_10',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_11',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }, {
                     type: 'month_12',
-                    imgUrl: '',
+                    imgUrl: '/images/default-picture.png',
                     preview: []
                 }]
             })

04.系统编码/Frontend/src/components/SystemManagement.vue

@@ -4,11 +4,13 @@
   <div class="main">
     <div class="container system-container panel">
       <div class="box">
+
         <div class="left">
           <h1>用户姓名：</h1>
           <input type="text" v-model="state1" class="textInput"/>
           <div><img src="/images/search.png" @click="onSearch"></div>
         </div>
+
         <div class="right">
           <span @click="onAddClick">添加新用户</span>
         </div>
@@ -44,6 +46,7 @@
           <el-pagination background
                          layout="prev, pager, next"
                          :total="total"
+                         hide-on-single-page="hide-on-single-page"
                          @prev-click="prev"
                          @next-click="next"
                          @current-change="changEnum">
@@ -51,11 +54,13 @@
         </div>
       </div>
     </div>
+
     <!--弹出框--->
-      <el-dialog v-model="dialogFormVisible" :title="title"  center=true width="900px" top="17%">
+    <el-dialog v-model="dialogFormVisible" :title="title" center=center width="900px" top="17%">
       <el-form :model="form">
         <el-form-item label="用户账号：" :label-width="formLabelWidth">
-            <el-input v-model="form.userAccountNumber" autocomplete="off" style="width: 260px" :disabled="isDisabled"></el-input>
+          <el-input v-model="form.userAccountNumber" autocomplete="off" style="width: 260px"
+                    :disabled="isDisabled"></el-input>
         </el-form-item>
         <el-form-item label="用户密码：" :label-width="formLabelWidth">
           <el-input v-model="form.userPassword" autocomplete="off" style="width: 260px" type="password"></el-input>
@@ -81,13 +86,13 @@
   </div>
 </template>
 
-
-
 <script lang="ts">
+
   import {onMounted, reactive, toRefs} from 'vue';
   import {post} from "../uilts/axios";
   import {ElMessage} from 'element-plus'
   import {format} from '../uilts/String';
+
 export default {
   name: 'SystemManagement',
   setup() {
@@ -149,7 +154,6 @@ export default {
 
     //删除用户
     const confirmEvent = (index, rows) => {
-            console.log(rows[index].userAccountNumber)
       post('user/delUser', {
         userAccountNumber: rows[index].userAccountNumber
       }).then((res: any) => {
@@ -178,7 +182,6 @@ export default {
       }).then((res: any) => {
         option.tableData = res.data.records;
         option.total = res.data.total;
-              console.log(res)
       })
     }
 
@@ -359,6 +362,7 @@ export default {
       }
 
     }
+
     :deep(.el-table thead) {
       color: black;
     }

04.系统编码/Frontend/src/uilts/axios.ts

@@ -5,12 +5,13 @@ import { ElLoading } from 'element-plus'
 
 let loading = null;
 const service = axios.create({
-    // baseURL:"http://localhost:8002",
+    baseURL:"http://112.124.40.88:8002",
-    baseURL:"",
+    // baseURL:"",
     timeout: 500000
 })
 
 service.interceptors.request.use(config => {
+
     loading = ElLoading.service({
         customClass: 'loading',
         spinner: 'el-icon-loading',