update

.env.development

@@ -9,5 +9,5 @@ VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false
-VUE_APP_PATH_BASE=/portal/grider-erection/
+VUE_APP_PATH_BASE=/yjlgl/yjlwai/
 VUE_APP_HOME_URL=http://r93535.com/

.env.production

@@ -1,8 +1,8 @@
 NODE_ENV = 'production'
 ENV = 'production'
-VUE_APP_BASE_API=https://apps.r93535.com/services/ZL03102/
-VUE_APP_API=https://apps.r93535.com/services/ZL03102/
-VUE_APP_AUTH_SERVER=https://apps.r93535.com/services/ZL03102/
+VUE_APP_BASE_API=http://10.3.27.56:9004/yjlglapi2/
+VUE_APP_API=http://10.3.27.56:9004/yjlglapi2/
+VUE_APP_AUTH_SERVER=http://10.3.27.56:9004/yjlglapi2/
 VUE_APP_AUTH_CLIENT_ID=BackboneService_App
 VUE_APP_AUTH_CLIENT_SECRET=1q2w3e*
 VUE_APP_CREDENT_CLIENT_ID=webApp
@@ -10,5 +10,5 @@ VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false
-VUE_APP_PATH_BASE=/yjlgl/portal/grider-erection/
-VUE_APP_HOME_URL=http://apps.r93535.com/
+VUE_APP_PATH_BASE=/yjlgl/yjlwai/
+VUE_APP_HOME_URL=http://r93535.com/

.env.yjlnei

@@ -10,5 +10,5 @@ VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false
-VUE_APP_PATH_BASE=/yjlgl/portal/grider-erection/
+VUE_APP_PATH_BASE=/yjlgl/yjlwai/
 VUE_APP_HOME_URL=http://apps.r93535.com/

.env.yjlwai

@@ -10,5 +10,5 @@ VUE_APP_CREDENT_CLIENT_SECRET=webSecret
 VUE_APP_BD_MAP_KEY=NU1XFbBSV7gck6fKLbhuic2iX0KzRIVd
 VUE_APP_MODULE_CODE=GriderErection
 VUE_APP_ONLY_SSO=false
-VUE_APP_PATH_BASE=/yjlgl/portal/grider-erection/
+VUE_APP_PATH_BASE=/yjlgl/yjlwai/
 VUE_APP_HOME_URL=http://apps.r93535.com/

src/router/index.js

