csdat02

.env.development

@@ -1,3 +1,3 @@
 OUT_PUT_DIR=dist/supervision-mobile
 
-VUE_APP_BACKEND_URL=http://localhost:8086/supervision-server
+VUE_APP_BACKEND_URL=http://localhost:8086/machinery-server

src/api/commodity.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function commodityList(formData){
+  return request.post(constant.serverUrl + "/open/commodityApi/commodityList", formData);
+}
+
+export default {
+  commodityList
+}

src/routers/index.js

@@ -32,6 +32,10 @@ export const constantRoutes = [
     path: '/csdat02',
     component: () => import('@/views/csdat02')
   },
+    {
+      path: '/csdat02',
+      component: () => import('@/views/csdat02')
+    },
     {
       path: '/tejiaindex',
       component: () => import('@/views/tejiaindex')

src/views/csdat01.vue

@@ -3,7 +3,7 @@
     <main role="main" class="von-main pb-5">
         <img src="../assets/img/csdat01.png" width="100%">
         <div class="von-csdat-1 mb-5">
-            <button type="button" class="pos-btn btn btn-warning p-2 text-center"><i class="iconfont iconyoujiantou mr-2" aria-hidden="true"></i>点击查看Victory刀具的型号与可选材质</button>					
+            <button type="button" class="pos-btn btn btn-warning p-2 text-center" @click="GoCsdat02"><i class="iconfont iconyoujiantou mr-2" aria-hidden="true"></i>点击查看Victory刀具的型号与可选材质</button>					
             <img src="../assets/img/csdat02.png" width="100%">
             <div class="von-call d-flex justify-content-center">
                 <button onclick="document.getElementById('centerblock').style.display='block'" type="button" class="call-btn btn btn-warning"><i class="iconfont icondianhua mr-2" aria-hidden="true"></i>联系我们</button>
@@ -16,4 +16,14 @@
         </div>
     </main>
 </div>
-</template>
+</template>
+
+<script>
+export default {
+    methods: {
+        GoCsdat02() {
+            this.$router.push({ path: this.redirect || "/csdat02" });
+        },
+	},
+};
+</script>

src/views/csdat02.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-    
+
 			<main role="main" class="von-main">
 				<img src="../assets/img/tejia01.png" width="100%" name='top'>
 				
@@ -49,4 +49,17 @@
     color: #ffffff;
     text-decoration: none;
 }
-</style>
+</style>
+
+
+<script>
+export default {
+	data(){
+		return{
+
+		};
+	}
+
+};
+</script>
+

src/views/tjcplist.vue

@@ -4,35 +4,67 @@
         <img src="../assets/img/tejia01.png" width="100%">
         <div class="cplist-tab p-4 bg-e9">
             <button type="button" class="btn btn-warning p-2" @click="GoTejiaindex"><i class="iconfont iconzuojiantou mr-2" aria-hidden="true"></i>返回选择页</button>
-            <div class="von-tjtab">
-                <h2 class="mt-5 pb-2">铣削</h2>
+            <div class="von-tjtab" v-for="item in formModel" :key="item.name">
+                <h2 class="mt-5 pb-2">{{item.name}}</h2>
                 <table border="" cellspacing="" cellpadding="">
-                    <tr>
-                        <th>铣刀盘  DWG60509146</th>
-                        <td class="von-tjtab-txt">整体铣刀，刀体总长55mm，采用BT40刀柄，柄部直径44.45mm。安装EDPT180508PDSRGD刀片，刀片刃倾角为-30度，刀片刀尖处直径为63mm，刀片加工处整体直径为103mm。刀片可加工刃长7.7mm</td>
-                        <td class="red">库存：1</td>
-                        <td><button type="button" class="btn btn-outline-danger" onclick="displayDiv('aaaa')">查看图纸</button></td>
-                    </tr>
-                    <tr>
-                        <th>铣刀盘  DWG60509146</th>
-                        <td class="von-tjtab-txt">整体铣刀，刀体总长55mm，采用BT40刀柄，柄部直径44.45mm。安装EDPT180508PDSRGD刀片，刀片刃倾角为-30度，刀片刀尖处直径为63mm，刀片加工处整体直径为103mm。刀片可加工刃长7.7mm</td>
-                        <td class="red">库存：1</td>
-                        <td><button type="button" class="btn btn-outline-dark"  disabled="disabled">无图纸</button></td>
+                    <tr v-for="li in item.list" :key="li.id">
+                        <th>{{li.productModel}}</th>
+                        <td class="von-tjtab-txt">{{li.productContent}}</td>
+                        <td width="90px" class="red">库存：{{li.productStock}}</td>
+                        <td width="90px" v-if="li.productPicture!=null"><button type="button" class="btn btn-outline-danger" @click="PicShow(li.productPicture)">查看图纸</button></td>
+                        <td width="90px" v-else><button type="button" class="btn btn-outline-dark">无图纸</button></td>
                     </tr>
                 </table>
             </div>
             <button type="button" class="btn btn-warning p-2 mt-5" @click="GoTejiaindex"><i class="iconfont iconzuojiantou mr-2" aria-hidden="true"></i>返回选择页</button>		
         </div>				
     </main>
+    <loading :visible="loading"></loading>
 </div>
 </template>
 
 <script>
+import commodityApi from "@/api/commodity";
+import Loading from '@/components/Loading.vue'
+
 export default {
+    components: {
+		Loading
+	},
+    data() {
+		return {
+			formModel: {},
+            loading: false,
+		};
+	},
+    mounted: function () {
+		var self = this;
+
+		(function () {
+			self.loading = true;
+			return commodityApi.commodityList();
+		})()
+		.then((response) => {
+			var jsonData = response.data;
+			self.loading = false;
+
+			if (jsonData.result) {
+				self.formModel = jsonData.data;
+			} else {
+				self.$message.error(jsonData.message + "");
+			}
+		})
+		.catch((error) => {
+			self.$message.error(error + "");
+		});
+	},
     methods: {
         GoTejiaindex() {
             this.$router.push({ path: this.redirect || "/tejiaindex" });
         },
+        PicShow(url) {
+            alert(url);
+        },
 	},
 };
 </script>