Parcourir la source

feat:宁录更新

yf_elsa.cui il y a 1 mois
Parent
commit
268f392a34

Fichier diff supprimé car celui-ci est trop grand
+ 2 - 2
dist/index.html


BIN
dist/static/css/app.6d3e8f5c5f5febc500f97b13b70e944c.css.gz


Fichier diff supprimé car celui-ci est trop grand
+ 2 - 2
dist/static/css/app.6d3e8f5c5f5febc500f97b13b70e944c.css


BIN
dist/static/css/app.c7f5660af10e5548184b57cd0412be73.css.gz


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
dist/static/js/36.5e6fd863c18788dc4a6c.js


BIN
dist/static/js/36.0b0f4892213679565a02.js.gz


BIN
dist/static/js/36.5e6fd863c18788dc4a6c.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
dist/static/js/6.cf00e71b8acd80cf24dd.js


BIN
dist/static/js/6.cf00e71b8acd80cf24dd.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1
dist/static/js/73.070bedaa5fecdef45b7c.js


BIN
dist/static/js/73.070bedaa5fecdef45b7c.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
dist/static/js/73.71ec067c27487fa8494b.js


BIN
dist/static/js/73.71ec067c27487fa8494b.js.gz


BIN
dist/static/js/manifest.211d88e0ef1f5c373cb1.js.gz


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
dist/static/js/manifest.211d88e0ef1f5c373cb1.js


BIN
dist/static/js/manifest.9bd3ad6add8a621d4a03.js.gz


+ 2 - 2
src/components/Index.vue

@@ -100,14 +100,14 @@
                 ></i>
               </div> -->
               <!-- 移动端扫码下载界面 v-if="QR_show" -->
-              <div class="iconFont" v-if="qrCodeIsShow == 'true'">
+              <!-- <div class="iconFont" v-if="qrCodeIsShow == 'true'">
                 <i
                   title="移动端扫码下载"
                   @click="changqrCode"
                   class="yficonfont icon-erweima"
                   style="color: #fff"
                 ></i>
-              </div>
+              </div> -->
 
               <!-- 更换主题颜色、字体 -->
               <div class="iconFont">

+ 29 - 68
src/pages/fourMoodBase/baseManage.vue

@@ -25,10 +25,7 @@
           >新增</el-button
         >
       </div>
-      <div
-        slot="search-common"
-        style="display: inline-block; margin: 0 5px 0 0"
-      >
+      <div slot="search-common" style="display: inline-block; margin: 0 5px 0 0">
         <!-- <el-button
           v-btnRight:added="$route.path"
           type="primary"
@@ -61,10 +58,7 @@
       >
         <el-card class="box-card boxCard">
           <!-- 全景VR -->
-          <i
-            class="whole-icon  yficonfont icon-keshihuaquanjing"
-            @click="wholeScene(item)"
-          ></i>
+          <i class="whole-icon yficonfont icon-keshihuaquanjing" @click="wholeScene(item)"></i>
 
           <div class="baseCard">
             <div class="baseImg">
@@ -117,11 +111,7 @@
     </el-row>
     <!-- 暂无数据 -->
     <div class="expertDiagnosis_referral_units_not" v-if="baseList.length <= 0">
-      <img
-        :src="$imghost + zanwu"
-        alt
-        class="expertDiagnosis_referral_units_notImg"
-      />
+      <img :src="$imghost + zanwu" alt class="expertDiagnosis_referral_units_notImg" />
     </div>
     <el-pagination
       v-if="baseList.length > 0"
@@ -157,19 +147,12 @@
             :show-file-list="false"
             :on-change="changeUpload"
           >
