Explorar el Código

feat:更新代码

jinx hace 4 años
padre
commit
5d5a723de3
Se han modificado 3 ficheros con 64 adiciones y 13 borrados
  1. 1 1
      src/pages/bindAccount/index.vue
  2. 19 8
      src/pages/layout/aside.vue
  3. 44 4
      src/pages/scene/index.vue

+ 1 - 1
src/pages/bindAccount/index.vue

@@ -265,7 +265,7 @@ export default {
             this.show_fdkkUser =
               res.message.fdkkUser.substring(0, 4) +
               '****' +
-              res.message.fdkkUser.substring(8, res.message.fdkkUser.length - 1)
+              res.message.fdkkUser.substring(8, res.message.fdkkUser.length)
           }
         })
         .catch((err) => {

+ 19 - 8
src/pages/layout/aside.vue

@@ -41,7 +41,8 @@
       </ul>
       <ul class="aside-ul"
           v-if=" roleType != -1">
-        <li class="aside-li">
+        <li class="aside-li"
+            @click="$router.push('/scene')">
           <div class="aside-li-div">
             <vcenter>
               <i class="el-icon-tickets"
@@ -50,6 +51,16 @@
             </vcenter>
           </div>
         </li>
+        <!-- <li class="aside-li"
+            @click="$router.push('/bindAccount')">
+          <div class="aside-li-div">
+            <vcenter>
+              <i class="iconfont icon-guanggao"
+                 style="float:left;width:27px;"></i>
+              <span style="vertical-align: middle;">绑定账号</span>
+            </vcenter>
+          </div>
+        </li> -->
       </ul>
     </div>
   </div>
@@ -139,13 +150,13 @@ const aside = [
     url: '/scene',
     isShow: false,
   },
-  {
-    name: '绑定账号',
-    id: '7',
-    icon: 'icon-guanggao',
-    url: '/bindAccount',
-    isShow: false,
-  },
+  // {
+  //   name: '绑定账号',
+  //   id: '7',
+  //   icon: 'icon-guanggao',
+  //   url: '/bindAccount',
+  //   isShow: false,
+  // },
 ]
 export default {
   name: 'm-aside',

+ 44 - 4
src/pages/scene/index.vue

@@ -68,6 +68,11 @@
                      @click="search">搜索</el-button>
         </div>
       </vcenter>
+      <!-- <div class="buttonBox"
+           @click="syncScene">
+        <el-button type="primary">同步场景</el-button>
+      </div> -->
+
     </div>
 
     <div class="h-body">
@@ -90,7 +95,8 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <span @click="_S_download(scope.row)"
+            <span v-if="scope.row.sceneSource!=1"
+                  @click="_S_download(scope.row)"
                   style="cursor: pointer; color: #0175dc">下载场景</span><br />
             <span @click="_openEdit(scope.row)"
                   style="cursor: pointer; color: #0175dc">打开编辑器</span>
@@ -194,10 +200,39 @@ export default {
       })
       if (result.code === 200) {
         let url =
-          row.webSite.replace('smobile', 'epc') + '&token=' + result.message
+          row.webSite.replace('smobile', 'epc') +
+          '&menu=business&token=' +
+          result.message
         window.open(url)
+      } else {
+        return this.$alert(result.message, '提示', {
+          confirmButtonText: '确定',
+        })
       }
     },
+    syncScene() {
+      this.$http({
+        method: 'get',
+        url: `/scene/sync4dkkSceneData`,
+        headers: {
+          token: window.localStorage.getItem('zfb_token'),
+        },
+      })
+        .then((res) => {
+          if (res.code == 200) {
+            this.currentPage = 1
+            this.getData()
+            return this.$alert('同步成功', '提示', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+        .catch((err) => {
+          // return this.$alert(err, '提示', {
+          //   confirmButtonText: '确定',
+          // })
+        })
+    },
     _S_download(row) {
       let webSite = row.num
       this.downloading.sceneName = row.sceneName
@@ -482,11 +517,16 @@ export default {
     padding-left: 20px;
     box-shadow: 0 0 12px 0 rgba(0, 0, 0, 0.1);
     border-radius: 3px;
-
+    position: relative;
     div {
       display: inline-block;
     }
-
+    .buttonBox {
+      position: absolute;
+      right: 10px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
     .h-input {
       width: 220px;
     }