zhaozp 3 年之前
父節點
當前提交
b9bab389cd
共有 5 個文件被更改,包括 34 次插入8 次删除
  1. 1 1
      config/index.js
  2. 二進制
      dist.zip
  3. 3 2
      src/utils/request.js
  4. 28 3
      src/views/goods/addFailSafePlan.vue
  5. 2 2
      src/views/goods/planList.vue

+ 1 - 1
config/index.js

@@ -29,7 +29,7 @@ module.exports = {
         },
 
         // Various Dev Server settings
-        host: '0.0.0.0', // can be overwritten by process.env.HOST
+        host: 'localhost', // can be overwritten by process.env.HOST
         port: 9999, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
         autoOpenBrowser: true,
         errorOverlay: true,

二進制
dist.zip


+ 3 - 2
src/utils/request.js

@@ -15,8 +15,9 @@ const request = axios.create({
   // baseURL: 'http://172.18.1.227:40048',
   // baseURL: 'http://172.18.0.24:40048/',
   // baseURL: 'http://39.100.230.190/',
-  baseURL: 'https://s2t.jihengcc.cn',
-  // baseURL: '',
+  // baseURL: 'https://s2t.jihengcc.cn',
+  // baseURL: 'https://s2.jihengcc.cn',
+  baseURL: '',
   timeout: process.env.TIME_OUT,
   method: "post",
   type: "JSON"

+ 28 - 3
src/views/goods/addFailSafePlan.vue

@@ -207,11 +207,13 @@
             <img
               v-if="item.projectStandards.length - 1 === indey"
               src="../../assets/img/jia.png"
+              class="img-style"
               @click="addInfo(index)"
             />
             <img
-              v-else
+             v-if="item.projectStandards.length !== 1"
               src="../../assets/img/jian.png"
+              class="img-style"
               @click="removeInfo(index, indey)"
             />
           </el-col>
@@ -249,7 +251,7 @@
           @click="submit(1)"
           >确认</el-button
         >
-        <el-button size="medium" @click="$router.back()">取消</el-button>
+        <el-button size="medium" @click="cancle()">取消</el-button>
       </el-row>
     </el-row>
   </div>
@@ -407,6 +409,25 @@ export default {
           this.operatorData = res.data;
         })
     },
+    // 取消
+    cancle() {
+      this.$confirm('是否取消?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          setTimeout(() => {
+             this.$router.back()
+          }, 1000)
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          })
+        })
+    },
     // 提交
     submit(index) {
       this.loading = true;
@@ -571,7 +592,6 @@ export default {
 .jj-img {
   display: flex;
   align-items: flex-end;
-  justify-content: center;
   height: 100%;
 }
 .el-form-item {
@@ -606,4 +626,9 @@ export default {
 /deep/ .el-input--medium .el-input__inner {
   height: 42px;
 }
+.img-style {
+  width: 40px;
+  height: 40px;
+  margin-left:10px;
+}
 </style>

+ 2 - 2
src/views/goods/planList.vue

@@ -136,7 +136,7 @@
           align="center"
           prop="deviceType"
           label="型号"
-          min-width="20px"
+          min-width="30px"
         >
         </el-table-column>
         <el-table-column align="center" label="责任人" min-width="50px">
@@ -153,7 +153,7 @@
           align="center"
           prop="tourName"
           label="巡检人"
-          min-width="20px"
+          min-width="25px"
         >
         </el-table-column>
         <el-table-column