-            <img
-              v-if="addBaseInfo.imgSrc"
-              :src="addBaseInfo.imgSrc"
-              class="avatar"
-            />
+            <img v-if="addBaseInfo.imgSrc" :src="addBaseInfo.imgSrc" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="负责人:" prop="principal">
-          <el-input
-            v-model="addBaseInfo.principal"
-            @input="principalinput"
-          ></el-input>
+          <el-input v-model="addBaseInfo.principal" @input="principalinput"></el-input>
         </el-form-item>
         <el-form-item label="联系电话:" prop="phone">
           <el-input v-model="addBaseInfo.phone"></el-input>
@@ -195,7 +178,7 @@
           <el-row>
             <el-col :span="22">
               <el-tag
-                style="margin-right:5px;"
+                style="margin-right: 5px"
                 type="success"
                 v-for="item in addBaseInfo.bindEquip"
                 :key="item[1]"
@@ -223,9 +206,7 @@
             disabled
             placeholder="请定位"
           ></el-input>
-          <el-button type="primary" size="mini" @click="goLocation"
-            >基地定位</el-button
-          >
+          <el-button type="primary" size="mini" @click="goLocation">基地定位</el-button>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -263,12 +244,7 @@
       width="800px"
       @closed="addLocationDialogClosed"
     >
-      <el-form
-        :inline="true"
-        :model="locationForm"
-        class="demo-form-inline"
-        size="mini"
-      >
+      <el-form :inline="true" :model="locationForm" class="demo-form-inline" size="mini">
         <el-form-item label="经度">
           <el-input v-model="locationForm.lng"></el-input>
         </el-form-item>
@@ -276,17 +252,10 @@
           <el-input v-model="locationForm.lat"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="mini" @click="locationSearch"
-            >定位</el-button
-          >
+          <el-button type="primary" size="mini" @click="locationSearch">定位</el-button>
         </el-form-item>
         <el-form-item>
-          <el-input
-            @change="addrChange()"
-            clearable
-            placeholder="请输入地区检索"
-            v-model="addr"
-          >
+          <el-input @change="addrChange()" clearable placeholder="请输入地区检索" v-model="addr">
             <i slot="suffix" class="el-input__icon el-icon-search"></i>
           </el-input>
         </el-form-item>
@@ -372,9 +341,7 @@ export default {
             message: '不允许输入空格等特殊符号'
           }
         ],
