Parcourir la source

修改看板添加线别

callm il y a 22 heures
Parent
commit
d6b8e129f5
4 fichiers modifiés avec 14 ajouts et 20 suppressions
  1. 3 9
      package.json
  2. 3 3
      src/views/assembly/index.vue
  3. 4 4
      src/views/hj/index.vue
  4. 4 4
      src/views/smt/index.vue

+ 3 - 9
package.json

@@ -3,15 +3,14 @@
   "version": "1.5.1",
   "private": true,
   "scripts": {
-    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
     "@jiaminghi/data-view": "^2.7.3",
     "@types/echarts": "^4.4.3",
     "axios": "^1.3.5",
-    "caniuse-lite": "^1.0.30001610",
     "core-js": "^3.6.4",
     "crypto-js": "^4.2.0",
     "echarts": "^4.6.0",
@@ -19,15 +18,10 @@
     "js-cookie": "^3.0.5",
     "less": "^4.1.3",
     "less-loader": "^6.0.0",
-    "swiper": "^3.4.2",
     "vue": "^2.6.11",
     "vue-awesome": "^4.0.2",
-    "vue-awesome-swiper": "^2.6.7",
     "vue-router": "^3.1.5",
-    "vue-seamless-scroll": "^1.1.23",
-    "vue-tv-focusable": "^2.0.1",
-    "vuex": "^3.1.2",
-    "vuex-persistedstate": "^4.1.0"
+    "vuex": "^3.1.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.2.0",

+ 3 - 3
src/views/assembly/index.vue

@@ -55,14 +55,14 @@
                </el-dropdown-menu>
              </el-dropdown>
 
-<!--              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
                         :label="item.LI_CODE"
                         :value="item.LI_CODE"
                 ></el-option>
-              </el-select>-->
+              </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text"
                 >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
@@ -154,7 +154,7 @@ export default {
     bottomRight,
   },
   created() {
-    //this.getLines();
+    this.getLines();
     this.isFullScreen = document.fullscreenElement;
   },
   mounted() {

+ 4 - 4
src/views/hj/index.vue

@@ -55,14 +55,14 @@
                     <el-dropdown-item class="dropdownitem"><router-link to="total"> 各车间总看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>
             </el-dropdown>
-<!--              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
                         :label="item.LI_CODE"
                         :value="item.LI_CODE"
                 ></el-option>
-              </el-select>-->
+              </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
@@ -153,7 +153,7 @@ export default {
     bottomRight
   },
   created() {
-    //this.getLines();
+    this.getLines();
     this.isFullScreen = document.fullscreenElement;
   },
   mounted() {
@@ -207,7 +207,7 @@ export default {
       this.$router.push('/assembly');
     },
     getLines (){
-      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=点胶").then(
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=焊接").then(
               (res)=>{
                 if(res.data.linedata) {
                   const data = res.data.linedata.concat({'LI_CODE':'所有','LI_NAME':'所有'});

+ 4 - 4
src/views/smt/index.vue

@@ -55,14 +55,14 @@
                     <el-dropdown-item class="dropdownitem"><router-link to="total"> 各车间总看板</router-link></el-dropdown-item>
                   </el-dropdown-menu>
             </el-dropdown>
-<!--              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
+              <el-select v-model="linecode" class="dropdown" @change ="handleBlur" style="width: 150px">
                 <el-option
                         v-for="item in linedata"
                         :key="item.LI_CODE"
                         :label="item.LI_CODE"
                         :value="item.LI_CODE"
                 ></el-option>
-              </el-select>-->
+              </el-select>
               <span class="text">&nbsp;&nbsp;&nbsp;&nbsp;</span>
               <span class="text">{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span>
             </div>
@@ -152,7 +152,7 @@ export default {
     bottomRight
   },
   created() {
-    //this.getLines();
+    this.getLines();
     this.isFullScreen = document.fullscreenElement;
   },
   mounted() {
@@ -206,7 +206,7 @@ export default {
       this.$router.push('/assembly');
     },
     getLines (){
-      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=点胶").then(
+      this.$http.get("kanban/getLinesByWorkCenter.action?wccode=SMT").then(
               (res)=>{
                 if(res.data.linedata) {
                   const data = res.data.linedata.concat({'LI_CODE':'所有','LI_NAME':'所有'});