qinzhipeng_v 5 lat temu
rodzic
commit
41c49eab85

+ 4 - 4
src/apiConfig/api.js

@@ -1,10 +1,10 @@
 /*eslint-disable*/   //规避eslint的检查,如没有eslint可不写
-// export const mockUrl = 'http://10.179.24.176:8980' // 线下
-export const mockUrl = 'http://10.179.24.123:8980' // 线上
+export const mockUrl = 'http://10.179.24.176:8980' // 线下
+// export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // export const mockUrl = 'http://172.23.162.226:8980' // 舒宁本地
 
 export const qualityUrl = 'http://10.179.209.19:8898' // 质量度量
 
-// export const HMvehicleUrl = 'http://10.96.113.197:9999' // 电单车 线下
-export const HMvehicleUrl = 'http://10.179.91.236:9999' // 电单车 线上
+export const HMvehicleUrl = 'http://10.96.113.197:9999' // 电单车 线下
+// export const HMvehicleUrl = 'http://10.179.91.236:9999' // 电单车 线上

+ 2 - 2
src/apiConfig/mock.js

@@ -1,4 +1,4 @@
 /*eslint-disable*/   //规避eslint的检查,如没有eslint可不写
-// export const mockUrl = 'http://10.179.88.110:8089' // stable
-export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
+export const mockUrl = 'http://10.179.88.110:8089' // stable
+// export const mockUrl = 'http://mock.Intra.xiaojukeji.com' // 线上
 // export const mockUrl = 'http://10.179.101.226:8089' // test

+ 2 - 2
src/apiConfig/virtualDevices.js

@@ -1,3 +1,3 @@
 /*eslint-disable*/ //规避eslint的检查,如没有eslint可不写
-export const mockUrl = 'http://10.179.91.236:9999/virtual-devices' // 线上
-// export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下
+// export const mockUrl = 'http://10.179.91.236:9999/virtual-devices' // 线上
+export const mockUrl = 'http://10.96.113.197:9999/virtual-devices' // 线下

+ 12 - 4
src/router/index.js

@@ -641,11 +641,19 @@ export const constantRoutes = [
   },
   {
     path: '/ToConfigure',
-    component: Layout,
-    redirect: '/online-quality/check-list',
     name: '组织配置',
-    hidden: true,
-    meta: { title: '组织配置', icon: '上线质检' }
+    component: Layout,
+    redirect: '/ToConfigure/configure',
+    // hidden: true,
+    meta: { title: '组织配置', icon: '上线质检' },
+    children: [
+      {
+        path: 'configure',
+        name: '组织配置',
+        component: () => import('@/views/ToConfigure/configure'),
+        meta: { title: '组织配置' }
+      }
+    ]
   }
 ]
 

+ 54 - 11
src/views/Platform/useCasePage.vue

@@ -27,8 +27,9 @@
               >
 
                 <span slot-scope="{ node, data }" style="width:100%;" class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                  <span :title="data.label" class="span_el" @dblclick="dblclick(data)">{{ node.label | ellipsis }}</span>
+                  <span v-if="!data.que1" :title="data.label" class="span_el" @dblclick="dblclick(data)">{{ node.label | ellipsis }}</span>
                   <el-input v-if="data.que" ref="get_Input" v-model="node_Name.name" size="mini" @blur="queryNodeName(node_Name.name, data)">输入框</el-input>
+                  <el-input v-if="data.que1" ref="get_Input1" v-model="node_Name.names" size="mini" placeholder="新建文件夹" @blur="blurEvent(node_Name.names, data)">输入框</el-input>
                   <el-dropdown v-show="data.del" style="margin-left:10px" trigger="click">
                     <span class="el-dropdown-link">
                       ···<i class="el-icon--right" />
@@ -288,12 +289,61 @@ export default {
         this.$refs.get_Input.focus()
       })
     },
