Browse Source

前端gjy

gjy 3 years ago
parent
commit
048d0ee3e8

+ 72 - 3
public/static/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe6c9;</span>
+                <div class="name">关  闭</div>
+                <div class="code-name">&amp;#xe6c9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63a;</span>
+                <div class="name">眼睛-睁眼</div>
+                <div class="code-name">&amp;#xe63a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63b;</span>
+                <div class="name">眼睛-闭眼</div>
+                <div class="code-name">&amp;#xe63b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe609;</span>
                 <div class="name">yunshuguanli</div>
@@ -114,9 +132,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1625617801377') format('woff2'),
-       url('iconfont.woff?t=1625617801377') format('woff'),
-       url('iconfont.ttf?t=1625617801377') format('truetype');
+  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
+       url('iconfont.woff?t=1626864886667') format('woff'),
+       url('iconfont.ttf?t=1626864886667') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -142,6 +160,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-guanbi"></span>
+            <div class="name">
+              关  闭
+            </div>
+            <div class="code-name">.icon-guanbi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanjing-zhengyan"></span>
+            <div class="name">
+              眼睛-睁眼
+            </div>
+            <div class="code-name">.icon-yanjing-zhengyan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanjing-biyan"></span>
+            <div class="name">
+              眼睛-闭眼
+            </div>
+            <div class="code-name">.icon-yanjing-biyan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-yunshu2"></span>
             <div class="name">
@@ -232,6 +277,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+                <div class="name">关  闭</div>
+                <div class="code-name">#icon-guanbi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanjing-zhengyan"></use>
+                </svg>
+                <div class="name">眼睛-睁眼</div>
+                <div class="code-name">#icon-yanjing-zhengyan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanjing-biyan"></use>
+                </svg>
+                <div class="name">眼睛-闭眼</div>
+                <div class="code-name">#icon-yanjing-biyan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yunshu2"></use>

+ 15 - 3
public/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2554236 */
-  src: url('iconfont.woff2?t=1625617801377') format('woff2'),
-       url('iconfont.woff?t=1625617801377') format('woff'),
-       url('iconfont.ttf?t=1625617801377') format('truetype');
+  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
+       url('iconfont.woff?t=1626864886667') format('woff'),
+       url('iconfont.ttf?t=1626864886667') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanbi:before {
+  content: "\e6c9";
+}
+
+.icon-yanjing-zhengyan:before {
+  content: "\e63a";
+}
+
+.icon-yanjing-biyan:before {
+  content: "\e63b";
+}
+
 .icon-yunshu2:before {
   content: "\e609";
 }

File diff suppressed because it is too large
+ 0 - 0
public/static/iconfont/iconfont.js


+ 21 - 0
public/static/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17984171",
+      "name": "关  闭",
+      "font_class": "guanbi",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "10715457",
+      "name": "眼睛-睁眼",
+      "font_class": "yanjing-zhengyan",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "10715460",
+      "name": "眼睛-闭眼",
+      "font_class": "yanjing-biyan",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
     {
       "icon_id": "22711544",
       "name": "yunshuguanli",

BIN
public/static/iconfont/iconfont.ttf


BIN
public/static/iconfont/iconfont.woff


BIN
public/static/iconfont/iconfont.woff2


+ 11 - 5
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -197,10 +197,10 @@
         style="width: 100%"
         class="position"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
-        :key="index"
+        :key="item.id"
       >
         <div class="driver">
-          <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <span>运输阶段{{ item.key }} {{ item.processNo }}</span>
           <img
             v-if="!endflag"
             width="22"
@@ -429,6 +429,7 @@ export default {
             receiveDetailedAddress: '',
             sender: '',
             receiver: '',
+            key:1,
             senderPhone: '',
             receiverPhone: '',
             endFlag: '0',
@@ -648,7 +649,7 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo + '-' + this.number,
+        processNo: this.deptBudgetList.taskNo + '-' + (this.deptBudgetList.tranProcessInfoList.length+1),
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
@@ -669,17 +670,22 @@ export default {
         receiveDetailedAddress: '',
         sender: '',
         receiver: '',
+        key:this.deptBudgetList.tranProcessInfoList.length,
         senderPhone: '',
         receiverPhone: '',
         endFlag: '0',
       })
-      this.number++
     },
     del(index) {
       if (this.deptBudgetList.tranProcessInfoList.length > 1) {
         this.deptBudgetList.tranProcessInfoList.splice(index, 1)
       }
-      this.number--
+      for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+        this.$set(this.deptBudgetList.tranProcessInfoList[i],'key',i+1)
+        this.$set(this.deptBudgetList.tranProcessInfoList[i],'processNo', this.deptBudgetList.taskNo + '-' + (i+1))
+      }
+      this.$forceUpdate()
+      console.log(this.deptBudgetList.tranProcessInfoList)
     },
     handleChange(value) {
       this.selectedOptions = value

+ 15 - 2
src/views/warehouse/warehouseManagementAdd.vue

@@ -180,14 +180,15 @@
             uploadSuccessHandle(res)
           }
         "
-        :on-remove="(value) => {handleRemove(value)}"
         class="avatar-uploader"
         accept=".jpg, .jpeg, .png, .gif"
         >
         <el-button  v-show="radio == 1">上传附件</el-button>   
       </el-upload>
       <div class="addressUrls" v-if="addressUrls != null">
-         <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
+        <div class='addressUrls-item'>
+          <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
+           <div @click='close(index)' class="iconfont icon-guanbi"></div>
           <img
             v-if="addressUrls != null"
             width="100"
@@ -195,6 +196,8 @@
             :src="item"
             alt=""
           /> 
+        </div>
+         
        
           </div> 
           </div>
@@ -318,6 +321,9 @@ export default {
     },
   },
   methods: {
+    close(index){
+      this.addressUrls.splice(index,1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -1058,6 +1064,13 @@ export default {
   display: flex;
   margin-top: 10px;
 }
+.addressUrls-item{
+  position:relative;
+}
+.icon-guanbi{
+  position:absolute;
+  right:0;
+}
 .addressUrl{
   margin: 0px 10px;
   border-radius: 3px;

+ 25 - 10
src/views/warehouse/warehouseManagementEdit.vue

@@ -181,17 +181,22 @@
         >
           <el-button  v-if="warehouseType == 1">上传附件</el-button>
         </el-upload>
-        <div class="addressUrls">
-          <div v-for="(items, index) in addressUrls" class="addressUrl">
-            <img
-              v-show="addressUrls.length > 0"
-              width="100"
-              height="100"
-              :src="items"
-              alt=""
-            />
-          </div>
+        <div class="addressUrls" v-if="addressUrls != null">
+        <div class='addressUrls-item'>
+          <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
+           <div @click='close(index)' class="iconfont icon-guanbi"></div>
+          <img
+            v-if="addressUrls != null"
+            width="100"
+            height="100"
+            :src="item"
+            alt=""
+          /> 
         </div>
+         
+       
+          </div> 
+          </div>
         <div class="small-title">仓库定位</div>
         <map-drag
           @marker="marker"
@@ -324,6 +329,9 @@ export default {
     },
   },
   methods: {
+    close(index){
+      this.addressUrls.splice(index,1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -998,4 +1006,11 @@ export default {
   margin: 0 10px;
   border-radius: 3px;
 }
+.addressUrls-item{
+  position:relative;
+}
+.icon-guanbi{
+  position:absolute;
+  right:0;
+}
 </style>

Some files were not shown because too many files changed in this diff