修改错别字

src/components/Tab5DialogThree.vue

@@ -13,9 +13,7 @@
         class="demo-ruleForm"
       >
         <el-form-item label="年份：" prop="year">
-          <i class="biaoshi2 biaoshi"></i>
-          <el-date-picker v-model="value2" type="month" placeholder="选择年-月">
-          </el-date-picker>
+          <el-input v-model="ruleForm.year" style="width:500px"></el-input>
         </el-form-item>
         <!-- 图片和附件 -->
         <el-form-item label="进度图片：">
@@ -42,7 +40,7 @@
             </div>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <span>格式要求：支持png、jpg、gif和jpeg的图片格式；最大支持100M。</span>
+          <span>格式要求：支持png、jpg、gif和jpeg的图片格式；最大支持5M。</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -69,7 +67,6 @@ export default {
   data () {
     return {
       // 服务器前缀地址
-      value2: '',
       baseURL: '',
       token: '',
       ruleForm: {
@@ -78,15 +75,13 @@ export default {
         year: ''
       },
       rules: {
+        year: [{ required: true, message: '不能为空', trigger: 'blur' }]
       }
     }
   },
   computed: {},
   watch: {
-    value2 (val) {
-      const temp = this.moment(val).format('YYYY-MM')
-      this.ruleForm.year = temp
-    }
+
   },
   methods: {
     // 点击关闭
@@ -98,12 +93,13 @@ export default {
         thumb: '',
         year: ''
       }
-      this.value2 = ''
+      // 关闭验证
+      this.$refs.ruleForm.resetFields()
     },
     // 点击确定
     async btnOk () {
       if (this.ruleForm.thumb === '') { return this.$message.warning('封面图片不能为空') }
-      if (!this.value2) { return this.$message.warning('年份不能为空') }
+      if (this.ruleForm.year.trim() === '') { return this.$message.warning('年份不能为空') }
       const obj = { ...this.ruleForm }
       const res = await siteImgSave(obj)
       if (res.code === 0) {
@@ -118,7 +114,7 @@ export default {
     beforethumbUpload (file) {
       // console.log(998, file)
       // 限制图片大小和格式
-      const sizeOk = file.size / 1024 / 1024 < 100
+      const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
         file.type === 'image/jpeg' ||
@@ -129,7 +125,7 @@ export default {
           this.$message.error('照片格式有误！')
           reject(file)
         } else if (!sizeOk) {
-          this.$message.error('照片大小超过100M！')
+          this.$message.error('照片大小超过5M！')
           reject(file)
         } else if (file.name.length > 32) {
           this.$message.error('照片名字不能超过32个字！')
@@ -148,7 +144,6 @@ export default {
     async videoDetailById3 (id) {
       const res = await videoDetailById3(id)
       this.ruleForm = res.data
-      this.value2 = res.data.year
       // console.log(998, res)
     }
   },

src/components/tab6Dialog.vue

@@ -13,9 +13,7 @@
         class="demo-ruleForm"
       >
         <el-form-item label="年份：" prop="year">
-          <i class="biaoshi2 biaoshi"></i>
-          <el-date-picker v-model="value2" type="month" placeholder="选择年-月">
-          </el-date-picker>
+          <el-input v-model="ruleForm.year" style="width:500px"></el-input>
         </el-form-item>
         <!-- 图片和附件 -->
         <el-form-item label="图片：">
@@ -42,7 +40,7 @@
             </div>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <span>格式要求：支持png、jpg、gif和jpeg的图片格式；最大支持100M。</span>
+          <span>格式要求：支持png、jpg、gif和jpeg的图片格式；最大支持5M。</span>
         </el-form-item>
         <el-form-item label="更新时间：">
           <i class="biaoshi"></i>
@@ -105,7 +103,6 @@ export default {
         ]
       },
       time: '', // 服务器前缀地址
-      value2: '',
       baseURL: '',
       token: '',
       ruleForm: {
@@ -115,15 +112,12 @@ export default {
         userUpdateTime: ''
       },
       rules: {
+        year: [{ required: true, message: '不能为空', trigger: 'blur' }]
       }
     }
   },
   computed: {},
   watch: {
-    value2 (val) {
-      const temp = this.moment(val).format('YYYY-MM')
-      this.ruleForm.year = temp
-    },
     time (val) {
       const temp = this.moment(val).format('YYYY-MM-DD HH:mm:ss')
       this.ruleForm.userUpdateTime = temp
@@ -140,12 +134,13 @@ export default {
         year: '',
         userUpdateTime: ''
       }
-      this.value2 = ''
+      // 关闭验证
+      this.$refs.ruleForm.resetFields()
     },
     // 点击确定
     async btnOk () {
       if (this.ruleForm.thumb === '') { return this.$message.warning('封面图片不能为空') }
-      if (!this.value2) { return this.$message.warning('年份不能为空') }
+      if (this.ruleForm.year.trim() === '') { return this.$message.warning('年份不能为空') }
       if (this.time === null) return this.$message.warning('时间不能为空!')
       const obj = { ...this.ruleForm }
       const res = await aerialImgSave(obj)
@@ -161,7 +156,7 @@ export default {
     beforethumbUpload (file) {
       // console.log(998, file)
       // 限制图片大小和格式
-      const sizeOk = file.size / 1024 / 1024 < 100
+      const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
         file.type === 'image/jpeg' ||
@@ -172,7 +167,7 @@ export default {
           this.$message.error('照片格式有误！')
           reject(file)
         } else if (!sizeOk) {
-          this.$message.error('照片大小超过100M！')
+          this.$message.error('照片大小超过5M！')
           reject(file)
         } else if (file.name.length > 32) {
           this.$message.error('照片名字不能超过32个字！')
@@ -191,7 +186,6 @@ export default {
     async imgDetailById (id) {
       const res = await imgDetailById(id)
       this.ruleForm = res.data
-      this.value2 = res.data.year
       // console.log(998, res)
       this.getCurrentTime()
     },

src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 const service = axios.create({
   // baseURL: 'http://192.168.0.135:8011/', // 本地调试
-  baseURL: 'http://8.135.106.227:8012/', // 线上调试
-  // baseURL: '', // build
+  // baseURL: 'http://8.135.106.227:8012/', // 线上调试
+  baseURL: '', // build
   timeout: 5000
 })
 // 请求拦截器

src/views/tab4/edit2.vue

@@ -52,14 +52,14 @@
           ></el-input>
           <!-- <span class="unit">个</span> -->
         </el-form-item>
-        <el-form-item label="供能-启用：" prop="aerialStart">
+        <el-form-item label="功能-启用：" prop="aerialStart">
           <el-input
             v-model.number="ruleForm.aerialStart"
             type="number"
           ></el-input>
           <!-- <span class="unit">辆</span> -->
         </el-form-item>
-        <el-form-item label="供能-停用：" prop="aerialStop">
+        <el-form-item label="功能-停用：" prop="aerialStop">
           <el-input
             v-model.number="ruleForm.aerialStop"
             type="number"

src/views/tab4/index.vue

@@ -160,7 +160,7 @@ export default {
           temp.conten = `摄像头：${temp.data.camera}个；巡逻车：${temp.data.cruiser}辆；门禁锁：${temp.data.door}个；无人机：${temp.data.aerial}辆`
         } else {
           temp.type = '设备情况'
-          temp.conten = `监控-启用：${temp.data.cameraStart}个；监控-停用：${temp.data.cameraStop}个；消防-启用：${temp.data.cruiserStart}辆；消防-停用：${temp.data.cruiserStop}辆；监测-启用：${temp.data.doorStart}个；监测-停用：${temp.data.doorStop}个；供能-启用：${temp.data.aerialStart}辆；供能-停用：${temp.data.aerialStop}辆`
+          temp.conten = `监控-启用：${temp.data.cameraStart}个；监控-停用：${temp.data.cameraStop}个；消防-启用：${temp.data.cruiserStart}辆；消防-停用：${temp.data.cruiserStop}辆；监测-启用：${temp.data.doorStart}个；监测-停用：${temp.data.doorStop}个；功能-启用：${temp.data.aerialStart}辆；功能-停用：${temp.data.aerialStop}辆`
         }
         this.tableData.push(temp)
       })