-
     // 添加节点
     append(data) {
+      this.key_arr = []
+      const newChild = { id: Math.round(Math.random()), label: '', children: [] }
+      if (!data.children) {
+        this.$set(data, 'children', [])
+      }
+      data.children.push(newChild)
+      this.$set(newChild, 'que1', true)
+      this.$set(this.node_Name, 'names', '新建文件夹')
+      this.key_arr.push(newChild.id)
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.$refs.get_Input1.focus()
+        })
+        this.$refs.get_Input1.focus()
+      })
+    },
+
+    // // 添加节点
+    // append(data) {
+    //   this.formData = {
+    //     bizId: this.bizJson,
+    //     folderName: '新建子节点',
+    //     xmindUrl: '',
+    //     parentFolderId: this.startId,
+    //     creator: this.userInformation,
+    //     modifier: this.userInformation
+    //   }
+    //   createFolderData(this.formData).then(res => {
+    //     if (res.code === 200) {
+    //       this.key_arr = []
+    //       const newChild = { id: res.data, label: '新建子节点', children: [] }
+    //       if (!data.children) {
+    //         this.$set(data, 'children', [])
+    //       }
+    //       data.children.push(newChild)
+    //       this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
+    //       this.data1 = []
+    //       this.AllQueryFolderData(this.bizJson)
+    //       this.key_arr.push(this.startId)
+    //       this.add_Folder = ''
+    //     } else {
+    //       this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+    //       this.add_Folder = ''
+    //     }
+    //   })
+    // },
+
+    blurEvent(name, data) {
+      this.key_arr = []
+      this.$set(data, 'que1', false)
       this.formData = {
         bizId: this.bizJson,
-        folderName: '新建子节点',
+        folderName: name,
         xmindUrl: '',
         parentFolderId: this.startId,
         creator: this.userInformation,
@@ -301,20 +351,13 @@ export default {
       }
       createFolderData(this.formData).then(res => {
         if (res.code === 200) {
-          this.key_arr = []
-          const newChild = { id: res.data, label: '新建子节点', children: [] }
-          if (!data.children) {
-            this.$set(data, 'children', [])
-          }
-          data.children.push(newChild)
           this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
           this.data1 = []
           this.AllQueryFolderData(this.bizJson)
           this.key_arr.push(this.startId)
-          this.add_Folder = ''
         } else {
+          this.AllQueryFolderData(this.bizJson)
           this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
-          this.add_Folder = ''
         }
       })
     },

+ 147 - 0
src/views/ToConfigure/configure.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="bgColorSz">
+    <el-tabs class="abc">
+      <el-tab-pane v-model="activeName" label="我的" name="second">
+        <el-table :data="tableData" max-height="80%" size="mini" width="80%" border>
+          <el-table-column type="index" label="序号" min-width="120" align="center" />
+          <el-table-column label="任务" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.name }}</template></el-table-column>
+          <el-table-column label="进展" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.address }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+        </el-table>
+      </el-tab-pane>
+
+      <el-tab-pane label="全部" name="third" border>
+        <el-table :data="tableData" max-height="800" size="mini" width="80%">
+          <el-table-column type="index" label="序号" min-width="120" align="center" />
+          <el-table-column label="任务" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.name }}</template></el-table-column>
+          <el-table-column label="进展" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.address }}</template></el-table-column>
+          <el-table-column label="优先级" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.date }}</template></el-table-column>
+          <el-table-column label="状态" min-width="120" align="center"><template slot-scope="scope"><el-tag type="success">{{ scope.row.statusString }}</el-tag></template></el-table-column>
+          <el-table-column label="最近更新时间" min-width="120" align="center"><template slot-scope="scope">{{ scope.row.modifyTime }}</template></el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+
+// import {  } from '@/api/workbench'
+
+export default {
+  name: 'PersonalWorkbench',
+  data() {
+    return {
+      userInformation: localStorage.getItem('username'),
+      bizJson: localStorage.getItem('key'),
+      dialogTableVisible: false,
+      dialog_TableVisible: false,
+      activeName: 'second',
+      gridData: [],
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1517 弄'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1519 弄'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1516 弄'
+      }]
+      // clievent: '{ background:#409EFF; color: #FFFFFF;}'
+    }
+  },
+  created() {
+    this.haha()
+  },
+  methods: {
+    haha() {
+      var arr = {
+        date: '2016-05-02',
+        name: '王小虎',
+        address: '上海市普陀区金沙江路 1518 弄'
+      }
+      for (var i = 0; i <= 100; i++) {
+        this.tableData.push(arr)
+      }
+    }
+  //   // 表头样式
+  //   getRowClass({ row, rowIndex }) {
+  //     if (rowIndex === 0) {
+  //       return 'background:#F0F2F4;color:#333B4A;'
+  //     }
+  //   }
+  }
+}
+</script>
+<style lang="scss">
+  .abc .el-tabs__nav-wrap::after {
+    background-color:#FFFFFF !important;
+  }
+  .bgColorSz .el-tabs__nav-scroll {
+    padding: 1% 2% !important;
+  }
+  .item .el-badge__content.is-fixed {
+    right: 50px;
+  }
+</style>
+<style scoped>
+  .abc {
+    background:#FFFFFF;
+    border-radius:8px;
+    margin: 0 1%;
+    width: 100%;
+  }
+
+  /* .titStyle {
+    font-size: 20px;
+    color: #333B4A;
+    font-weight: bold;
+    margin-left: 2%;
+  } */
+
+  .bgColorSz {
+    width: 100%;
+    height: 96vh;
+    background: #F2F3F6;
+    font-size: 0.9rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+/* .itemName {
+  margin-right: 2.5em;
+  width: 13em;
+  height: 3.25em;
+  font-size: 1em;
+  border: 1px solid #BFC6DC;
+  border-radius:  0.25em;
+  background: #FFFFFF;
+  color:#6F7C93;
+  margin-bottom: 24%;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  }
+
+  .item {
+  margin-top: 10px;
+  margin-right: 4%;
+}
+
+.itemName:hover {
+    background:#409EFF;
+    color: #FFFFFF;
+  } */
+</style>