Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/account/login/index.vue

@@ -145,7 +145,7 @@ export default {
     background-image: url("../../../assets/images/login/bg0.png");
   }
   .bg1 {
-    background-image: url("../../../assets/images/login/bg1.png");
+    background-image: url("../../../assets/images/login/bg1.jpg");
   }
   .bg2 {
     background-image: url("../../../assets/images/login/bg2.jpg");

pages/basicData/roleManagent/index.vue

@@ -291,7 +291,7 @@ export default {
       service
         .delete(`${systemUrl}/MyRole/Delete?id=${this.keyid}`)
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             that.$Message.success('删除成功')
             that.loaddata()
           }
@@ -322,7 +322,7 @@ export default {
                 JSON.stringify(this.formValidate1)
               )
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   that.$Message.success('保存成功')
                   that.loaddata()
                 }
@@ -337,7 +337,7 @@ export default {
                 JSON.stringify(this.formValidate1)
               )
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   this.$Message.success('保存成功')
                   that.loaddata()
                 }
@@ -384,8 +384,8 @@ export default {
               }
         })
         .then((response) => {
-          this.tbPro.data = response.data.result.items
-          this.total = response.data.result.total
+          this.tbPro.data = response.result.items
+          this.total = response.result.total
           this.tbPro.loading = false
           //console.log(this.tbPro.data)
         })

pages/basicData/systemlog/index.vue

@@ -18,9 +18,9 @@
           <Input v-model="model2" placeholder="用户账户/姓名" style="width: 240px"></Input>
           <Button type="primary" @click="search">查询</Button>
         </div>
-        <div style="float:right" class="paddingbtn">
+        <!-- <div style="float:right" class="paddingbtn">
           <Button type="primary" @click="export2Excel" style="margin-left:6px">导出</Button>
-        </div>
+        </div> -->
       </div>
       <div class="mt10">
         <tb :tbPro="tbPro" ref="table"></tb>
@@ -183,8 +183,8 @@ export default {
         })
         .then((response) => {
           //console.log(response)
-          this.total = response.data.result.totalCount
-          this.tbPro.data = response.data.result.items
+          this.total = response.result.totalCount
+          this.tbPro.data = response.result.items
           this.tbPro.loading=false
         })
     },
@@ -196,7 +196,8 @@ export default {
       this.pageSize = val
       this.lodata()
     },
-    // export2Excel() {
+    export2Excel() {
+
     //   require.ensure([], () => {
     //     const { export_json_to_excel } = require('@/vendor/Export2Excel')
     //     const tHeader = [
@@ -246,7 +247,7 @@ export default {
     //         export_json_to_excel(tHeader, data, '系统日志')
     //       })
     //   })
-    // },
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]))
     }

pages/basicData/user/index.vue

