1

src/assets/style/public.scss

@@ -372,4 +372,10 @@ body {
 .el-scrollbar{
   overflow:initial
 }
+}
+.el-upload--text{
+  color: red;
+}
+.el-input__wrapper{
+  padding: 0 !important;
 }

src/components/share/index.vue

@@ -47,8 +47,8 @@ export default {
     const fileChange = (ev) => {
       let file = ev.target.files[0]
 
-      if (file.type !== 'image/png' && file.type !== 'image/jpeg') return getApp().$alert('请上传jpg/png格式', '提示')
-      if (file.size / 1024 / 1024 > 1)  return getApp().$alert('请上传1M以内的图片', '提示')
+      if (file.type !== 'image/png' && file.type !== 'image/jpeg') return getApp().$alert('請上傳jpg/png格式', '提示')
+      if (file.size / 1024 / 1024 > 1)  return getApp().$alert('請上傳1M以內的圖片', '提示')
       
       let render = new FileReader()
 
@@ -64,7 +64,7 @@ export default {
   methods: {
     copyLink() {
       copyText(this._link)
-      this.$message('链接复制成功');
+      this.$message('鏈接復製成功');
     }
   },
   components: {

src/components/upload-com/index.vue

@@ -8,9 +8,9 @@
       <i class="el-icon-plus"></i>
 
       <label for="file-upload"></label>
-      <input accept="image/png,image/jpeg" ref="upload" type="file" id="file-upload" @change="fileChange" />
+      <input :accept="z_accept||'image/png,image/jpeg'" ref="upload" type="file" id="file-upload" @change="fileChange" />
     </div>
-    <span class="size">支持png/jpg圖片格式，大小不超過1MB</span>
+    <span class="size">支持{{z_accept?'png':'png/jpg'}}圖片格式，大小不超過1MB</span>
 
   </div>
 </template>
@@ -20,13 +20,13 @@ import { computed } from "vue";
 import { getApp } from "@/app";
 
 export default {
-  props: ["link", "logo", ],
+  props: ["link", "logo", 'accept'],
   setup(props, context) {
 
     const fileChange = (ev) => {
       let file = ev.target.files[0];
-
-      if (file.type !== "image/png" && file.type !== "image/jpeg") return getApp().$alert("請上傳jpg/png格式", "提示");
+      let accsptList = z_accept.value && z_accept.value.split(",") || ['image/png', 'image/jpeg']
+      if (!accsptList.includes(file.type)) return getApp().$alert(`請上傳${z_accept.value?'png':'png/jpg'}格式`, "提示");
       if (file.size / 1024 / 1024 > 1) return getApp().$alert("請上傳1MB以內的圖片", "提示");
 
       let render = new FileReader();
@@ -39,7 +39,10 @@ export default {
       context.emit("changeLogo", file);
     };
     const z_logo = computed(() => props.logo )
-    return {  fileChange, z_logo };
+    const z_accept = computed(() => {
+      return props.accept
+    } )
+    return {  fileChange, z_logo, z_accept };
   }
 };
 </script>

src/request/config.js

@@ -82,7 +82,7 @@ export const delBorderApi = '/back/hotOutline/del'
 export const getBrandList = '/back/brand/list'
 //品牌列表
 export const exporBrandList = '/back/brand/downBrandExcel'
-//更新品牌信息
+//更新品牌訊息
 export const getBrandupdateBrandInfo = '/back/brand/updateBrandInfo'
 //下载导入模版
 export const downTemplate = '/back/excel/downTemplate'

src/router/index.js

@@ -47,7 +47,7 @@ const routes = [
       {
         name: 'brand',
         path: 'brand',
-        meta: { title: '品牌信息', checkAuth: true },
+        meta: { title: '品牌訊息', checkAuth: true },
         component: Brand,
       },
       {

src/view/camera/index.vue

@@ -8,7 +8,7 @@
         <com-company v-model="search.state.departmentId" />
         <!-- <el-input v-model="search.state.searchKey" placeholder="请输入"></el-input> -->
       </el-form-item>
-      <el-form-item label="激活时间：">
+      <el-form-item label="激活時間：">
         <el-date-picker
           v-model="time"
           type="daterange"
@@ -46,11 +46,11 @@
       @row-click="dataList.selectRow"
     >
       <el-table-column label="S/N" prop="snCode"></el-table-column>
-      <el-table-column label="Wi-Fi名称" prop="wifiName"></el-table-column>
-      <el-table-column label="激活时间" prop="activatedTime"></el-table-column>
+      <el-table-column label="Wi-Fi名稱" prop="wifiName"></el-table-column>
+      <el-table-column label="激活時間" prop="activatedTime"></el-table-column>
       <el-table-column label="所属架构" prop="departmentName"></el-table-column>
       <el-table-column label="拍摄VR数量" prop="sceneCount"></el-table-column>
-      <el-table-column label="最后拍摄时间" prop="lastTime"></el-table-column>
+      <el-table-column label="最后拍摄時間" prop="lastTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }" v-if="auth.unbind || auth.update">
         <span class="oper-span" @click="oper.readyUpdate(row)" v-if="auth.update">编辑</span>
         <span class="oper-span" 
@@ -83,7 +83,7 @@
           <el-option label="区域二" value="beijing"></el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item label="Wi-Fi名称：" class="mandatory">
+      <el-form-item label="Wi-Fi名稱：" class="mandatory">
         <el-input :modelValue="oper.state.wifiName" @update:modelValue="val => oper.state.wifiName = val.trim()"></el-input>
       </el-form-item>
       <el-form-item label="物理地址：" class="mandatory">
@@ -174,7 +174,7 @@ export default {
     },
     submit() {
       if (!this.oper.state.wifiName.trim()) {
-        return this.$alert('Wi-Fi名称不能为空！', '提示')
+        return this.$alert('Wi-Fi名稱不能为空！', '提示')
       } else if (!this.oper.state.snCode.trim()) {
         return this.$alert('S/N不能为空！', '提示')
       } else if (!this.oper.state.childName.trim()) {

src/view/examine/estate/index.vue

@@ -20,7 +20,7 @@
           <el-option v-for="(item) in status" :key="item.value" :label="item.name" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="提审时间：">
+      <el-form-item label="提审時間：">
         <el-date-picker
           v-model="time"
           type="daterange"
@@ -29,7 +29,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="提审时间：">
+      <!-- <el-form-item label="提审時間：">
         <el-date-picker
           v-model="submitAuditTime"
           type="daterange"
@@ -67,7 +67,7 @@
       <el-table-column label="所属楼盘" prop="estateName"></el-table-column>
       <el-table-column label="公司" prop="belongCompanyName"></el-table-column>
       <el-table-column label="创建人" prop="createByName"></el-table-column>
-      <el-table-column label="提审时间" prop="submitAuditTime"></el-table-column>
+      <el-table-column label="提审時間" prop="submitAuditTime"></el-table-column>
       <el-table-column label="审核状态" prop="auditStatus" v-slot:default="{ row }">
         <div class="status" :class="{interactive: row.countNum > 0}" @click="row.countNum > 0  && showSelectRow(row)">
           <span>{{row.status === adoptStatus ? row.online ? '已上线': '已审核' : getExamineName(row.status)}}</span>
@@ -78,7 +78,7 @@
         </div>
       </el-table-column>
       <el-table-column label="审核人" prop="auditorName"></el-table-column>
-      <el-table-column label="审核时间" prop="auditTime"></el-table-column>
+      <el-table-column label="审核時間" prop="auditTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }">
         <span class="oper-span" @click="shareRow(row)">预览</span>
         <span class="oper-span"
@@ -303,7 +303,7 @@ export default {
         pageSize: this.pag.state.size
       }
       if (!params.startTime || !params.endTime) {
-        return this.$alert('请先选择提审时间段', '提示')
+        return this.$alert('请先选择提审時間段', '提示')
       } else {
         const monthDiff = (startDate, endDate) => Math.max(0, (endDate.getFullYear() - startDate.getFullYear()) * 12 - startDate.getMonth() + endDate.getMonth());
         if (monthDiff(this.time[0], this.time[1]) > 3) {

src/view/examine/other/community/body.vue

@@ -14,7 +14,7 @@
       <el-table-column label="小区编码" v-slot:default="{ row }">
         {{row.gardenNumber}}
       </el-table-column>
-      <el-table-column label="小区名称" v-slot:default="{ row }">
+      <el-table-column label="小区名稱" v-slot:default="{ row }">
         {{row.gardenName}}
       </el-table-column>
 
@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="创建人" prop="creatorName"></el-table-column>
       <el-table-column label="所属公司" prop="companyName"></el-table-column>
-      <el-table-column label="创建时间" prop="createTime"></el-table-column>
+      <el-table-column label="创建時間" prop="createTime"></el-table-column>
       <el-table-column label="状态" v-slot:default="{row}" width="90">
         <div class="status" :class="{interactive: row.auditStatus !== draftStatus}" @click="row.auditStatus !== draftStatus && selectRow(row)">
           <span>{{getStatusName(row.auditStatus)}}</span>
@@ -40,7 +40,7 @@
         </div>
       </el-table-column>
       <el-table-column label="审核人" prop="auditorName"></el-table-column>
-      <el-table-column label="审核时间" prop="auditTime"></el-table-column>
+      <el-table-column label="审核時間" prop="auditTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }">
         <span class="oper-span" @click="shareRow(row)" v-if="false">预览</span>
         <span class="oper-span"

src/view/examine/other/community/head.vue

@@ -4,7 +4,7 @@
       <el-form-item label="小区编码：">
         <el-input v-model="search.state.gardenNumber" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="小区名称：">
+      <el-form-item label="小区名稱：">
         <el-input v-model="search.state.gardenName" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item label="城市：">
@@ -42,7 +42,7 @@
       <el-form-item label="更新人：">
         <el-input v-model="search.state.updateByName" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="创建时间：">
+      <el-form-item label="创建時間：">
         <el-date-picker
           v-model="createTime"
           type="daterange"
@@ -106,7 +106,7 @@ export default {
         pageSize: this.pag.state.size
       }
       // if (!params.startTime || !params.endTime) {
-      //   return this.$alert('请先选择提审时间段', '提示')
+      //   return this.$alert('请先选择提审時間段', '提示')
       // } else {
       //   const monthDiff = (startDate, endDate) => Math.max(0, (endDate.getFullYear() - startDate.getFullYear()) * 1022 - startDate.getMonth() + endDate.getMonth());
       //   if (monthDiff(this.time[0], this.time[1]) > 3) {

src/view/examine/other/second-house/body.vue

@@ -25,7 +25,7 @@
       <el-table-column label="套内面积" prop="roomArea"></el-table-column>
       <el-table-column label="维护人" prop="maintenanceman"></el-table-column>
       
-      <el-table-column label="提审时间" prop="arraignmentTime"></el-table-column>
+      <el-table-column label="提审時間" prop="arraignmentTime"></el-table-column>
       <el-table-column label="审核状态" prop="auditStatus" v-slot:default="{ row }">
         <div class="status" :class="{interactive: row.auditStatus !== draftStatus || row.reviewer || row.reviewTime}" @click="(row.auditStatus !== draftStatus || row.reviewer || row.reviewTime) && showSelectRow(row)">
           <span>{{getStatusName(row.auditStatus)}}</span>
@@ -36,7 +36,7 @@
         </div>
       </el-table-column>
       <el-table-column label="审核人" prop="reviewer"></el-table-column>
-      <el-table-column label="审核时间" prop="reviewTime"></el-table-column>
+      <el-table-column label="审核時間" prop="reviewTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }">
         <span class="oper-span" @click="shareRow(row)" v-if="false">预览</span>
         <span class="oper-span"

src/view/examine/other/second-house/head.vue

@@ -10,7 +10,7 @@
       <el-form-item label="维护人：">
         <el-input v-model="search.state.maintenanceman" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="提审时间：">
+      <el-form-item label="提审時間：">
         <el-date-picker
           v-model="arraignmentTime"
           type="daterange"
@@ -29,7 +29,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="审核时间：">
+      <el-form-item label="审核時間：">
         <el-date-picker
           v-model="reviewTime"
           type="daterange"
@@ -89,7 +89,7 @@ export default {
       }
       console.log(params)
       if (!params.arraignmentTimeEnd || !params.arraignmentTimeStart) {
-        return this.$alert('请先选择提审时间段', '提示')
+        return this.$alert('请先选择提审時間段', '提示')
       } else {
         const monthDiff = (startDate, endDate) => Math.max(0, (endDate.getFullYear() - startDate.getFullYear()) * 12 - startDate.getMonth() + endDate.getMonth());
         if (monthDiff(this.arraignmentTime[0], this.arraignmentTime[1]) > 3) {

src/view/firmware/index.vue

@@ -1,7 +1,7 @@
 <template>
   <com-head :options="headList" showCtrl>
     <el-form label-width="90px" inline="true">
-      <el-form-item label="发布时间：">
+      <el-form-item label="发布時間：">
         <el-date-picker
           v-model="search.state.time"
           type="daterange"

src/view/framework/index.vue

@@ -32,7 +32,7 @@
 
     <com-dialog :title="(operState.isInsert ? '添加' : '修改') + '品牌专柜'" v-model:show="operState.show" @submit="append">
       <el-form ref="form" label-width="100px" class="framework-from">
-        <el-form-item label="公司名称：" class="mandatory">
+        <el-form-item label="公司名稱：" class="mandatory">
           <el-input v-model="operState.name" placeholder="请输入" maxlength="15" show-word-limit></el-input>
         </el-form-item>
       </el-form>
@@ -111,13 +111,13 @@ export default {
       const data = this.operState.data
 
       if (!this.operState.name) {
-        return this.$alert('请输入公司名称！', '提示')
+        return this.$alert('请输入公司名稱！', '提示')
       }
-
       if (this.operState.isInsert) {
         const newCompany = { name: this.operState.name }
         const res = await axios.post(insertCompany, { ...newCompany, parentId: data.id })
         const newChild = { id: res.data.id, ...newCompany, level: data.level + 1,  children: [] };
+        console.log('newChild',newChild);
         data.children = data.children ? [...data.children, newChild] : [newChild]
       } else {
         await axios.post(updateCompany, { id: data.id, name: this.operState.name })

src/view/log/index.vue

@@ -1,7 +1,7 @@
 <template>
   <com-head :options="headList" showCtrl>
     <el-form label-width="90px" inline="true">
-      <el-form-item label="时间段：">
+      <el-form-item label="時間段：">
         <el-date-picker
           v-model="time"
           type="daterange"
@@ -45,7 +45,7 @@
       style="width: 100%"
       @row-click="selectRow"
     >
-      <el-table-column label="操作时间" prop="operateTime"></el-table-column>
+      <el-table-column label="操作時間" prop="operateTime"></el-table-column>
       <el-table-column label="操作员" prop="operatorName"></el-table-column>
       <el-table-column label="手机号" prop="operatorPhone"></el-table-column>
       <el-table-column

src/view/properties/community/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="小区编码：">
         <el-input v-model="search.state.gardenNumber" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="小区名称：">
+      <el-form-item label="小区名稱：">
         <el-input v-model="search.state.gardenName" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item label="城市：">
@@ -45,7 +45,7 @@
       <el-form-item label="创建人：">
         <el-input v-model="search.state.creatorName" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="创建时间：">
+      <el-form-item label="创建時間：">
         <el-date-picker
           v-model="createTime"
           type="daterange"
@@ -80,7 +80,7 @@
       <el-table-column label="小区编码" v-slot:default="{ row }">
         {{row.gardenNumber}}
       </el-table-column>
-      <el-table-column label="小区名称" v-slot:default="{ row }">
+      <el-table-column label="小区名稱" v-slot:default="{ row }">
         <a class="oper-link" @click="$router.push({name: 'secondHouse', params: { id: row.gardenId, cityId: row.cityId }})">{{row.gardenName}}</a>
       </el-table-column>
 
@@ -94,7 +94,7 @@
       </el-table-column>
       <el-table-column label="创建人" prop="creatorName"></el-table-column>
       <el-table-column label="所属公司" prop="companyName"></el-table-column>
-      <el-table-column label="创建时间" prop="createTime"></el-table-column>
+      <el-table-column label="创建時間" prop="createTime"></el-table-column>
       <el-table-column label="状态" v-slot:default="{row}" width="90">
         <div class="status" :class="{interactive: row.auditStatus !== draftStatus}" @click="row.auditStatus !== draftStatus && selectRow(row)">
           <span>{{getStatusName(row.auditStatus)}}</span>
@@ -106,7 +106,7 @@
         
       </el-table-column>
       <el-table-column label="审核人" prop="auditorName"></el-table-column>
-      <el-table-column label="审核时间" prop="auditTime"></el-table-column>
+      <el-table-column label="审核時間" prop="auditTime"></el-table-column>
       <el-table-column label="操作" width="180" v-slot:default="{row}">
         <span
           class="oper-span" 
@@ -167,14 +167,14 @@
     title="新增二手房小区" v-model:show="oper.state.show" @submit="insertItem" @quit="oper.quit"
   >
     <el-form ref="form" :model="form" label-width="100px" class="info-from" style="width: 480px">
-      <el-form-item label="小区名称：" class="mandatory" style="margin-top:60px">
+      <el-form-item label="小区名稱：" class="mandatory" style="margin-top:60px">
         <el-autocomplete
           popper-class="my-autocomplete"
           class="inline-input"
           v-model="oper.state.gardenName"
           :fetch-suggestions="searchName"
           @focus="oper.state.gardenId = ''"
-          placeholder="小区名称："
+          placeholder="小区名稱："
           @select="handleSelect"
         >
           <template v-slot="{ item }">
@@ -358,13 +358,13 @@ export default {
     getStatusName: getName(EXAMINE_SHOW_SELECT_STATUS_TEXT),
     async insertItem() {
       if (!this.oper.state.gardenName) {
-          return this.$alert('小区名称不能为空！', '提示')
+          return this.$alert('小区名稱不能为空！', '提示')
       }
 
       if (!this.oper.state.gardenId.trim()) {
         let estate = this.names.find(({gardenName}) => gardenName === this.oper.state.gardenName)
         if (!estate) {
-          return this.$alert('无法匹配当前名称的小区！', '提示')
+          return this.$alert('无法匹配当前名稱的小区！', '提示')
         } else {
           this.oper.state.gardenId = estate.gardenId
         }

src/view/properties/community/record.vue

@@ -17,7 +17,7 @@
               : '审核'}}
         </el-table-column>
         <el-table-column label="公司" prop="operatorCompanyName"></el-table-column>
-        <el-table-column label="更新时间" prop="auditTime"></el-table-column>
+        <el-table-column label="更新時間" prop="auditTime"></el-table-column>
         <el-table-column label="状态" prop="newAuditStatus"  v-slot:default="{ row }">
           {{row.newAuditStatus}}
           <span>{{getExamineName(row.newAuditStatus)}}</span>

src/view/properties/community/second-house/index.vue

@@ -22,13 +22,13 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="更新时间：">
+      <el-form-item label="更新時間：">
         <el-date-picker
           v-model="updateTime"
           type="daterange"
           range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间">
+          start-placeholder="开始時間"
+          end-placeholder="结束時間">
         </el-date-picker>
       </el-form-item>
 
@@ -46,7 +46,7 @@
         <el-input v-model="search.state.reviewer" placeholder="请输入"></el-input>
       </el-form-item>
 
-      <el-form-item label="创建时间：">
+      <el-form-item label="创建時間：">
         <el-date-picker
           v-model="createTime"
           type="daterange"
@@ -56,7 +56,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="审核时间：">
+      <el-form-item label="审核時間：">
         <el-date-picker
           v-model="reviewTime"
           type="daterange"
@@ -106,9 +106,9 @@
         
       </el-table-column>
       <el-table-column label="维护人" prop="maintenanceman"></el-table-column>
-      <el-table-column label="更新时间" prop="lastupdateTime"></el-table-column>
+      <el-table-column label="更新時間" prop="lastupdateTime"></el-table-column>
       <el-table-column label="审核人" prop="reviewer"></el-table-column>
-      <el-table-column label="审核时间" prop="reviewTime"></el-table-column>
+      <el-table-column label="审核時間" prop="reviewTime"></el-table-column>
       <el-table-column label="操作" width="180" v-slot:default="{row}">
         <span
           class="oper-span" 

src/view/properties/community/second-house/queryvr.vue

@@ -19,7 +19,7 @@
           <!-- <div v-if="row.status === 0">计算中</div> -->
         </div>
       </el-table-column>
-      <el-table-column label="模型名称" prop="vrModelName"></el-table-column>
+      <el-table-column label="模型名稱" prop="vrModelName"></el-table-column>
     </el-table>
 
   </com-dialog>

src/view/properties/community/second-house/record.vue

@@ -12,7 +12,7 @@
         <el-table-column label="操作类型"  prop="processOperation">
         </el-table-column>
         <el-table-column label="公司" prop="companyName"></el-table-column>
-        <el-table-column label="更新时间" prop="lastupdateTime"></el-table-column>
+        <el-table-column label="更新時間" prop="lastupdateTime"></el-table-column>
         <el-table-column label="状态" prop="auditStatus"  v-slot:default="{ row }">
           <span>{{getExamineName(row.auditStatus)}}</span>
         </el-table-column>

src/view/properties/community/second-house/vrlist.vue

@@ -32,7 +32,7 @@
           <!-- <div v-if="row.status === 0">计算中</div> -->
         </div>
       </el-table-column>
-      <el-table-column label="模型名称" prop="sceneName"></el-table-column>
+      <el-table-column label="模型名稱" prop="sceneName"></el-table-column>
       <!-- <el-table-column label="S/N" prop="snCode"></el-table-column> -->
       <!-- <el-table-column label="协作者" prop="name"></el-table-column> -->
       <!-- <el-table-column label="浏览数量" prop="viewCount"></el-table-column>
@@ -42,7 +42,7 @@
       <el-table-column label="分类" v-slot:default="{row}">
         <span>{{getTypeName(row.sceneType)}}</span>
       </el-table-column>
-      <el-table-column label="拍摄时间" prop="createTime"></el-table-column> -->
+      <el-table-column label="拍摄時間" prop="createTime"></el-table-column> -->
     </el-table>
 
     <div class="pag-block no-sizes">

src/view/properties/estate/index.vue

@@ -4,10 +4,10 @@
       <el-form-item label="楼盘id：">
         <el-input v-model="search.state.fcbEstateId" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="楼盘名称：">
+      <el-form-item label="楼盘名稱：">
         <el-input v-model="search.state.estateName" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="创建时间：">
+      <el-form-item label="创建時間：">
         <el-date-picker
           v-model="createTime"
           type="daterange"
@@ -16,7 +16,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新时间：">
+      <el-form-item label="更新時間：">
         <el-date-picker
           v-model="updateTime"
           type="daterange"
@@ -25,7 +25,7 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="审核时间：">
+      <el-form-item label="审核時間：">
         <el-date-picker
           v-model="auditTime"
           type="daterange"
@@ -72,7 +72,7 @@
       <el-table-column label="楼盘id" v-slot:default="{ row }">
         {{row.fcbEstateId}}
       </el-table-column>
-      <el-table-column label="楼盘名称" v-slot:default="{ row }">
+      <el-table-column label="楼盘名稱" v-slot:default="{ row }">
         
         <a class="oper-link" v-if="row.houseId && ~[adoptStatus].indexOf(row.status)" @click="editHouse(row, 1)">{{row.estateName}}</a>
         <span v-else>{{row.estateName}}</span>
@@ -102,8 +102,8 @@
         {{row.points || 0}}
       </el-table-column>
       <el-table-column label="创建人" prop="createByName"></el-table-column>
-      <el-table-column label="创建时间" prop="createTime"></el-table-column>
-      <el-table-column label="更新时间" prop="updateTime"></el-table-column>
+      <el-table-column label="创建時間" prop="createTime"></el-table-column>
+      <el-table-column label="更新時間" prop="updateTime"></el-table-column>
       <el-table-column label="状态" v-slot:default="{row}" width="90">
         <div class="status" :class="{interactive: row.countNum > 0}" @click="row.countNum > 0 && selectRow(row)">
           <span>{{row.status === adoptStatus ? Number(row.online) ? '已上线': '已审核' : getStatusName(row.status)}}</span>
@@ -115,7 +115,7 @@
         
       </el-table-column>
       <el-table-column label="审核人" prop="auditorName"></el-table-column>
-      <el-table-column label="审核时间" prop="auditTime"></el-table-column>
+      <el-table-column label="审核時間" prop="auditTime"></el-table-column>
       <el-table-column label="操作" width="180" v-slot:default="{row}">
         <span
           class="oper-span" 
@@ -186,7 +186,7 @@
 
   <com-dialog :title="operTitle" v-model:show="oper.state.show" @submit="oper.insert" @quit="oper.quit">
     <div class="add-input" v-if="search.state.type === 1">
-      <label for="add-name"><span>*</span>楼盘名称：</label>
+      <label for="add-name"><span>*</span>楼盘名稱：</label>
       <el-input v-model="oper.state.name" name="add-name"></el-input>
     </div>
     <select-vr v-model="oper.state.vrs" v-else />
@@ -198,14 +198,14 @@
     :title="operTitle" v-model:show="oper.state.show" @submit="insertItem" @quit="oper.quit"
   >
     <el-form ref="form" :model="form" label-width="100px" class="info-from">
-      <el-form-item label="楼盘名称：" class="mandatory" style="margin-top:60px">
+      <el-form-item label="楼盘名稱：" class="mandatory" style="margin-top:60px">
         <el-autocomplete
           popper-class="my-autocomplete"
           class="inline-input"
           v-model="oper.state.estateName"
           :fetch-suggestions="searchName"
           @focus="oper.state.fcbEstateId = ''"
-          placeholder="楼盘名称："
+          placeholder="楼盘名稱："
           @select="handleSelect"
         >
           <template v-slot="{ item }">
@@ -219,7 +219,7 @@
         <el-select
           v-model="oper.state.fcbEstateId"
           filterable
-          placeholder="楼盘名称："
+          placeholder="楼盘名稱："
           class="estate-search"
           :filter-method="searchName"
           @focus="focuHandle">
@@ -488,7 +488,7 @@ export default {
         pageSize: this.pag.state.size
       }
       if (!params.createStartTime || !params.createEndTime) {
-        return this.$alert('请先选择创建时间段', '提示')
+        return this.$alert('请先选择创建時間段', '提示')
       } else {
         const monthDiff = (startDate, endDate) => Math.max(0, (endDate.getFullYear() - startDate.getFullYear()) * 12 - startDate.getMonth() + endDate.getMonth());
         if (monthDiff(this.createTime[0], this.createTime[1]) > 2) {
@@ -507,13 +507,13 @@ export default {
     getStatusName: getName(EXAMINE_SHOW_SELECT_STATUS),
     async insertItem() {
       if (!this.oper.state.estateName) {
-          return this.$alert('楼盘名称不能为空！', '提示')
+          return this.$alert('楼盘名稱不能为空！', '提示')
       }
 
       if (!this.oper.state.fcbEstateId.trim()) {
         let estate = this.names.find(({prodName}) => prodName === this.oper.state.estateName)
         if (!estate) {
-          return this.$alert('无法匹配当前名称的楼盘！', '提示')
+          return this.$alert('无法匹配当前名稱的楼盘！', '提示')
         } else {
           this.oper.state.fcbEstateId = estate.prodId
         }

src/view/user/index.vue

@@ -43,7 +43,7 @@
       <el-table-column label="手机号" prop="userName"></el-table-column>
       <el-table-column label="所属架构" prop="departmentName"></el-table-column>
       <el-table-column label="角色" prop="roleName"></el-table-column>
-      <el-table-column label="创建时间" prop="createTime"></el-table-column>
+      <el-table-column label="创建時間" prop="createTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }" v-if="auth.update || auth.updatePwd || auth.delete">
         <span class="oper-span" @click="updateInfo(row)" v-if="auth.update">编辑</span>
         <span class="oper-span tip-spw" @click="updatePwd(row)" @mouseenter="enterHandle" @mouseout="outHandle" v-if="auth.updatePwd">重置密码</span>

src/view/vrmodel/index.vue

@@ -7,7 +7,7 @@
       <el-form-item label="VR模型：">
         <el-input v-model="search.state.sceneName" placeholder="请输入"></el-input>
       </el-form-item>
-      <el-form-item label="拍摄时间：">
+      <el-form-item label="拍摄時間：">
         <el-date-picker
           v-model="time"
           type="daterange"
@@ -64,7 +64,7 @@
       <el-table-column label="分类" v-slot:default="{row}">
         <span>{{getTypeName(row.sceneType)}}</span>
       </el-table-column>
-      <el-table-column label="拍摄时间" prop="createTime"></el-table-column>
+      <el-table-column label="拍摄時間" prop="createTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }">
         <span class="oper-span" @click="editModel(row)" v-if="auth.update && row.status === 2">编辑</span>
         <span class="oper-span" @click="editModel(row)" v-else-if="row.status !== 2">查看</span>

src/view/vrmodel/item.vue

@@ -20,7 +20,7 @@
         </template>
       </el-dropdown>
     </h4>
-    <p>拍摄时间：{{data.createTime}}</p>
+    <p>拍摄時間：{{data.createTime}}</p>
     <p>S/N：{{data.snCode}}</p>
   </div>
 </template>

src/views/brand/index.vue

@@ -2,18 +2,18 @@
 
   <div class="body-layer">
     <div class="body-head">
-      <h3>品牌信息</h3>
+      <h3>品牌訊息</h3>
       <div class="table-ctrl-right">
         <!-- <el-input placeholder="關鍵詞" suffix-icon="el-icon-search" class="search-scene" v-model="search.state.searchKey" style="width: auto" /> -->
         <el-button
           type="primary"
           @click="exportFile"
-          >导出品牌</el-button
+          >匯出品牌</el-button
         >
         <el-button
           type="primary"
           @click="UpdateBrand"
-          >更新品牌信息</el-button
+          >更新品牌訊息</el-button
         >
       </div>
     </div>
@@ -24,9 +24,9 @@
       style="width: 100%"
     >
       <el-table-column width="100" label="品牌ID" prop="cdfBrandId"></el-table-column>
-      <el-table-column label="中文名称" prop="zhName"></el-table-column>
-      <el-table-column label="英文名称" prop="enName"></el-table-column>
-      <el-table-column label="繁体名称" prop="ftName"></el-table-column>
+      <el-table-column label="中文名稱" prop="zhName"></el-table-column>
+      <el-table-column label="英文名稱" prop="enName"></el-table-column>
+      <el-table-column label="繁体名稱" prop="ftName"></el-table-column>
       <el-table-column
             label="品牌logo"
             prop="brandLogo"
@@ -36,7 +36,7 @@
                 <img :src="`${row.brandLogo}?time=${Date.now()}`" />
             </div>
             </el-table-column>
-      <el-table-column label="更新时间" prop="updateTime"></el-table-column>
+      <el-table-column label="更新時間" prop="updateTime"></el-table-column>
     </el-table>
 
     <com-pagination
@@ -141,7 +141,7 @@ export default {
             params: { },
             responseType: 'blob'
         }).then(res => {
-          dowmBlobfile(res,'导出品牌信息')
+          dowmBlobfile(res,'匯出品牌訊息')
         })
       
     },
@@ -149,7 +149,7 @@ export default {
       await axios.get(getBrandupdateBrandInfo, {})
       this.$message({
         type: 'success',
-        message: '更新成功，正在同步第三方数据请五分钟后刷新列表'
+        message: '更新成功，正在同步第三方資料請五分鐘後重新整理列表'
       });
     },
     submit() {

src/views/framework/index.vue

@@ -119,6 +119,7 @@ export default {
         const newCompany = { deptName: this.operState.deptName }
         const res = await axios.post(insertCompany, { ...newCompany, parentId: data.id })
         const newChild = { id: res.data.id, ...newCompany, level: data.level + 1,  children: [] };
+        console.log('newChild',newChild);
         data.children = data.children ? [...data.children, newChild] : [newChild]
       } else {
         await axios.post(updateCompany, { id: data.id, deptName: this.operState.deptName })

src/views/hotspot/index.vue

@@ -9,12 +9,12 @@
           <el-button
             type="primary"
             @click="changAddshow"
-            >添加外框</el-button
+            >新增外框</el-button
           >          
           <el-button
             type="primary"
             @click="handleDowmFile(active)"
-            >下载导入模板</el-button
+            >下載匯入模板</el-button
           >      
           <el-upload class="upload-demo1" style="margin-left:10px;display: inline-block;"
                     action="/back/upload/file"
@@ -27,7 +27,7 @@
                     multiple
                     :limit="3"
                     :on-exceed="handleExceed">
-                    <el-button type="primary">导入品牌</el-button>
+                    <el-button type="primary">導入品牌</el-button>
                 </el-upload>
         </div>
       </div>
@@ -39,9 +39,9 @@
             @row-click="dataList.selectRow"
         >
             <el-table-column label="外框ID" width="100" prop="id"></el-table-column>
-            <el-table-column label="外框名称" prop="outlineName"></el-table-column>
+            <el-table-column label="外框名稱" prop="outlineName"></el-table-column>
             <el-table-column
-            label="外框图片"
+            label="外框圖片"
             prop="outlineImage"
             v-slot:default="{ row }"
             >
@@ -72,35 +72,37 @@
         <div class="setFile">
             <p>{{ titleObj[active] }}</p>
             <div class="down">
-                <p>1、下载模板，请按示例填写。</p>
-                <el-button type="primary" @click="exporFileinfo.show = true" :icon="false" bg>下载导入模板</el-button>
-                <p>注：导入模板中包含此场景全部热点信息</p>
+                <p>1、下載模板，請依範例填寫。</p>
+                <el-button type="primary" @click="exporFileinfo.show = true" :icon="false" bg>下載導入模板</el-button>
+                <p>注意：導入模板中包含此場景全部熱點信息</p>
             </div>
             <div class="upload">
-                <p>2、上传并导入。</p>
+                <p>2、上傳並導入。</p>
                 <el-upload class="upload-demo"
                     v-model:file-list="exporFileinfo.fileList"
                     action="/back/upload/file"
                     @success="handFileSuccess1"
+                    @exceed="handleExceed"
+                    @remove="handleRemove"
                     :headers="{Token:user.token}"
                     multiple
                     :limit="1">
-                    <el-button type="primary">选择文件</el-button>
+                    <el-button type="primary" @click="exporFileinfo.fileList = [];exporFileinfo.tips = '';exporFileinfo.filePath = ''">選擇文件</el-button>
                     <template v-slot:tip>
-                        <div class="el-upload__tip">{{exporFileinfo.tips || '选择文件上传，系统自动校验数据是否合规，并给出提示。'}}</div>
+                        <div style="cloor:red;">{{exporFileinfo.tips || '選擇檔案上傳，系統自動校驗資料是否合規，並給予提示。'}}</div>
                     </template>
                 </el-upload>
             </div>
             <div class="down upload" v-if="exporFileinfo.filePath">
-                <p>3、上传并导入。</p>
-                <el-button type="primary" @click="handleUpload">上传并导入</el-button>
+                <p>3、上傳並導入。</p>
+                <el-button type="primary" @click="handleUpload">上傳並導入</el-button>
             </div>
         </div>
     </div>
   </div>
 
   <com-dialog
-    :title="'下载导入模板'"
+    :title="'下載匯入模板'"
     width="40vw"
     v-model:show="exporFileinfo.show"
     @submit="submit"
@@ -157,15 +159,16 @@
     @quit="showAddborder = false"
   >
     <el-form label-width="90px" :inline="true">
-      <el-form-item label="名称：">
-        <el-input v-model="setBorderData.outlineName" placeholder="請輸入"></el-input>
+      <el-form-item label="名稱：">
+        <el-input maxlength="30" show-word-limit v-model="setBorderData.outlineName" placeholder="請輸入"></el-input>
       </el-form-item>
-      <el-form-item label="图片：" class="mandatory">
+      <el-form-item label="圖片：" class="mandatory">
         <com-upload
           @changeLogo="changeLogo"
           @close="setBorderData.outlineImage = ''"
           @update:modelValue="(val) => (setBorderData.outlineImage = val)"
           :logo="setBorderData.outlineImage"
+          accept="image/png,"
         />
         </el-form-item>
     </el-form>
@@ -231,14 +234,17 @@ export default {
     const headList = ref([
       { name: "外框设置", value: 0 },
       // { name: "热点导出", value: 1 },
-      { name: "瀑布流导入", value: 1 },
-      { name: "精选推荐设置", value: 2 },
-      { name: "品牌推荐设置", value: 3 },
+      { name: "瀑布流導入", value: 1 },
+      { name: "精選推薦設置", value: 2 },
+      { name: "品牌推薦設置", value: 3 },
+      { name: "陳列品設置", value: 4 },
+      
     ]);
     const titleObj = reactive({
-        1:'瀑布流商品导入',
-        2:'精选推荐设置',
-        3:'品牌推荐设置',
+        1:'瀑布流導入',
+        2:'精選推薦設置',
+        3:'品牌推薦設置',
+        4:'陳列品設置',
     })
     const setBorderData = ref({
       outlineName:'',
@@ -399,6 +405,13 @@ export default {
       this.handleDowmFile(this.active)
     },
     async setBorder(){
+      var char=/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;  
+      if (this.setBorderData.outlineName && !char.test(this.setBorderData.outlineName)) {
+        return this.$alert('名稱僅支援中文，字母或數字！', '提示')
+      }
+      if (!this.setBorderData.outlineImage) {
+        return this.$alert('添加外框圖片不能為空！', '提示')
+      }
       this.loading = this.$loading({
         lock: true,
         text: "加載中",
@@ -421,6 +434,8 @@ export default {
         type: 'success',
         message: '更新成功'
       });
+      this.setBorderData.outlineImage = ''
+      this.setBorderData.outlineName = ''
       this.showAddborder = false
     },
     async setView() {
@@ -464,12 +479,13 @@ export default {
     // },
     handleDowmFile(type = 0){
       let filename = {
-          0:'外框设置模板',
+          0:'外框設定模板',
           1:'瀑布流模板',
-          2:'精选推荐设置模板',
-          3:'品牌推荐设置模板',
+          2:'精選推薦設定模板',
+          3:'品牌推薦設定模板',
+          4:'陳列品模板',
         }
-      this.$alert(`是否确认${filename[type]}下载？`, "下载导入模板",{
+      this.$alert(`是否确认${filename[type]}下載？`, "下載匯入模板",{
         cancelButtonText:'取消',
         showCancelButton: true
       }).then(async ()=>{
@@ -506,7 +522,7 @@ export default {
             list.length = 6
             text = list.toString() + '....'
           }
-          return this.$alert(`第${text}行数异常`);
+          return this.$alert(`第${text}行數異常`);
         }else{//自动提交
           await axios.post(uploadExcel, apiData)
           this.$alert('更新成功')
@@ -525,9 +541,11 @@ export default {
             list.length = 6
             text = list.toString() + '....'
           }
-          this.exporFileinfo.tips = `第${text}行数异常`
+          this.exporFileinfo.tips = `第${text}行數異常`
+          this.exporFileinfo.fileList = []
           return this.$alert(this.exporFileinfo.tips);
         }else{//自动提交
+          this.exporFileinfo.tips = ''
           this.exporFileinfo.filePath = file.data
           //this.handleUpload()
         }
@@ -536,12 +554,21 @@ export default {
         this.exporFileinfo.filePath = ''
       });
     },
+    handleExceed(files){
+      console.log('files',files);
+    },
+    handleRemove(){
+      this.exporFileinfo.fileList = []
+      this.exporFileinfo.filePath = ''
+    },
     async handleUpload(){
       let apiData = {
         filePath:this.exporFileinfo.filePath,
         type:this.active
       }
       await axios.post(uploadExcel, apiData)
+      this.exporFileinfo.fileList = []
+      this.exporFileinfo.filePath = ''
       this.$alert('更新成功')
 
     }
@@ -558,6 +585,7 @@ export default {
 </script>
   
   <style lang="scss" scoped>
+
 .table-ctrl-right {
   .search-scene {
     margin: 0 20px 0 26px;

src/views/scene/components/vue-tree.vue

@@ -210,7 +210,7 @@ export default {
 							<span v-if="checkBox" @click="checkBoxClick(item)" class="cus_chekcbox" :class="{cus_chekcbox_checked: item.checked, cus_chekcbox_part_checked: item.partchecked}"></span>
               <span v-if="item.name">{{item.name}}</span>
               <div v-else>
-                <input maxLength=12 class="folder-name-input" v-model="folderName" @keyup.enter="handleSaveFolder(item, folderName)" placeholder="输入文件夹名称，Enter完成" />
+                <input maxLength=12 class="folder-name-input" v-model="folderName" @keyup.enter="handleSaveFolder(item, folderName)" placeholder="输入文件夹名稱，Enter完成" />
                 <h-icon class="folder-name-close" type="guanbi" @click.stop="cancelCreate(item)" />
               </div>
 						</div>

src/views/scene/index.vue

@@ -86,7 +86,7 @@
           <span class="oper-span" @click="deleteFoler(row)">刪除</span>
         </template>
         <template v-else>
-          <span v-if="(row.status === 1 || row.status === -2) && row.payStatus === 1" class="oper-span" @click="setText(row)">活动文案</span>
+          <span v-if="(row.status === 1 || row.status === -2) && row.payStatus === 1" class="oper-span" @click="setText(row)">活動文案</span>
           <span v-if="(row.status === 1 || row.status === -2) && row.payStatus === 1" class="oper-span" @click="editModel(row)">編輯</span>
           <span v-if="row.payStatus === 1" class="oper-span" @click="moverFold(row)">移動</span>
           <span v-if="row.status === 1 || row.status === -2" class="oper-span" @click="gotoLink(row)">查看</span>
@@ -150,14 +150,14 @@
       </div>
     </com-dialog>
 
-    <com-dialog title="活动文案" @submit="handleActivity" v-model:show="activityText.show">
+    <com-dialog title="活動文案" @submit="handleActivity" v-model:show="activityText.show">
       <div class="folderContent">
         <el-form label-width="100px">
-          <el-form-item label="精选推荐：">
-            <el-input v-model="activityText.selectionMsg" placeholder="精选推荐" maxlength="30" show-word-limit></el-input>
+          <el-form-item label="精選推薦：">
+            <el-input v-model="activityText.selectionMsg" placeholder="精選推薦" maxlength="30" show-word-limit></el-input>
           </el-form-item>
-          <el-form-item label="品牌推荐：">
-            <el-input v-model="activityText.brandMsg" placeholder="品牌推荐" maxlength="30" show-word-limit></el-input>
+          <el-form-item label="品牌推薦：">
+            <el-input v-model="activityText.brandMsg" placeholder="品牌推薦" maxlength="30" show-word-limit></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -352,7 +352,7 @@ export default {
       const link = process.env.VUE_APP_PREFIX + "/sceneQRcode/" + item.num + ".png";
       return link;
     },
-    async setText(item){//修改活动文案
+    async setText(item){//修改活動文案
       this.activityText.sceneNum = item.sceneNum
       let res = await axios.post(textGetlnfo, {
         sceneNum: item.num,

src/views/scene/item.vue

@@ -37,7 +37,7 @@
             <el-dropdown-item command="deletefold" >刪除</el-dropdown-item>
           </el-dropdown-menu>
           <el-dropdown-menu v-else class="menu-items-vrmodel">
-            <el-dropdown-item v-if="(data.status === 1||data.status === -2)&&data.payStatus === 1"  command="setText" >活动文案</el-dropdown-item>
+            <el-dropdown-item v-if="(data.status === 1||data.status === -2)&&data.payStatus === 1"  command="setText" >活動文案</el-dropdown-item>
             <el-dropdown-item v-if="(data.status === 1||data.status === -2)&&data.payStatus === 1" command="update">編輯</el-dropdown-item>
             <el-dropdown-item v-if="data.payStatus === 1" command="move">移動</el-dropdown-item>
             <el-dropdown-item command="delete">刪除</el-dropdown-item>