Merge remote-tracking branch 'origin/master'

src/components/ImageUpload/index.vue

@@ -207,6 +207,7 @@ export default {
 ::v-deep.hide .el-upload--picture-card {
   display: none;
 }
+
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {

src/views/engine/engine/list.vue

@@ -156,7 +156,7 @@
 
     <!--回显-->
 
-    <el-dialog title="收货地址" :visible.sync="versionFormVisible">
+    <el-dialog title="测试" :visible.sync="versionFormVisible">
 
       <el-form :model="versions">
 

src/views/port/port/assets.vue

@@ -51,17 +51,25 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作">
+      <el-table-column
+        label="测试次数"
+        width="180">
         <template slot-scope="scope">
-          <el-button
+          <span style="margin-left: 10px">{{ scope.row.textNumber }}</span>
-            size="mini"
-            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            @click="handleDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
+
+<!--      <el-table-column label="操作">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="danger"-->
+<!--            @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
   </div>
 </template>

src/views/port/port/employee.vue

@@ -48,7 +48,7 @@
 <!--                <el-button type="primary" style="float: right; padding: 10px 10px" @click="testWeatherForecast()" v-if="connector.connectorName=='天气预报'">测试API</el-button>-->
 
 
-                <el-button type="primary" style="float: right; padding: 10px 10px" @click="navigateToDocumentation(connector.connectorId)">测试</el-button>
+                <el-button type="primary" style="float: right; padding: 10px 10px" @click="navigateToDocumentation(connector.connectorId)">点击申请</el-button>
 
 
 <!--                <el-button-->

src/views/port/sys/index.vue

@@ -3,7 +3,7 @@
   <el-container>
     <el-aside width="400px" style="background-color: #f5f5f5; padding: 20px;">
       <div>
-        <el-image :src="picture" style="width: 80%; max-width: 300px; height: auto;" fit="contain"></el-image>
+        <image-preview :src="picture" style="width: 80%; max-width: 300px; height: auto;" fit="contain"></image-preview>
         <h2>{{ name }}</h2>
         <p>{{remark}}</p>
         <p><strong></strong> <span class="price">{{ price }}/次</span></p>
@@ -237,7 +237,11 @@
       </div>
 
       <div v-if="activeTab === 'data-stats'">
-        <h2>请求</h2>
+        <el-card class="return-example-card" style="width: 80%; margin: 20px auto; box-shadow: 0 2px 12px rgba(0,0,0,0.1);">
+          <div slot="header" class="clearfix" style="padding: 20px;">
+            <pre>什么也没有</pre>
+          </div>
+        </el-card>
       </div>
     </div>
   </el-container>

src/views/type/index.vue

@@ -1,159 +0,0 @@
-<template>
-
-  <div>
-
-    <!-- 添加或修改规则引擎对话框 -->
-    <el-button type="text" @click="dialogFormVisible = true">添加规则类型</el-button>
-
-    <el-dialog title="添加规则" :visible.sync="dialogFormVisible">
-
-      <el-form :model="type">
-
-        <el-form-item label="规则名称" :label-width="formLabelWidth">
-
-          <el-input v-model="type.name" autocomplete="off"></el-input>
-
-        </el-form-item>
-
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-
-      </div>
-
-    </el-dialog>
-
-    <el-table :data="arr" style="width: 100%">
-
-      <el-table-column label="类型编号" width="180">
-
-        <template slot-scope="scope">
-
-          <span style="margin-left: 10px">{{ scope.row.id }}</span>
-
-        </template>
-
-      </el-table-column>
-
-      <el-table-column label="类型名称" width="180">
-
-        <template slot-scope="scope">
-
-          <span style="margin-left: 10px">{{ scope.row.name }}</span>
-
-        </template>
-
-      </el-table-column>
-
-      <el-table-column label="操作">
-
-        <template slot-scope="scope">
-
-          <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
-
-        </template>
-
-      </el-table-column>
-
-    </el-table>
-
-  </div>
-
-</template>
-
-<script>
-
-import {del, insert, list} from "@/api/type/type";
-
-export default {
-
-  //import引入的组件需要注入到对象中才能使用"
-
-  components: {},
-
-  props: {},
-
-  data() {
-
-    //这里存放数据"
-
-    return {
-
-      arr: [],
-
-      type: {},
-
-      rules: {
-
-        name: [{required: true, message: '请输入规则名称', trigger: 'blur'}]
-
-      },
-
-      dialogFormVisible: false,
-
-      formLabelWidth: '120px'
-
-    };
-
-  },
-
-  methods: {
-
-    List() {
-
-      list().then(res => {
-
-        this.arr = res;
-
-      })
-
-    },
-
-    handleDelete(id) {
-
-      if (confirm("你确定删除吗?")) {
-
-        del(id).then(res => {
-
-          this.$message.success(res.msg || "删除成功")
-
-        })
-
-      }
-
-    },
-
-    submitForm() {
-
-      this.dialogFormVisible = true
-
-      insert(this.type).then(res => {
-
-        this.$message.success(res.msg || "添加成功")
-
-      })
-
-      this.dialogFormVisible = false;
-
-    }
-
-  },
-
-  //生命周期 - 创建完成（可以访问当前this实例）",
-
-  created() {
-
-    this.List();
-
-  }
-
-}
-</script>
-
-<style scoped>
-
-</style>