@@ -537,7 +537,7 @@ export default {
       var url = `${systemUrl}/MyRole/GetRolesAsync`;
       var data = [];
       service.get(`${url}`, { params: { role_type: type } }).then(response => {
-        data = response.data.result.items;
+        data = response.result.items;
         if (type == 1) {
           this.authList = data;
         }
@@ -554,7 +554,7 @@ export default {
       this.show3 = true;
       var url = `${systemUrl}/MyUserRole/GetPaged`;
       service.get(`${url}`, { params: { userId: id } }).then(response => {
-        var data = response.data.result.items;
+        var data = response.result.items;
         var dt1 = data.filter(function(ite) {
           return ite.role_type == 0;
         });
@@ -582,7 +582,7 @@ export default {
           })
         )
         .then(response => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success("保存成功");
             this.authModel.extra = [];
             this.authModel.default = [];

pages/dispatched/index.vue

@@ -189,9 +189,9 @@ export default {
       let urlget = `${PlanUrl}/dispatch/getschemes?RoutingId=` + usId +
         '&IsMain=0' + order_ids
       service.get(`${urlget}`).then((res) => {
-        if (res.data.result) {
+        if (res.result) {
           var savedUl = []
-          res.data.result.map((u) => {
+          res.result.map((u) => {
             let detailnew = {
               detailId: u.routingDetailId, //工序id--后端接收
               detailNumber: u.routingDetailNumber, //工序序号
@@ -223,7 +223,7 @@ export default {
       let urlList = `${designUrl}/routingdetail/getlistbyheaderid?headerID=` + usId
       service.get(`${urlList}`).then((res) => {
         var ul = []
-        res.data.result.map((u) => {
+        res.result.map((u) => {
           let detail = {
             detailId: u.id, //工序id--后端接收
             detailNumber: u.task_seq,//工序序号

pages/hello.vue

 <template>
+  <div>
     <h1>这是一个测试页面</h1>
+    <Button @click="login">Login</Button>
+  </div>
 </template>
 <script>
+import api from "axios"
 export default {
-    
-}
+  layout: "empty",
+  methods: {
+    login() {
+      api
+        .post("http://localhost:10010/connect/token", {
+          client_id: "api_client",
+          client_secret: "secret",
+          grant_type: "client_credentials",
+          username: "13211111111",
+          password: "1"
+        })
+        .then(r => {
+          console.warn(r);
+        })
+        .catch(e => {
+          console.info(e);
+        });
+    }
+  }
+};
 </script>
\ No newline at end of file

pages/implement/components/entryMovie.vue

@@ -188,8 +188,8 @@ export default {
       var url =
         `${PlanUrl}/orderexecutemovie/getpaged?` + QS.stringify(this.datasearch)
       service.get(`${url}`).then((response) => {
-        this.moviedata = response.data.result.items
-        this.datatotal = response.data.result.totalCount
+        this.moviedata = response.result.items
+        this.datatotal = response.result.totalCount
       })
     },
     onPageChanged(page_index) {
@@ -217,7 +217,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.$Message.success('保存成功')
             this.procedure = false
             this.cleardata()
@@ -252,7 +252,7 @@ export default {
           service
             .delete(`${url}`)
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('删除成功')
                 this.loaddata()
               } else {

pages/implement/components/entryPause.vue

@@ -171,8 +171,8 @@ export default {
         QS.stringify(this.datasearch)
 
       service.get(`${url}`).then((response) => {
-        this.data1 = response.data.result.items
-        this.datatotal = response.data.result.totalCount
+        this.data1 = response.result.items
+        this.datatotal = response.result.totalCount
       })
     },
     onPageChanged(page_index) {
@@ -198,7 +198,7 @@ export default {
               })
             )
             .then((response) => {
-              if (response.data.success) {
+              if (response.success) {
                 this.$Message.success('保存成功')
                 this.loaddata()
                 this.cleardata()

pages/implement/index.vue

@@ -369,11 +369,11 @@ export default {
       this.currententry = null
       var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
-        this.entryData = response.data.result.entryList
+        this.entryData = response.result.entryList
         this.entryHistoryData = this.entryData
         let data = []
         for (var i = 0; i < this.entryData.length; i++) {
-          if (this.entryData[i].id == response.data.result.currentID) {
+          if (this.entryData[i].id == response.result.currentID) {
             data = this.entryData[i]
             this.currententry = data
             this.currentID = this.entryData[i].id
@@ -431,8 +431,8 @@ export default {
         '&headerID=' +
         this.data.routing_header_id
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          let ordata = response.data.result
+        if (response.result != null) {
+          let ordata = response.result
           for (let j = 0; j < this.data.row.length; j++) {
             let obj = this.data.row[j]
             var gh = ordata.filter(function(number) {
@@ -456,9 +456,9 @@ export default {
         `${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +
         this.data.orderIDs
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
-          if (response.data.result.length > 0) {
-            this.loadMaterial(response.data.result)
+        if (response.result != null) {
+          if (response.result.length > 0) {
+            this.loadMaterial(response.result)
           }
         }
       })
@@ -468,9 +468,9 @@ export default {
       var url =
         `${designUrl}/ordermaterial/getbyid?Id=` + Bill[0].material_bill_id
       service.get(`${url}`).then((response) => {
-        if (response.data.result != null) {
+        if (response.result != null) {
           this.material_bill_id = Bill[0].material_bill_id
-          this.material_bill = response.data.result.orderMaterial
+          this.material_bill = response.result.orderMaterial
         }
       })
     },
@@ -541,7 +541,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.updateentrystatus(row.id, 14)
           }
         })
@@ -566,7 +566,7 @@ export default {
           })
         )
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             this.updateentrystatus(row.id, 14)
           }
         })