@@ -53,13 +53,13 @@ export const constantRoutes = [
   {
     path: '/gride-work-info',
     name: 'gride-work-info',
-    component: () => import('@/views/grider-erections/gride-work-info/tky-index'),
+    component: () => import('@/views/grider-erections/gride-work-info/tky-index.vue'),
     hidden: true
   },
   {
     path: '/beam-carrier-work-info',
     name: 'beam-carrier-work-info',
-    component: () => import('@/views/grider-erections/beam-carrier-work-info/tky-index'),
+    component: () => import('@/views/grider-erections/beam-carrier-work-info/tky-index.vue'),
     hidden: true
   },
   {

src/store/modules/user.js

@@ -71,7 +71,6 @@ const actions = {
     // commit('SET_PUBLIC_KEY', publicKey)
     // setPubKey(publicKey)
     var res = await loginClient()
-    console.log('asdsad', res)
     commit('SET_ACCESS_TOKEN', res.accessToken)
     setToken(res.accessToken)
   },

src/utils/apiService.js

@@ -68,7 +68,6 @@ export function createService(baseUrl) {
       // }
 
       if (error.response && error.response.status === 401) {
-        console.log('asdasd', error.response)
         msg = error.response.data.msg
       }
 

src/views/client-setting/index.vue

@@ -32,7 +32,6 @@
             type="primary"
             icon="el-icon-edit"
             size="small"
-            @click="fileLoad"
           >下载加密文件</el-button>
         </div>
         <div class="content-container">
@@ -72,7 +71,7 @@
           </el-table>
         </div>
         <el-dialog
-          :title="textMap[dialogStatus]"
+          title="创建客户端凭证"
           :close-on-click-modal="false"
           :visible.sync="dialogFormVisible"
         >
@@ -139,41 +138,15 @@ export default {
   data() {
     return {
       list: [],
-      entity: {
-        id: undefined,
-        projectId: undefined,
-        sectionId: undefined,
-        sectionAreaId: undefined,
-        deviceNo: '',
-        deviceName: '',
-        category: undefined,
-        categoryName: '',
-        spec: '',
-        madeFactory: '',
-        driverName: '',
-        telephone: '',
-        deviceType: undefined
-      },
+      entity: {},
       total: 0,
       listLoading: false,
       listQuery: {
-        projectId: undefined,
-        sectionId: undefined,
-        sectionAreaId: undefined,
-        deviceNo: '',
-        deviceName: '',
-        deviceType: undefined,
         skipCount: 0,
         maxResultCount: 20
       },
       dialogFormVisible: false,
-      dialogStatus: '',
       formLoading: false,
-      textMap: {
-        update: '修改',
-        create: '创建'
-      },
-      sections: [],
       rules: {
         client_key: [
           { required: true, message: '请输入客户端Key', trigger: 'blur' },
@@ -186,230 +159,94 @@ export default {
         expires_in: [
           { required: true, message: '请输入过期时间', trigger: 'blur' }
         ]
-      },
-      areas: [],
-      jqjTypes: [],
-      ylcTypes: []
+      }
     }
   },
-  watch: {
-  },
   mounted() {
     this.getList()
-    this.getJQJTypes()
-    this.getYLCTypes()
   },
   methods: {
-  //   getJQJTypes() {
-  //     dictEntryApi.getJQJTypes().then(res => {
-  //       res.forEach(t => {
-  //         t.code = t.code - 0
-  //       })
-  //       this.jqjTypes = res
-  //     })
-  //   },
-  //   getYLCTypes() {
-  //     dictEntryApi.getYLCTypes().then(res => {
-  //       res.forEach(t => {
-  //         t.code = t.code - 0
-  //       })
-  //       this.ylcTypes = res
-  //     })
-  //   },
-  //   // 树形事件
-  //   handleTreeClick(data, node) {
-  //     this.listQuery.projectId = undefined
-  //     this.listQuery.sectionId = undefined
-  //     if (data.isProject) {
-  //       this.listQuery.projectId = data.id
-  //       this.listQuery.sectionId = undefined
-  //     }
-  //     if (data.isSection) {
-  //       this.listQuery.projectId = data.projectId
-  //       this.listQuery.sectionId = data.id
-  //       this.getArea()
-  //     }
-  //     this.getList()
-  //   },
-  //   getArea() {
-  //     this.areas = []
-  //     areaApi.lookupBySection(this.listQuery.sectionId).then(res => {
-  //       res.forEach(t => {
-  //         this.areas.push({
-  //           id: t.id,
-  //           name: t.name
-  //         })
-  //       })
-  //     })
-  //   },
-  //   getAreaName(areaId) {
-  //     const area = this.areas.find(t => t.id === areaId)
-  //     if (area) {
-  //       return area.name
-  //     } else {
-  //       return ''
-  //     }
-  //   },
-  //   // 清空下拉
-  //   delValue(parameter) {
-  //     this.listQuery[parameter] = undefined
-  //   },
-  //   // 获取数据列表
-  //   getList() {
-  //     if (!this.listQuery.projectId) {
-  //       this.list = []
-  //       return
-  //     }
-  //     this.listLoading = true
-  //     interfaceApi
-  //       .getList(this.listQuery)
-  //       .then(res => {
-  //         this.list = res.items
-  //         this.total = res.totalCount
-  //       })
-  //       .finally(() => {
-  //         this.listLoading = false
-  //       })
-  //   },
-  //   // 查询
-  //   handleFilter() {
-  //     this.listQuery.skipCount = 0
-  //     this.getList()
-  //   },
-  //   // 创建清空
-  //   resetStation() {
-  //     this.entity = {
-  //       id: undefined,
-  //       projectId: this.listQuery.projectId,
-  //       sectionId: this.listQuery.sectionId,
-  //       sectionAreaId: this.listQuery.sectionAreaId,
-  //       deviceNo: '',
-  //       deviceName: '',
-  //       category: undefined,
-  //       categoryName: '',
-  //       spec: '',
-  //       madeFactory: '',
-  //       driverName: '',
-  //       telephone: '',
-  //       deviceType: undefined
-  //     }
-  //   },
-  //   // 创建点击事件
-  //   handleCreate() {
-  //     if (!this.listQuery.sectionId) {
-  //       this.verificationTips('请选择标段')
-  //       return
-  //     }
-  //     this.resetStation()
-  //     this.dialogStatus = 'create'
-  //     this.dialogFormVisible = true
-  //     this.formLoading = false
-  //     this.$nextTick(() => {
-  //       this.$refs['dataForm'].clearValidate()
-  //     })
-  //   },
-  //   // 提示
-  //   verificationTips(message) {
-  //     this.$notify({
-  //       title: '提示',
-  //       message: message,
-  //       type: 'error',
-  //       duration: 2000
-  //     })
-  //   },
-  //   // 创建
-  //   createData() {
-  //     this.$refs['dataForm'].validate(valid => {
-  //       if (valid) {
-  //         if (this.entity.deviceType === 1) {
-  //           this.entity.categoryName = this.jqjTypes.find(t => t.code === this.entity.category).name
-  //         }
-  //         if (this.entity.deviceType === 2) {
-  //           this.entity.categoryName = this.ylcTypes.find(t => t.code === this.entity.category).name
-  //         }
-  //         this.formLoading = true
-  //         interfaceApi
-  //           .create(this.entity)
-  //           .then(() => {
-  //             this.getList()
-  //             this.dialogFormVisible = false
-  //             this.$notify({
-  //               title: '成功',
-  //               message: '创建成功',
-  //               type: 'success',
-  //               duration: 2000
-  //             })
-  //           })
-  //           .finally(() => {
-  //             this.formLoading = false
-  //           })
-  //       }
-  //     })
-  //   },
-  //   // 修改点击事件
-  //   handleUpdate(row) {
-  //     this.entity = Object.assign({}, row) // copy obj
-  //     this.dialogStatus = 'update'
-  //     this.dialogFormVisible = true
-  //     this.formLoading = false
-  //     this.$nextTick(() => {
-  //       this.$refs['dataForm'].clearValidate()
-  //     })
-  //   },
-  //   // 修改
-  //   updateData() {
-  //     this.$refs['dataForm'].validate(valid => {
-  //       if (valid) {
-  //         if (this.entity.deviceType === 1) {
-  //           this.entity.categoryName = this.jqjTypes.find(t => t.code === this.entity.category).name
-  //         }
-  //         if (this.entity.deviceType === 2) {
-  //           this.entity.categoryName = this.ylcTypes.find(t => t.code === this.entity.category).name
-  //         }
-  //         const submitData = Object.assign({}, this.entity)
-  //         this.formLoading = true
-  //         interfaceApi
-  //           .update(submitData.id, submitData)
-  //           .then(() => {
-  //             this.getList()
-  //             this.dialogFormVisible = false
-  //             this.$notify({
-  //               title: '成功',
-  //               message: '修改成功',
-  //               type: 'success',
-  //               duration: 2000
-  //             })
-  //           })
-  //           .finally(() => {
-  //             this.formLoading = false
-  //           })
-  //       }
-  //     })
-  //   },
-  //   // 删除
-  //   handleDelete(row) {
-  //     this.$confirm('此操作将删除该项, 是否继续?', '提示', {
-  //       confirmButtonText: '确定',
-  //       cancelButtonText: '取消',
-  //       type: 'warning'
-  //     }).then(() => {
-  //       this.listLoading = true
-  //       interfaceApi
-  //         .remove(row.id)
-  //         .then(() => {
-  //           this.getList()
-  //           this.$notify({
-  //             title: '成功',
-  //             message: '删除成功',
-  //             type: 'success',
-  //             duration: 2000
-  //           })
-  //         })
-  //         .finally(() => {
-  //           this.listLoading = false
-  //         })
-  //     })
-  //   }
+    // 查询
+    handleFilter() {
+      this.listQuery.skipCount = 0
+      this.getList()
+    },
+    //   // 创建清空
+    //   resetStation() {
+    //     this.entity = {
+    //       id: undefined,
+    //       projectId: this.listQuery.projectId,
+    //       sectionId: this.listQuery.sectionId,
+    //       sectionAreaId: this.listQuery.sectionAreaId,
+    //       deviceNo: '',
+    //       deviceName: '',
+    //       category: undefined,
+    //       categoryName: '',
+    //       spec: '',
+    //       madeFactory: '',
+    //       driverName: '',
+    //       telephone: '',
+    //       deviceType: undefined
+    //     }
+    //   },
+    // 创建点击事件
+    handleCreate() {
+      this.resetStation()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.formLoading = false
+      this.entity = {}
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 创建
+    createData() {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          this.formLoading = true
+          clientSettingApi
+            .create(this.entity)
+            .then(() => {
+              this.getList()
+              this.dialogFormVisible = false
+              this.$notify({
+                title: '成功',
+                message: '创建成功',
+                type: 'success',
+                duration: 2000
+              })
+            })
+            .finally(() => {
+              this.formLoading = false
+            })
+        }
+      })
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm('此操作将删除该项, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        clientSettingApi
+          .remove(row.id)
+          .then(() => {
+            this.getList()
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+          })
+          .finally(() => {
+            this.listLoading = false
+          })
+      })
+    }
   }
 }
 </script>

src/views/grider-erections/beam-carrier-work-info/tky-index.vue

@@ -280,13 +280,6 @@ export default {
   },
   async mounted() {
     this.loading = true
-    try {
-      await this.$store.dispatch('user/login', { username: 'tkycs', password: 'aA3031366!' })
-      // this.init()
-      this.loading = false
-    } catch (ex) {
-      console.log(ex)
-    }
     const table = this.$refs.table
     // 拿到表格中承载数据的div元素
     const divData = table.bodyWrapper

src/views/grider-erections/gride-work-info/tky-index.vue

@@ -225,12 +225,12 @@ export default {
   },
   async mounted() {
     this.loading = true
-    try {
-      await this.$store.dispatch('user/clientCredentials')
-      this.loading = false
-    } catch (ex) {
-      console.log(ex)
-    }
+    // try {
+    //   await this.$store.dispatch('user/clientCredentials')
+    //   this.loading = false
+    // } catch (ex) {
+    //   console.log(ex)
+    // }
     griderErectionApi.getList(this.query).then(res => {
       this.data = res
       if (res.splitTypeNoGuideBeams.length > 0) {