diff --git a/src/assets/images/weather/tianqi-baoxue.png b/src/assets/images/weather/tianqi-baoxue.png new file mode 100644 index 00000000..3eeaa1ce Binary files /dev/null and b/src/assets/images/weather/tianqi-baoxue.png differ diff --git a/src/assets/images/weather/tianqi-baoyu.png b/src/assets/images/weather/tianqi-baoyu.png new file mode 100644 index 00000000..d4d72ea6 Binary files /dev/null and b/src/assets/images/weather/tianqi-baoyu.png differ diff --git a/src/assets/images/weather/tianqi-daxue.png b/src/assets/images/weather/tianqi-daxue.png new file mode 100644 index 00000000..fd4fff34 Binary files /dev/null and b/src/assets/images/weather/tianqi-daxue.png differ diff --git a/src/assets/images/weather/tianqi-dayu.png b/src/assets/images/weather/tianqi-dayu.png new file mode 100644 index 00000000..1d19905d Binary files /dev/null and b/src/assets/images/weather/tianqi-dayu.png differ diff --git a/src/assets/images/weather/tianqi-duoyun.png b/src/assets/images/weather/tianqi-duoyun.png new file mode 100644 index 00000000..99b9a055 Binary files /dev/null and b/src/assets/images/weather/tianqi-duoyun.png differ diff --git a/src/assets/images/weather/tianqi-feng.png b/src/assets/images/weather/tianqi-feng.png new file mode 100644 index 00000000..d2617f11 Binary files /dev/null and b/src/assets/images/weather/tianqi-feng.png differ diff --git a/src/assets/images/weather/tianqi-fuchen.png b/src/assets/images/weather/tianqi-fuchen.png new file mode 100644 index 00000000..9cb57c24 Binary files /dev/null and b/src/assets/images/weather/tianqi-fuchen.png differ diff --git a/src/assets/images/weather/tianqi-leizhenyu.png b/src/assets/images/weather/tianqi-leizhenyu.png new file mode 100644 index 00000000..d1418ce4 Binary files /dev/null and b/src/assets/images/weather/tianqi-leizhenyu.png differ diff --git a/src/assets/images/weather/tianqi-qing.png b/src/assets/images/weather/tianqi-qing.png new file mode 100644 index 00000000..412eee10 Binary files /dev/null and b/src/assets/images/weather/tianqi-qing.png differ diff --git a/src/assets/images/weather/tianqi-shachenbao.png b/src/assets/images/weather/tianqi-shachenbao.png new file mode 100644 index 00000000..d6c3138b Binary files /dev/null and b/src/assets/images/weather/tianqi-shachenbao.png differ diff --git a/src/assets/images/weather/tianqi-wu.png b/src/assets/images/weather/tianqi-wu.png new file mode 100644 index 00000000..50ca4b49 Binary files /dev/null and b/src/assets/images/weather/tianqi-wu.png differ diff --git a/src/assets/images/weather/tianqi-wumai.png b/src/assets/images/weather/tianqi-wumai.png new file mode 100644 index 00000000..168eab7c Binary files /dev/null and b/src/assets/images/weather/tianqi-wumai.png differ diff --git a/src/assets/images/weather/tianqi-xiaoxue.png b/src/assets/images/weather/tianqi-xiaoxue.png new file mode 100644 index 00000000..fbb2afb9 Binary files /dev/null and b/src/assets/images/weather/tianqi-xiaoxue.png differ diff --git a/src/assets/images/weather/tianqi-xiaoyu.png b/src/assets/images/weather/tianqi-xiaoyu.png new file mode 100644 index 00000000..2c1c4057 Binary files /dev/null and b/src/assets/images/weather/tianqi-xiaoyu.png differ diff --git a/src/assets/images/weather/tianqi-yangsha.png b/src/assets/images/weather/tianqi-yangsha.png new file mode 100644 index 00000000..80735e87 Binary files /dev/null and b/src/assets/images/weather/tianqi-yangsha.png differ diff --git a/src/assets/images/weather/tianqi-yin.png b/src/assets/images/weather/tianqi-yin.png new file mode 100644 index 00000000..292fc449 Binary files /dev/null and b/src/assets/images/weather/tianqi-yin.png differ diff --git a/src/assets/images/weather/tianqi-zhenxue.png b/src/assets/images/weather/tianqi-zhenxue.png new file mode 100644 index 00000000..7ebc69a1 Binary files /dev/null and b/src/assets/images/weather/tianqi-zhenxue.png differ diff --git a/src/assets/images/weather/tianqi-zhenyu.png b/src/assets/images/weather/tianqi-zhenyu.png new file mode 100644 index 00000000..97119c14 Binary files /dev/null and b/src/assets/images/weather/tianqi-zhenyu.png differ diff --git a/src/assets/images/weather/tianqi-zhongxue.png b/src/assets/images/weather/tianqi-zhongxue.png new file mode 100644 index 00000000..a3374343 Binary files /dev/null and b/src/assets/images/weather/tianqi-zhongxue.png differ diff --git a/src/assets/images/weather/tianqi-zhongyu.png b/src/assets/images/weather/tianqi-zhongyu.png new file mode 100644 index 00000000..3487d7f7 Binary files /dev/null and b/src/assets/images/weather/tianqi-zhongyu.png differ diff --git a/src/permission.js b/src/permission.js index 6e4e9002..d9f9a37a 100644 --- a/src/permission.js +++ b/src/permission.js @@ -199,6 +199,11 @@ const whiteList = [ '/pest/pestLogin',//登录 '/pest/index',//首页 '/pest/agriculturalRecords',//农事记录 + '/pest/agriculturalRecordsAdd',//农事记录(新增) + '/pest/soilTesting',//土壤检测 + '/pest/weather',//气象服务 + '/pest/growthMonitoring',//长势监测 + '/pest/temperatureAndHumidity',//温湿度 ] diff --git a/src/router/index.js b/src/router/index.js index a789898e..3ca9d5f5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -5980,7 +5980,61 @@ export const constantRoutes = [ title: '农事记录', hidden: true, }, - component: (resolve) => require(['@/views/pest/agriculturalRecords'], resolve) + component: (resolve) => require(['@/views/pest/agriculturalRecords/agriculturalRecords'], resolve) + }, + { + path: '/pest/agriculturalRecordsAdd', + name: 'agriculturalRecordsAdd', + meta: { + title: '新增农事记录', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/agriculturalRecords/agriculturalRecordsAdd'], resolve) + }, + { + path: '/pest/insectMonitoring', + name: 'insectMonitoring', + meta: { + title: '虫情监测', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/insectMonitoring/insectMonitoring'], resolve) + }, + { + path: '/pest/soilTesting', + name: 'soilTesting', + meta: { + title: '土壤检测', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/soilTesting/soilTesting'], resolve) + }, + { + path: '/pest/weather', + name: 'weather', + meta: { + title: '气象服务', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/weather/weather'], resolve) + }, + { + path: '/pest/growthMonitoring', + name: 'growthMonitoring', + meta: { + title: '长势监测', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/growthMonitoring/growthMonitoring'], resolve) + }, + { + path: '/pest/temperatureAndHumidity', + name: 'temperatureAndHumidity', + meta: { + title: '温湿度', + hidden: true, + }, + component: (resolve) => require(['@/views/pest/temperatureAndHumidity/temperatureAndHumidity'], resolve) }, ]; diff --git a/src/utils/request.js b/src/utils/request.js index 46d67c65..023805bc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -65,10 +65,11 @@ if(responseInterceptor === undefined){ responseInterceptor = service.interceptors.response.use(res => { Toast.clear(); // 未设置状态码则默认成功状态 - const code = res.data.code || 200; + const code = res.data.code || 200 || '200'; // 获取错误信息 const msg = errorCode[code] || res.data.msg || errorCode['default'] // console.info(gqnum); && gqnum === 0 + console.log(code) if (code === 401) { // gqnum++; Dialog.confirm({ @@ -135,7 +136,7 @@ if(responseInterceptor === undefined){ } else if (code === 500) { Dialog.alert({ type: 'warning', message: msg }); return Promise.reject(new Error(msg)) - } else if (code !== 200 && code !== 401) { + } else if (code !== 200 && code !== 401 && code !== '200') { Dialog.alert({ type: 'warning', message: msg }); return Promise.reject('error') } else { diff --git a/src/views/pest/agriculturalRecords.vue b/src/views/pest/agriculturalRecords/agriculturalRecords.vue similarity index 52% rename from src/views/pest/agriculturalRecords.vue rename to src/views/pest/agriculturalRecords/agriculturalRecords.vue index b9e06554..8ffe57b6 100644 --- a/src/views/pest/agriculturalRecords.vue +++ b/src/views/pest/agriculturalRecords/agriculturalRecords.vue @@ -7,23 +7,88 @@ fixed placeholder @click-left="$router.push({path:'/pest/index'})" - /> + @click-right="$router.push({path:'/pest/agriculturalRecordsAdd'})" + > + + + +
+ + + + + + + + + + + + + +
+ +
+

共14条

+
+

排序

+ +
+
- +
-

物品名称名称名称名称

-

仓库

+

记录人员

+

王响

+
+
+

农事记录

+

耕地浇灌农事记录

-
-

库存量 +100

-

预警值 50

+
+

记录日期

+

2023.02.02 21:57 星期四

@@ -56,85 +121,44 @@ diff --git a/src/views/pest/growthMonitoring/growthMonitoring.vue b/src/views/pest/growthMonitoring/growthMonitoring.vue new file mode 100644 index 00000000..7032872f --- /dev/null +++ b/src/views/pest/growthMonitoring/growthMonitoring.vue @@ -0,0 +1,481 @@ + + + diff --git a/src/views/pest/index.vue b/src/views/pest/index.vue index d5207d72..3a1fce03 100644 --- a/src/views/pest/index.vue +++ b/src/views/pest/index.vue @@ -39,23 +39,23 @@

农事记录

- +

虫情监测

- +

土壤检测

- +

气象服务

- +

温湿度

- +

长势监测

diff --git a/src/views/pest/insectMonitoring/insectMonitoring.vue b/src/views/pest/insectMonitoring/insectMonitoring.vue new file mode 100644 index 00000000..dfd77fd7 --- /dev/null +++ b/src/views/pest/insectMonitoring/insectMonitoring.vue @@ -0,0 +1,396 @@ + + + diff --git a/src/views/pest/soilTesting/soilTesting.vue b/src/views/pest/soilTesting/soilTesting.vue new file mode 100644 index 00000000..3fbfffad --- /dev/null +++ b/src/views/pest/soilTesting/soilTesting.vue @@ -0,0 +1,350 @@ + + + diff --git a/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue b/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue new file mode 100644 index 00000000..50cee09e --- /dev/null +++ b/src/views/pest/temperatureAndHumidity/temperatureAndHumidity.vue @@ -0,0 +1,512 @@ + + + diff --git a/src/views/pest/weather/weather.vue b/src/views/pest/weather/weather.vue new file mode 100644 index 00000000..f65b3bcb --- /dev/null +++ b/src/views/pest/weather/weather.vue @@ -0,0 +1,1652 @@ + + + diff --git a/static/images/pest/address.png b/static/images/pest/address.png new file mode 100644 index 00000000..89019bf5 Binary files /dev/null and b/static/images/pest/address.png differ diff --git a/static/images/pest/daytime.png b/static/images/pest/daytime.png new file mode 100644 index 00000000..9bef3e55 Binary files /dev/null and b/static/images/pest/daytime.png differ diff --git a/static/images/pest/flex_main_left_bg.png b/static/images/pest/flex_main_left_bg.png new file mode 100644 index 00000000..40cbbc34 Binary files /dev/null and b/static/images/pest/flex_main_left_bg.png differ diff --git a/static/images/pest/flex_main_left_icon.png b/static/images/pest/flex_main_left_icon.png new file mode 100644 index 00000000..ebcfe432 Binary files /dev/null and b/static/images/pest/flex_main_left_icon.png differ diff --git a/static/images/pest/growth_icon_01.png b/static/images/pest/growth_icon_01.png new file mode 100644 index 00000000..cde1ad07 Binary files /dev/null and b/static/images/pest/growth_icon_01.png differ diff --git a/static/images/pest/growth_icon_02.png b/static/images/pest/growth_icon_02.png new file mode 100644 index 00000000..f98d1661 Binary files /dev/null and b/static/images/pest/growth_icon_02.png differ diff --git a/static/images/pest/list_img.png b/static/images/pest/list_img.png new file mode 100644 index 00000000..028dad05 Binary files /dev/null and b/static/images/pest/list_img.png differ diff --git a/static/images/pest/map_bg.png b/static/images/pest/map_bg.png new file mode 100644 index 00000000..43df46d2 Binary files /dev/null and b/static/images/pest/map_bg.png differ diff --git a/static/images/pest/search_icon.png b/static/images/pest/search_icon.png new file mode 100644 index 00000000..0aa1f3f5 Binary files /dev/null and b/static/images/pest/search_icon.png differ diff --git a/static/images/pest/weather/weather_icon_01.png b/static/images/pest/weather/weather_icon_01.png new file mode 100644 index 00000000..a4554589 Binary files /dev/null and b/static/images/pest/weather/weather_icon_01.png differ diff --git a/static/images/pest/weather/weather_icon_02.png b/static/images/pest/weather/weather_icon_02.png new file mode 100644 index 00000000..778cd45d Binary files /dev/null and b/static/images/pest/weather/weather_icon_02.png differ diff --git a/static/images/pest/weather/weather_icon_03.png b/static/images/pest/weather/weather_icon_03.png new file mode 100644 index 00000000..a3b5074d Binary files /dev/null and b/static/images/pest/weather/weather_icon_03.png differ diff --git a/static/images/pest/weather/weather_icon_04.png b/static/images/pest/weather/weather_icon_04.png new file mode 100644 index 00000000..5a3ebcb1 Binary files /dev/null and b/static/images/pest/weather/weather_icon_04.png differ diff --git a/static/images/pest/weather/weather_icon_05.png b/static/images/pest/weather/weather_icon_05.png new file mode 100644 index 00000000..5d7593ea Binary files /dev/null and b/static/images/pest/weather/weather_icon_05.png differ diff --git a/static/images/pest/weather/weather_icon_06.png b/static/images/pest/weather/weather_icon_06.png new file mode 100644 index 00000000..277237af Binary files /dev/null and b/static/images/pest/weather/weather_icon_06.png differ diff --git a/static/images/pest/weather/weather_icon_07.png b/static/images/pest/weather/weather_icon_07.png new file mode 100644 index 00000000..4f8505b7 Binary files /dev/null and b/static/images/pest/weather/weather_icon_07.png differ diff --git a/static/images/pest/weather/weather_icon_08.png b/static/images/pest/weather/weather_icon_08.png new file mode 100644 index 00000000..c4be9bb5 Binary files /dev/null and b/static/images/pest/weather/weather_icon_08.png differ diff --git a/static/images/pest/weather/weather_icon_09.png b/static/images/pest/weather/weather_icon_09.png new file mode 100644 index 00000000..7c8f2fba Binary files /dev/null and b/static/images/pest/weather/weather_icon_09.png differ diff --git a/static/images/pest/weather/weather_icon_10.png b/static/images/pest/weather/weather_icon_10.png new file mode 100644 index 00000000..c9a22367 Binary files /dev/null and b/static/images/pest/weather/weather_icon_10.png differ