Merge branch 'master' of http://39.105.126.192:3000/DR3_web/ioc-admin-ui.git

src/api/service/service.js

@@ -6,3 +6,5 @@ import { get, post, put } from "@/utils/requestMethod";
 const getServiceList = () => {
   return get(`/server/server_list`);
 };
+
+export { getServiceList };

src/views/servicesManagement/allServices.vue

@@ -38,10 +38,11 @@
       </el-table-column>
       <el-table-column prop="updatetime">
         <template slot-scope="scope">
-          <el-form label-position="right" label-width="100px" v-model="form">
+          <el-form label-position="right" label-width="100px">
             <el-form-item label="版本号：">
-              <el-select v-model="form.version">
-                <el-option value="v1.0"></el-option>
+              <el-select v-model="scope.row.version">
+                <el-option value="v1.0" label="v1.0"></el-option>
+                <el-option value="v2.0" label="v2.0"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="更新时间：">
@@ -76,23 +77,6 @@
       </el-table-column>
     </el-table>
     <div class="bottom">
-      <!-- <div>
-        <checkbox class="checkbox" :total="total"></checkbox>
-        <el-button
-          class="check-cancel"
-          size="mini"
-          type="text"
-          @click="cancleChecked"
-          >取消</el-button
-        >
-      </div>
-      <div class="bottom_button" v-show="show">
-        <el-button class="delete" type="text">批量删除</el-button>
-        <el-divider direction="vertical"></el-divider>
-        <el-button class="disabled" type="text">批量激活</el-button>
-        <el-divider direction="vertical"></el-divider>
-        <el-button class="export" type="text">导出数据</el-button>
-      </div> -->
       <page :paginationData="paginationData"></page>
     </div>
   </div>
@@ -101,6 +85,7 @@
 <script>
 import checkbox from "@/components/Checkbox/index";
 import page from "@/components/pagination/index";
+import { getServiceList } from "@/api/service/service";
 export default {
   components: { checkbox, page },
   data() {
@@ -108,32 +93,33 @@ export default {
       input: "",
       show: true,
       form: {},
-      tableData: [
-        {
-          photo:
-            "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
-          updatetime: "2023-01-01 00:00",
-          name: "海康威视软件包",
-          introduction: "xxxxxxxxxxxxx",
-          status: "1",
-        },
-        {
-          photo:
-            "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
-          updatetime: "2023-01-01 00:00",
-          name: "海康威视软件包",
-          introduction: "xxxxxxxxxxxxx",
-          status: "2",
-        },
-        {
-          photo:
-            "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
-          updatetime: "2023-01-01 00:00",
-          name: "海康威视软件包",
-          introduction: "xxxxxxxxxxxxx",
-          status: "3",
-        },
-      ],
+      tableData: [],
+      // tableData: [
+      //   {
+      //     photo:
+      //       "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+      //     updatetime: "2023-01-01 00:00",
+      //     name: "海康威视软件包",
+      //     introduction: "xxxxxxxxxxxxx",
+      //     status: "1",
+      //   },
+      //   {
+      //     photo:
+      //       "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+      //     updatetime: "2023-01-01 00:00",
+      //     name: "海康威视软件包",
+      //     introduction: "xxxxxxxxxxxxx",
+      //     status: "2",
+      //   },
+      //   {
+      //     photo:
+      //       "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+      //     updatetime: "2023-01-01 00:00",
+      //     name: "海康威视软件包",
+      //     introduction: "xxxxxxxxxxxxx",
+      //     status: "3",
+      //   },
+      // ],
       paginationData: {
         pageSize: 10,
         pagerCount: 5,
@@ -149,11 +135,34 @@ export default {
       },
     };
   },
+  mounted() {
+    this.initData();
+  },
   methods: {
     handleSelectionChange() {
       //
     },
-    getTableData(val) {},
+    initData() {
+      this.getTableData(1);
+    },
+    getTableData(val) {
+      this.tableData = [];
+      getServiceList().then((res) => {
+        if (res.data.code === 0) {
+          res.data.data.forEach((v) => {
+            this.tableData.push({
+              updatetime: "2023-01-01 00:00",
+              name: v.name,
+              introduction: v.introduction,
+              status: "1",
+              setup_status: v.setup_status,
+              photo: require("@/assets/service/software_package.png"),
+              version: "v1.0",
+            });
+          });
+        }
+      });
+    },
     handleSizeChange(val) {},
   },
 };