diff --git a/.eslintrc.cjs b/.eslintrc.cjs index bed9a17..4ac051e 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -20,5 +20,5 @@ module.exports = { 'vue/multi-word-component-names': 'off', 'prettier/prettier': 'error' }, - ignorePatterns: ['**/index.html'] -} \ No newline at end of file + ignorePatterns: ['**/knowledge.html'] +} diff --git a/src/api/flower/index.js b/src/api/flower/index.js index 2276172..abb8bc5 100644 --- a/src/api/flower/index.js +++ b/src/api/flower/index.js @@ -2,14 +2,14 @@ import fetch from '../fetch.js' export default { save(params) { - return fetch('/farmTemplate/add', params,'post','json') + return fetch('/library/add', params,'post','json') }, update(params) { - return fetch('/farmTemplate/update', params,'post','json') + return fetch('/library/update', params,'post','json') }, list(params) { - return fetch('/farmTemplate/list', params,'post','json') + return fetch('/library/list', params,'post','json') }, } diff --git a/src/components/preview/index.vue b/src/components/preview/index.vue index 246957d..9d840f5 100644 --- a/src/components/preview/index.vue +++ b/src/components/preview/index.vue @@ -80,7 +80,7 @@ import '@vue-office/docx/lib/index.css' import VueOfficeExcel from '@vue-office/excel' //引入相关样式 import '@vue-office/excel/lib/index.css' -import history from "@/components/history/index.vue"; +import history from "@/components/history/knowledge.vue"; export default { components: { diff --git a/src/views/flower/plan/components/edit.vue b/src/views/flower/knowledge/components/edit.vue similarity index 65% rename from src/views/flower/plan/components/edit.vue rename to src/views/flower/knowledge/components/edit.vue index f301375..2dc5d29 100644 --- a/src/views/flower/plan/components/edit.vue +++ b/src/views/flower/knowledge/components/edit.vue @@ -50,22 +50,36 @@ export default { show: false, title: '新增', from: { - circleDays: 0, - desc: '请输入描述', - isCircle: 0, - name: '请输入名称', - remark: '请输入备注' + "name": "蝴蝶兰", + "latinName": "Phalaenopsis aphrodite Rchb. f.", + "aliases": "蝶兰,台湾蝴蝶兰,洋兰皇后", + "genus": "蝴蝶兰属", + "ossId": "9bb42e62-9c13-11f0-aa50-ea36f1e40c44", + "growthHabit": "喜高温多湿半阴环境,不耐寒,怕干旱和强光,忌积水;附生于树干或岩石,根系暴露于空气中吸收水分", + "pestsDiseases": "叶斑病,灰霉病,褐斑病,介壳虫,煤烟病", + "lifeCycle": "多年生", + "lightIntensity": "中光照", + "lightType": "散射光", + "optimalTempMin": 20, + "optimalTempMax": 28, + "hardyTempMin": 5, + "hardyTempMax": 32, + "foliageType": "稍肉质", + "foliageColor": "正面绿色,背面紫绿色", + "foliageShape": "椭圆形或长圆形,先端锐尖或钝", + "height": 50, + "floweringPeriod": "自然花期4-6月,人工栽培可全年开花(盛花期12-3月)", + "floweringColor": "白、粉、黄、紫红等,常具斑纹或条纹", + "floweringShape": "花姿如蝶,唇瓣3裂,具卷须", + "flowerDiameter": 90 } + } }, methods: { reset(){ this.from = { - circleDays: 0, - desc: '请输入描述', - isCircle: 0, name: '请输入名称', - remark: '请输入备注' } }, submit(done) { diff --git a/src/views/flower/plan/index.vue b/src/views/flower/knowledge/index.vue similarity index 78% rename from src/views/flower/plan/index.vue rename to src/views/flower/knowledge/index.vue index 4776f7e..291b049 100644 --- a/src/views/flower/plan/index.vue +++ b/src/views/flower/knowledge/index.vue @@ -1,6 +1,6 @@