-        imgSrc: [
-          { required: true, message: '请选择基地图片', trigger: 'change' }
-        ],
+        imgSrc: [{ required: true, message: '请选择基地图片', trigger: 'change' }],
         principal: [
           { required: true, message: '请输入负责人', trigger: 'blur' },
           {
@@ -388,24 +355,19 @@ export default {
           { required: true, trigger: 'blur', message: '手机号不能为空' },
           { required: true, validator: checkMobile, trigger: 'blur' }
         ],
-        cascaderEquipArr: [
-          { required: true, message: '请选择基地设备', trigger: 'change' }
-        ],
-        address: [
-          { required: true, message: '请选择基地地址', trigger: 'change' }
-        ],
+        cascaderEquipArr: [{ required: true, message: '请选择基地设备', trigger: 'change' }],
+        address: [{ required: true, message: '请选择基地地址', trigger: 'change' }],
         baseIntro: [
           { max: 200, message: '基地描述不能超过200个字符', trigger: 'blur' },
           {
-            pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/,
+            pattern: /^[A-Za-z0-9\u4e00-\u9fa5_,-.。;!??]+$/,
             message: '不允许输入空格等特殊符号'
           }
         ]
       },
       // 裁剪组件的基础配置option
       option: {
-        img:
-          'https://qn-qn-kibey-../../assets-cdn.app-echo.com/goodboy-weixin.PNG', // 裁剪图片的地址
+        img: 'https://qn-qn-kibey-../../assets-cdn.app-echo.com/goodboy-weixin.PNG', // 裁剪图片的地址
         info: true, // 裁剪框的大小信息
         outputSize: 0.8, // 裁剪生成图片的质量
         outputType: 'jpeg', // 裁剪生成图片的格式
@@ -437,7 +399,7 @@ export default {
     }
   },
   filters: {
-    formatName: function(value) {
+    formatName: function (value) {
       // 地址名称
       if (value.length > 7) {
         return value.slice(0, 7) + '...'
@@ -462,7 +424,7 @@ export default {
           search: this.search,
           page: this.page
         })
-      }).then(res => {
+      }).then((res) => {
         if (res.data.message == '') {
           let data = res.data.data.data
           let _this = this
@@ -477,10 +439,9 @@ export default {
                 key: '78ce288400f4fc6d9458989875c833c2',
                 location: `${lng},${lat}`
               })
-              .then(res => {
+              .then((res) => {
                 // console.log(res);
-                let addressComponent =
-                  res.regeocode && res.regeocode.formatted_address
+                let addressComponent = res.regeocode && res.regeocode.formatted_address
                 if (addressComponent) {
                   data[j].address = res.regeocode.formatted_address
                 } else {
@@ -508,7 +469,7 @@ export default {
         data: this.qs.stringify({
           base_id: id
         })
-      }).then(res => {
+      }).then((res) => {
         let data = res.data.data.data
         this.addBaseInfo.cascaderEquipArr = data
       })
@@ -536,9 +497,9 @@ export default {
     },
     // 添加/删除基地
     addBaseSubm() {
-      this.$refs.addBaseFormRef.validate(valid => {
+      this.$refs.addBaseFormRef.validate((valid) => {
         if (valid) {
-          let arr = this.addBaseInfo.bindEquip.map(item => {
+          let arr = this.addBaseInfo.bindEquip.map((item) => {
             return item[1]
           })
           if (this.flag == 1) {
@@ -573,7 +534,7 @@ export default {
           lng: this.addBaseInfo.lng,
           lat: this.addBaseInfo.lat
         })
-      }).then(res => {
+      }).then((res) => {
         if (res.data.message == '') {
           this.baseAddVisible = false
           this.getBaseList()
@@ -597,7 +558,7 @@ export default {
     // 点击裁剪,这一步是可以拿到处理后的地址
     finish() {
       // 获取截图的base64 数据
-      this.$refs.cropper.getCropBlob(data => {
+      this.$refs.cropper.getCropBlob((data) => {
         var form = new FormData()
         let resFile = this.blobToFile(data, 'filename.jpg')
         form.append('img_file', resFile)
@@ -606,7 +567,7 @@ export default {
           method: 'POST',
           url: '/api/api_gateway?method=base.bases.base_photo',
           data: form
-        }).then(res => {
+        }).then((res) => {
           if (res.data.message == '') {
             this.addBaseInfo.imgSrc = res.data.data.src
           }
@@ -645,7 +606,7 @@ export default {
     },
     addrChange() {
       let local = new this.BMap.LocalSearch(this.map, {
-        onSearchComplete: results => {
+        onSearchComplete: (results) => {
           console.log(results, ' addr change', results.Yr)
           if (results.Yr && results.Yr.length) {
             const data = results.Yr[0]
@@ -683,7 +644,7 @@ export default {
       this.$jsonp(`//restapi.amap.com/v3/geocode/regeo?output=json`, {
         key: '78ce288400f4fc6d9458989875c833c2',
         location: `${lng},${lat}`
-      }).then(res => {
+      }).then((res) => {
         let addressComponent = res.regeocode && res.regeocode.formatted_address
         if (addressComponent) {
           this.addBaseInfo.address = res.regeocode.formatted_address
@@ -706,7 +667,7 @@ export default {
           ret: 'details',
           base_id: id
         })
-      }).then(res => {
+      }).then((res) => {
         let item = res.data.data[0]
         this.addBaseInfo.baseName = item.base_name
         this.addBaseInfo.principal = item.base_charge
@@ -749,7 +710,7 @@ export default {
               ret: 'del',
               base_id: id
             })
-          }).then(res => {
+          }).then((res) => {
             this.getBaseList()
             this.$message({
               type: 'success',