sunyadv 5 роки тому
батько
коміт
99e1367588

+ 0 - 57
ys_vue/README.md

@@ -1,57 +0,0 @@
-**demo**: [https://taylorchen709.github.io/vue-admin/](https://taylorchen709.github.io/vue-admin/)
-
-# To start
-
-This is a project template for [vue-cli](https://github.com/vuejs/vue-cli)
-
-``` bash
-# install dependencies
-npm install
-
-# serve with hot reload at localhost:8081
-npm run dev
-
-# build for production with minification
-npm run build
-
-```
-
-# Folder structure
-* build - webpack config files
-* config - webpack config files
-* dist - build
-* src -your app
-    * api
-    * assets
-    * common
-    * components - your vue components
-    * mock
-    * styles
-    * views - your pages
-    * vuex
-    * App.vue
-    * main.js - main file
-    * routes.js
-* static - static assets
-
-# Theme
-You can change theme by 
-1. Generate theme packages by [https://elementui.github.io/theme-preview/#/](https://elementui.github.io/theme-preview/#/)
-2. Put theme packages in src/assets/theme/
-3. Edit src/main.js 
-``` bash
-   import 'element-ui/lib/theme-default/index.css'
-   to
-   import './assets/theme/your-theme/index.css'
-```
-4. Edit src/styles/vars.scss
-
-![theme-blue](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/rec-demo.gif)
-![theme-green](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/theme-green.png)
-
-# Browser support
-
-Modern browsers and IE 10+.
-
-# License
-[MIT](http://opensource.org/licenses/MIT)

+ 0 - 1
ys_vue/index.html

@@ -112,6 +112,5 @@
     </head>
     <body>
         <div id="app"></div>
-        <!-- built files will be auto injected -->
     </body>
 </html>

+ 7 - 26
ys_vue/package-lock.json

@@ -3610,14 +3610,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3632,20 +3630,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3762,8 +3757,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3775,7 +3769,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3790,7 +3783,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3798,14 +3790,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3824,7 +3814,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3905,8 +3894,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3918,7 +3906,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4040,7 +4027,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4977,11 +4963,6 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
-    "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
-    },
     "js-base64": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",

+ 0 - 1
ys_vue/package.json

@@ -14,7 +14,6 @@
     "echarts": "^3.3.2",
     "element-ui": "^2.10.1",
     "font-awesome": "^4.7.0",
-    "jquery": "^3.4.1",
     "nprogress": "^0.2.0",
     "vue": "^2.6.10",
     "vue-router": "^2.3.0",

+ 0 - 5
ys_vue/src/App.vue

@@ -17,9 +17,6 @@
     body {
         margin: 0px;
         padding: 0px;
-        /*background: url(assets/bg1.jpg) center !important;
-            background-size: cover;*/
-        // background: #1F2D3D;
         font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
         font-size: 14px;
         -webkit-font-smoothing: antialiased;
@@ -45,8 +42,6 @@
     .toolbar {
         background: #f2f2f2;
         padding: 10px;
-        //border:1px solid #dfe6ec;
-        // margin: 10px 0px;
         .el-form-item {
             margin-bottom: 10px;
         }

+ 0 - 26
ys_vue/src/http.js

@@ -8,30 +8,6 @@ const TIME_OUT_MS = 60 * 1000 // 默认请求超时时间
  */
 function handleResults (response) {
     let remoteResponse = response.data;
-    // var result = {
-    //     success: false,
-    //     message: '',
-    //     status: [],
-    //     errorCode: '',
-    //     data: {
-    //         total: 0,
-    //         results: []
-    //     }
-    // }
-    // if (remoteResponse.code == "ok") {
-    //     result.data.results = remoteResponse.data
-    //     result.data.total = remoteResponse.total
-    //     result.success = true
-    // }
-    // if (remoteResponse.code == "error") {
-    //     let status = remoteResponse.status
-    //     if (status === 400) {
-    //         console.log('传参错误')
-    //     }
-    //     result.errorCode = remoteResponse.errorCode
-    //     result.message = remoteResponse.message
-    // }
-    //return result
     return remoteResponse
 }
 
@@ -69,7 +45,6 @@ export default {
             headers: {
                 //'Content-Type': 'application/json; charset=UTF-8'
                 'Content-type': ' application/x-www-form-urlencoded; charset=UTF-8',
-                //'token': token
             }
         }).then(
             (result) => {
@@ -172,7 +147,6 @@ export default {
             (result) => {
                 const excelBlob = result.data
                 if ('msSaveOrOpenBlob' in navigator) {
-                    // Microsoft Edge and Microsoft Internet Explorer 10-11
                     window.navigator.msSaveOrOpenBlob(excelBlob, fileName)
                 } else {
                     const elink = document.createElement('a')

+ 0 - 15
ys_vue/src/main.js

@@ -5,18 +5,10 @@ import VueRouter from 'vue-router'
 
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-//import 'element-ui/lib/theme-default/index.css'
-//import './assets/theme/theme-green/index.css'
 
 import store from './vuex/store'
 import Vuex from 'vuex'
-//import NProgress from 'nprogress'
-//import 'nprogress/nprogress.css'
 import routes from './routes'
-// import Mock from './mock'
-// Mock.bootstrap();
-
-import $ from 'jquery'
 
 import http from './http'
 Vue.prototype.http = http
@@ -88,16 +80,9 @@ router.beforeEach((to, from, next) => {
     }
 })
 
-// router.afterEach(transition => {
-// NProgress.done();
-// });
-
 new Vue({
-    //el: '#app',
-    //template: '<App/>',
     router,
     store,
-    //components: { App }
     render: h => h(App)
 }).$mount('#app')
 

+ 0 - 1
ys_vue/src/port.js

@@ -1,7 +1,6 @@
 export default {
     manage: {
         login: '/user/login', //登录
-        //logout: '/manage/company/loginOut' //退出
     },
     //消息提示相关
     notice: {

+ 432 - 456
ys_vue/src/views/Home.vue

@@ -1,487 +1,463 @@
 <template>
-  <el-row class="container">
-    <el-col :span="24" class="header">
-      <el-col
-        :span="10"
-        class="logo"
-        :class="collapsed?'logo-collapse-width':'logo-width'"
-      >{{collapsed?'':sysName}}</el-col>
-      <el-col :span="10">
-        <div class="tools" @click.prevent="collapse">
-          <i class="fa fa-align-justify"></i>
-        </div>
-      </el-col>
-      <el-col :span="6" class="userinfo">
-        <el-badge is-dot class="itemNew">
-          <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
-          <!-- 消息中心 -->
-          <el-popover
-            ref="popover1"
-            placement="bottom"
-            width="400"
-            trigger="hover"
-            popper-class="popover-self"
-          >
-            <div class="popover-main">消息盒子</div>
-            <div class="popover-item" v-if="popoverData.length == 0">暂无消息</div>
-            <div class="popover-item" v-for="item in popoverData">
-              <p class="popover-title">
-                <span
-                  style="cursor: pointer;"
-                  @click="locationHerf(item.refId, item.noticeType)"
-                >{{item.projectName}}</span>
-                <span class="popover-type" v-if="item.noticeType == 0">[审批]</span>
-                <span class="popover-type" v-else-if="item.noticeType == 1">[警告]</span>
-                <span class="popover-type" v-else-if="item.noticeType == 2">[保养]</span>
-              </p>
-              <p>{{item.content}}</p>
-            </div>
-            <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
-          </el-popover>
-        </el-badge>
-        <el-dropdown trigger="hover">
-          <span class="el-dropdown-link userinfo-inner">
-            <img src="../assets/image/userHead.jpg" />
-            {{sysUserName}}
-          </span>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
-            <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </el-col>
-    </el-col>
-    <el-col :span="24" class="main">
-      <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
-        <!--导航菜单-->
-        <el-menu
-          :default-active="$route.path"
-          class="el-menu-vertical-demo"
-          @open="handleopen"
-          @close="handleclose"
-          @select="handleselect"
-          unique-opened
-          router
-          v-if="!collapsed"
-        >
-          <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
-            <el-submenu :index="index+''" v-if="!item.leaf">
-              <template slot="title">
-                <i :class="item.iconCls"></i>
-                <span class="itemName">{{item.name}}</span>
-              </template>
-              <el-menu-item
-                v-for="child in item.children"
-                :index="child.path"
-                :key="child.path"
-                v-if="!child.hidden"
-              >{{child.name}}</el-menu-item>
-            </el-submenu>
-            <el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path">
-              <i :class="item.iconCls"></i>
-              {{item.children[0].name}}
-            </el-menu-item>
-          </template>
-        </el-menu>
-        <!--导航菜单-折叠后-->
-        <ul class="el-menu el-menu-vertical-demo collapsed" v-if="collapsed" ref="menuCollapsed">
-          <li
-            v-for="(item,index) in $router.options.routes"
-            v-if="!item.hidden"
-            class="el-submenu item"
-            :style="{overflow:!item.leaf?'':'hidden'}"
-          >
-            <template v-if="!item.leaf">
-              <div
-                class="el-submenu__title"
-                style="padding-left: 20px;"
-                @mouseover="showMenu(index,true)"
-                @mouseout="showMenu(index,false)"
-              >
-                <i :class="item.iconCls"></i>
-              </div>
-              <ul
-                class="el-menu submenu"
-                :class="'submenu-hook-'+index"
-                @mouseover="showMenu(index,true)"
-                @mouseout="showMenu(index,false)"
-              >
-                <li
-                  v-for="child in item.children"
-                  v-if="!child.hidden"
-                  :key="child.path"
-                  class="el-menu-item"
-                  style="padding-left: 40px;"
-                  :class="$route.path==child.path?'is-active':''"
-                  @click="$router.push(child.path)"
-                >{{child.name}}</li>
-              </ul>
-            </template>
-            <template v-else>
-              <li class="el-submenu">
-                <div
-                  class="el-submenu__title el-menu-item"
-                  style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;"
-                  :class="$route.path==item.children[0].path?'is-active':''"
-                  @click="$router.push(item.children[0].path)"
-                >
-                  <i :class="item.iconCls"></i>
+    <el-row class="container">
+        <el-col :span="24" class="header">
+            <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'" :style="collapsed?'padding:0':''">
+                <img v-if="collapsed" class="headImg" src="../assets/image/head_logo.png">
+                <span v-else>{{sysName}}</span>
+            </el-col>
+            <el-col :span="10">
+                <div class="tools" @click.prevent="collapse">
+                    <i class="fa fa-align-justify"></i>
+                </div>
+            </el-col>
+            <el-col :span="6" class="userinfo">
+                <el-badge is-dot class="itemNew">
+                    <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
+                    <!-- 消息中心 -->
+                    <el-popover ref="popover1" placement="bottom" width="400" trigger="hover" popper-class="popover-self">
+                        <div class="popover-main">消息盒子</div>
+                        <div class="popover-item" v-if="popoverData.length == 0">暂无消息</div>
+                        <div class="popover-item" v-for="item in popoverData">
+                            <p class="popover-title">
+                                <span
+                                    style="cursor: pointer;"
+                                    @click="locationHerf(item.refId, item.noticeType)"
+                                >{{item.projectName}}</span>
+                                <span class="popover-type" v-if="item.noticeType == 0">[审批]</span>
+                                <span class="popover-type" v-else-if="item.noticeType == 1">[警告]</span>
+                                <span class="popover-type" v-else-if="item.noticeType == 2">[保养]</span>
+                            </p>
+                            <p>{{item.content}}</p>
+                        </div>
+                        <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
+                    </el-popover>
+                </el-badge>
+                <el-dropdown trigger="hover">
+                    <span class="el-dropdown-link userinfo-inner">
+                        <img src="../assets/image/userHead.jpg" />
+                        {{sysUserName}}
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
+                        <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            </el-col>
+        </el-col>
+
+        <el-col :span="24" class="main">
+            <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
+                <!--导航菜单-->
+                <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-if="!collapsed">
+                    <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
+                        <el-submenu :index="index+''" v-if="!item.leaf">
+                            <template slot="title">
+                                <i :class="item.iconCls"></i>
+                                <span class="itemName">{{item.name}}</span>
+                            </template>
+                            <el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden">{{child.name}}</el-menu-item>
+                        </el-submenu>
+                        <el-menu-item v-if="item.leaf && item.children.length > 0" :index="item.children[0].path">
+                            <i :class="item.iconCls"></i>
+                            {{item.children[0].name}}
+                        </el-menu-item>
+                    </template>
+                </el-menu>
+                <!--导航菜单-折叠后-->
+                <ul class="el-menu el-menu-vertical-demo collapsed" v-if="collapsed" ref="menuCollapsed">
+                <li v-for="(item,index) in $router.options.routes" v-if="!item.hidden" class="el-submenu item" :style="{overflow:!item.leaf?'':'hidden'}">
+                    <template v-if="!item.leaf">
+                        <div class="el-submenu__title" style="padding-left: 20px;" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)">
+                            <i :class="item.iconCls"></i>
+                        </div>
+                        <ul class="el-menu submenu" :class="'submenu-hook-'+index" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)">
+                            <li v-for="child in item.children" v-if="!child.hidden" :key="child.path"
+                                class="el-menu-item"
+                                style="padding-left: 40px;"
+                                :class="$route.path==child.path?'is-active':''"
+                                @click="$router.push(child.path)"
+                            >{{child.name}}</li>
+                        </ul>
+                    </template>
+                    <template v-else>
+                        <li class="el-submenu">
+                            <div
+                                class="el-submenu__title el-menu-item"
+                                style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;"
+                                :class="$route.path==item.children[0].path?'is-active':''"
+                                @click="$router.push(item.children[0].path)"
+                            >
+                            <i :class="item.iconCls"></i>
+                            </div>
+                        </li>
+                    </template>
+                </li>
+                </ul>
+            </aside>
+            <section class="content-container">
+                <div class="grid-content bg-purple-light">
+                    <el-col :span="24" class="content-wrapper">
+                        <transition name="fade" mode="out-in">
+                            <router-view></router-view>
+                        </transition>
+                    </el-col>
                 </div>
-              </li>
-            </template>
-          </li>
-        </ul>
-      </aside>
-      <section class="content-container">
-        <div class="grid-content bg-purple-light">
-          <!-- <el-col :span="24" class="breadcrumb-container">
-						<strong class="title">{{$route.name}}</strong>
-						<el-breadcrumb separator="/" class="breadcrumb-inner">
-							<el-breadcrumb-item v-for="item in $route.matched" :key="item.path">
-								{{ item.name }}
-							</el-breadcrumb-item>
-						</el-breadcrumb>
-          </el-col>-->
-          <el-col :span="24" class="content-wrapper">
-            <transition name="fade" mode="out-in">
-              <router-view></router-view>
-            </transition>
-          </el-col>
-        </div>
 
-        <!--修改密码-->
-        <el-dialog
-          title="修改密码"
-          v-if="editPassWord"
-          :visible.sync="editPassWord"
-          :close-on-click-modal="false"
-          customClass="customWidth"
-        >
-          <el-form :model="addForm" label-width="80px" :rules="passRule" ref="addForm">
-            <el-form-item label="新密码" prop="password">
-              <el-input
-                v-model="addForm.password"
-                autocomplete="off"
-                placeholder="请输入新密码"
-                show-password
-              ></el-input>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click.native="editPassWord = false">取消</el-button>
-            <el-button type="primary" @click.native="resetPwd" :loading="editLoading">提交</el-button>
-          </div>
-        </el-dialog>
-      </section>
-    </el-col>
-  </el-row>
+                <!--修改密码-->
+                <el-dialog
+                    title="修改密码"
+                    v-if="editPassWord"
+                    :visible.sync="editPassWord"
+                    :close-on-click-modal="false"
+                    customClass="customWidth"
+                >
+                    <el-form :model="addForm" label-width="80px" :rules="passRule" ref="addForm">
+                        <el-form-item label="新密码" prop="password">
+                        <el-input
+                            v-model="addForm.password"
+                            autocomplete="off"
+                            placeholder="请输入新密码"
+                            show-password
+                        ></el-input>
+                        </el-form-item>
+                    </el-form>
+                    <div slot="footer" class="dialog-footer">
+                        <el-button @click.native="editPassWord = false">取消</el-button>
+                        <el-button type="primary" @click.native="resetPwd" :loading="editLoading">提交</el-button>
+                    </div>
+                </el-dialog>
+            </section>
+        </el-col>
+    </el-row>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      user: sessionStorage.getItem("user"),
-      sysName: "云塑网后台管理系统",
-      collapsed: false,
-      sysUserName: "",
+    export default {
+        data() {
+            return {
+            user: sessionStorage.getItem("user"),
+            sysName: "云塑网后台管理系统",
+            collapsed: false,
+            sysUserName: "",
 
-      editPassWord: false,
-      editLoading: false,
-      addForm: {
-        password: ""
-      },
-      passRule: {
-        password: [{ required: true, message: "请输入新密码", trigger: "blur" }]
-      },
-      //消息数据
-      popoverData: []
-    };
-  },
-  methods: {
-    onSubmit() {},
-    handleopen() {},
-    handleclose() {},
-    handleselect: function(a, b) {},
-    //退出登录
-    logout: function() {
-      var _this = this;
-      this.$confirm("确认退出吗?", "提示", {
-        //type: 'warning'
-      }).then(() => {
-        sessionStorage.removeItem("user");
-        _this.$router.push("/login");
-      });
-    },
-    //折叠导航栏
-    collapse: function() {
-      this.collapsed = !this.collapsed;
-    },
-    showMenu(i, status) {
-      this.$refs.menuCollapsed.getElementsByClassName(
-        "submenu-hook-" + i
-      )[0].style.display = status ? "block" : "none";
-    },
-    reset() {
-      this.editPassWord = true;
-      this.addForm.id = JSON.parse(sessionStorage.getItem("user")).id;
-      this.addForm.account = JSON.parse(sessionStorage.getItem("user")).account;
-    },
-    resetPwd() {
-      this.$refs.addForm.validate(valid => {
-        if (valid) {
-          this.editLoading = true;
-          this.http.post(
-            this.port.pwd.resetPwd,
-            this.addForm,
-            res => {
-              this.editLoading = false;
-              this.editPassWord = false;
-              if (res.code == "ok") {
-                this.$message({
-                  message: "修改成功,请重新登录",
-                  type: "success"
+            editPassWord: false,
+            editLoading: false,
+            addForm: {
+                password: ""
+            },
+            passRule: {
+                password: [{ required: true, message: "请输入新密码", trigger: "blur" }]
+            },
+            //消息数据
+            popoverData: []
+            };
+        },
+        methods: {
+            onSubmit() {},
+
+            handleopen() {},
+
+            handleclose() {},
+
+            handleselect: function(a, b) {},
+
+            //退出登录
+            logout: function() {
+                var _this = this;
+                this.$confirm("确认退出吗?", "提示", {
+                    //type: 'warning'
+                }).then(() => {
+                    sessionStorage.removeItem("user");
+                    _this.$router.push("/login");
                 });
-                this.$router.push("/login");
-              } else {
-                this.$message({
-                  message: res.msg,
-                  type: "error"
+            },
+
+            //折叠导航栏
+            collapse: function() {
+                this.collapsed = !this.collapsed;
+            },
+
+            showMenu(i, status) {
+                this.$refs.menuCollapsed.getElementsByClassName(
+                    "submenu-hook-" + i
+                )[0].style.display = status ? "block" : "none";
+            },
+
+            reset() {
+                this.editPassWord = true;
+                this.addForm.id = JSON.parse(sessionStorage.getItem("user")).id;
+                this.addForm.account = JSON.parse(sessionStorage.getItem("user")).account;
+            },
+
+            resetPwd() {
+                this.$refs.addForm.validate(valid => {
+                    if (valid) {
+                        this.editLoading = true;
+                        this.http.post( this.port.pwd.resetPwd, this.addForm,
+                        res => {
+                            this.editLoading = false;
+                            this.editPassWord = false;
+                            if (res.code == "ok") {
+                                this.$message({
+                                message: "修改成功,请重新登录",
+                                type: "success"
+                                });
+                                this.$router.push("/login");
+                            } else {
+                                this.$message({
+                                message: res.msg,
+                                type: "error"
+                                });
+                            }
+                        },
+                        error => {
+                            this.editLoading = false;
+                            this.editPassWord = false;
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                            }
+                        );
+                    }
+                });
+            },
+            //读取消息提示
+            loadNotice() {
+            this.http.post( this.port.notice.list, {},
+                res => {
+                    if (res.code == "ok") {
+                        this.popoverData = res.data.list;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
                 });
-              }
             },
-            error => {
-              this.editLoading = false;
-              this.editPassWord = false;
-              this.$message({
-                message: error,
-                type: "error"
-              });
+            //点击消息的跳转
+            locationHerf(id, type) {
+                if (type == 0) {
+                    //审批 跳转到模具详情
+                    this.$router.push("/moldList/" + id);
+                } else if (type == 1) {
+                    //警告 跳转到运行监测
+                    this.$router.push("/detection");
+                } else if (type == 2) {
+                    //保养 跳转到运行监测详情
+                    this.$router.push("/detection/" + id);
+                }
             }
-          );
-        }
-      });
-    },
-    //读取消息提示
-    loadNotice() {
-      this.http.post(
-        this.port.notice.list,
-        {},
-        res => {
-          if (res.code == "ok") {
-            this.popoverData = res.data.list;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
         },
-        error => {
-          this.$message({
-            message: error,
-            type: "error"
-          });
+        mounted() {
+            if (this.user) {
+                var user = JSON.parse(this.user);
+                this.user = user;
+                this.sysUserName = user.username || "";
+                this.loadNotice();
+            } else {
+                this.$router.push("/login");
+            }
         }
-      );
-    },
-    //点击消息的跳转
-    locationHerf(id, type) {
-      if (type == 0) {
-        //审批 跳转到模具详情
-        this.$router.push("/moldList/" + id);
-      } else if (type == 1) {
-        //警告 跳转到运行监测
-        this.$router.push("/detection");
-      } else if (type == 2) {
-        //保养 跳转到运行监测详情
-        this.$router.push("/detection/" + id);
-      }
-    }
-  },
-  mounted() {
-    if (this.user) {
-      var user = JSON.parse(this.user);
-      this.user = user;
-      this.sysUserName = user.username || "";
-      this.loadNotice();
-    } else {
-      this.$router.push("/login");
-    }
-  }
-};
+    };
 </script>
 
 <style scoped lang="scss">
-@import "~scss_vars";
+    @import "~scss_vars";
 
-.el-menu-vertical-demo i {
-  margin-right: 10px;
-}
+    .el-menu-vertical-demo i {
+        margin-right: 10px;
+    }
 
-.itemNew {
-  height: 25px;
-  margin-left: 15px;
-  i {
-    vertical-align: top;
-  }
-}
+    .container .header .logo img.headImg {
+        margin:0;
+        width:40px;
+        height: 40px;
+        margin: 10px 0 0 10px;
+    }
 
-.container {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  width: 100%;
-  .header {
-    height: 60px;
-    line-height: 60px;
-    background: $color-primary;
-    color: #fff;
-    .userinfo {
-      text-align: right;
-      padding-right: 35px;
-      float: right;
-      .userinfo-inner {
-        cursor: pointer;
-        color: #fff;
-        img {
-          width: 40px;
-          height: 40px;
-          border-radius: 20px;
-          margin: 10px 10px 10px 10px;
-          // float: right;
-          float: left;
+    .itemNew {
+        height: 25px;
+        margin-right: 25px;
+        i {
+            vertical-align: top;
         }
-      }
     }
-    .logo {
-      //width:230px;
-      height: 60px;
-      font-size: 21px;
-      padding-left: 20px;
-      padding-right: 20px;
-      border-color: rgba(238, 241, 146, 0.3);
-      border-right-width: 1px;
-      border-right-style: solid;
-      img {
-        width: 40px;
-        float: left;
-        margin: 10px 10px 10px 18px;
-      }
-      .txt {
-        color: #fff;
-      }
-    }
-    .logo-width {
-      width: 230px;
-    }
-    .logo-collapse-width {
-      width: 60px;
-    }
-    .tools {
-      padding: 0px 23px;
-      width: 14px;
-      height: 60px;
-      line-height: 60px;
-      cursor: pointer;
-    }
-  }
-  .main {
-    display: flex;
-    // background: #324057;
+
+    .container {
     position: absolute;
-    top: 60px;
+    top: 0px;
     bottom: 0px;
-    overflow: hidden;
-    aside {
-      flex: 0 0 230px;
-      width: 230px;
-      // position: absolute;
-      // top: 0px;
-      // bottom: 0px;
-      .el-menu {
-        height: 100%;
-      }
-      .collapsed {
-        width: 60px;
-        .item {
-          position: relative;
+    width: 100%;
+        .header {
+            height: 60px;
+            line-height: 60px;
+            background: $color-primary;
+            color: #fff;
+            .userinfo {
+                text-align: right;
+                padding-right: 35px;
+                float: right;
+
+                .userinfo-inner {
+                    cursor: pointer;
+                    color: #fff;
+                    img {
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 20px;
+                    margin: 10px 10px 10px 10px;
+                    // float: right;
+                    float: left;
+                    }
+                }
+            }
+            .logo {
+                //width:230px;
+                height: 60px;
+                font-size: 21px;
+                padding-left: 20px;
+                padding-right: 20px;
+                border-color: rgba(238, 241, 146, 0.3);
+                border-right-width: 1px;
+                border-right-style: solid;
+                img {
+                    width: 40px;
+                    float: left;
+                    margin: 10px 10px 10px 18px;
+                }
+                .txt {
+                    color: #fff;
+                }
+            }
+
+            .logo-width {
+                width: 230px;
+            }
+
+            .logo-collapse-width {
+                width: 60px;
+            }
+
+            .tools {
+                padding: 0px 23px;
+                width: 14px;
+                height: 60px;
+                line-height: 60px;
+                cursor: pointer;
+            }
         }
-        .submenu {
-          position: absolute;
-          top: 0px;
-          left: 60px;
-          z-index: 99999;
-          height: auto;
-          display: none;
+        .main {
+            display: flex;
+            // background: #324057;
+            position: absolute;
+            top: 60px;
+            bottom: 0px;
+            overflow: hidden;
+            aside {
+                flex: 0 0 230px;
+                width: 230px;
+                // position: absolute;
+                // top: 0px;
+                // bottom: 0px;
+                .el-menu {
+                    height: 100%;
+                }
+                .collapsed {
+                    width: 60px;
+                    .item {
+                    position: relative;
+                    }
+                    .submenu {
+                    position: absolute;
+                    top: 0px;
+                    left: 60px;
+                    z-index: 99999;
+                    height: auto;
+                    display: none;
+                    }
+                }
+            }
+
+            .menu-collapsed {
+                flex: 0 0 60px;
+                width: 60px;
+            }
+
+            .menu-expanded {
+                flex: 0 0 230px;
+                width: 230px;
+            }
+
+            .content-container {
+                // background: #f8f8f8;
+                //f1f2f7
+                flex: 1;
+                width: 80%;
+                // position: absolute;
+                // right: 0px;
+                // top: 0px;
+                // bottom: 0px;
+                // left: 230px;
+                // overflow-y: scroll;
+                padding: 20px;
+                .breadcrumb-container {
+                    //margin-bottom: 15px;
+                    .title {
+                    width: 200px;
+                    float: left;
+                    color: #475669;
+                    }
+                    .breadcrumb-inner {
+                    float: right;
+                    }
+                }
+                .content-wrapper {
+                    background-color: #fff;
+                    box-sizing: border-box;
+                }
+            }
         }
-      }
     }
-    .menu-collapsed {
-      flex: 0 0 60px;
-      width: 60px;
+
+    .popover-main {
+        font-weight: 700;
+        padding: 10px;
+        border-bottom: 1px #EEE solid;
     }
-    .menu-expanded {
-      flex: 0 0 230px;
-      width: 230px;
+
+    .popover-item {
+        padding: 10px;
+        border-bottom: 1px #EEE solid;
     }
-    .content-container {
-      // background: #f8f8f8;
-      //f1f2f7
-      flex: 1;
-      width: 80%;
-      // position: absolute;
-      // right: 0px;
-      // top: 0px;
-      // bottom: 0px;
-      // left: 230px;
-      // overflow-y: scroll;
-      padding: 20px;
-      .breadcrumb-container {
-        //margin-bottom: 15px;
-        .title {
-          width: 200px;
-          float: left;
-          color: #475669;
-        }
-        .breadcrumb-inner {
-          float: right;
-        }
-      }
-      .content-wrapper {
-        background-color: #fff;
-        box-sizing: border-box;
-      }
+
+    .popover-item > p {
+        margin: 0;
+        line-height: 18px;
+    }
+
+    .popover-title {
+        color: #409eff;
+        padding-bottom: 8px;
     }
-  }
-}
 
-.popover-main {
-  font-weight: 700;
-  padding: 10px;
-  border-bottom: 1px #EEE solid;
-}
-.popover-item {
-  padding: 10px;
-  border-bottom: 1px #EEE solid;
-}
-.popover-item > p {
-  margin: 0;
-  line-height: 18px;
-}
-.popover-title {
-  color: #409eff;
-  padding-bottom: 8px;
-}
-.popover-type {
-  color: #aaa;
-  font-size: 8px;
-  float: right;
-}
-.popover-button {
-  font-weight: 900;
-  padding: 10px;
-  text-align: center;
-  cursor: pointer;
-}
+    .popover-type {
+        color: #aaa;
+        font-size: 8px;
+        float: right;
+    }
+
+    .popover-button {
+        font-weight: 900;
+        padding: 10px;
+        text-align: center;
+        cursor: pointer;
+    }
 </style>

+ 0 - 4
ys_vue/src/views/Login.vue

@@ -11,7 +11,6 @@
             <el-form-item class="login-input" prop="password">
                 <el-input type="password" v-model="ruleForm.password" @keyup.enter.native="handleSubmit" autocomplete="off" placeholder="密码" show-password prefix-icon="el-icon-lock"></el-input>
             </el-form-item>
-            <!-- <el-checkbox v-model="checked" checked class="remember">记住密码</el-checkbox> -->
             <el-form-item class="login-button" style="width:100%;">
                 <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit" :loading="logining">登录</el-button>
             </el-form-item>
@@ -23,9 +22,6 @@
 </template>
 
 <script>
-    //import { requestLogin } from '../api/api';
-    //import NProgress from 'nprogress'
-
     export default {
         data() {
             return {

+ 0 - 15
ys_vue/src/views/Main.vue

@@ -1,15 +0,0 @@
-<template>
-	<section>
-		main
-	</section>
-</template>
-
-<script>
-	export default {
-	}
-
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 216
ys_vue/src/views/charts/echarts.vue

@@ -1,216 +0,0 @@
-<template>
-    <section class="chart-container">
-        <el-row>
-            <el-col :span="12">
-                <div id="chartColumn" style="width:100%; height:400px;"></div>
-            </el-col>
-            <el-col :span="12">
-                <div id="chartBar" style="width:100%; height:400px;"></div>
-            </el-col>
-            <el-col :span="12">
-                <div id="chartLine" style="width:100%; height:400px;"></div>
-            </el-col>
-            <el-col :span="12">
-                <div id="chartPie" style="width:100%; height:400px;"></div>
-            </el-col>
-            <el-col :span="24">
-                <a href="http://echarts.baidu.com/examples.html" target="_blank" style="float: right;">more>></a>
-            </el-col>
-        </el-row>
-    </section>
-</template>
-
-<script>
-    import echarts from 'echarts'
-
-    export default {
-        data() {
-            return {
-                chartColumn: null,
-                chartBar: null,
-                chartLine: null,
-                chartPie: null
-            }
-        },
-
-        methods: {
-            drawColumnChart() {
-                this.chartColumn = echarts.init(document.getElementById('chartColumn'));
-                this.chartColumn.setOption({
-                  title: { text: 'Column Chart' },
-                  tooltip: {},
-                  xAxis: {
-                      data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"]
-                  },
-                  yAxis: {},
-                  series: [{
-                      name: '销量',
-                      type: 'bar',
-                      data: [5, 20, 36, 10, 10, 20]
-                    }]
-                });
-            },
-            drawBarChart() {
-                this.chartBar = echarts.init(document.getElementById('chartBar'));
-                this.chartBar.setOption({
-                    title: {
-                        text: 'Bar Chart',
-                        subtext: '数据来自网络'
-                    },
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'shadow'
-                        }
-                    },
-                    legend: {
-                        data: ['2011年', '2012年']
-                    },
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '3%',
-                        containLabel: true
-                    },
-                    xAxis: {
-                        type: 'value',
-                        boundaryGap: [0, 0.01]
-                    },
-                    yAxis: {
-                        type: 'category',
-                        data: ['巴西', '印尼', '美国', '印度', '中国', '世界人口(万)']
-                    },
-                    series: [
-                        {
-                            name: '2011年',
-                            type: 'bar',
-                            data: [18203, 23489, 29034, 104970, 131744, 630230]
-                        },
-                        {
-                            name: '2012年',
-                            type: 'bar',
-                            data: [19325, 23438, 31000, 121594, 134141, 681807]
-                        }
-                    ]
-                });
-            },
-            drawLineChart() {
-                this.chartLine = echarts.init(document.getElementById('chartLine'));
-                this.chartLine.setOption({
-                    title: {
-                        text: 'Line Chart'
-                    },
-                    tooltip: {
-                        trigger: 'axis'
-                    },
-                    legend: {
-                        data: ['邮件营销', '联盟广告', '搜索引擎']
-                    },
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '3%',
-                        containLabel: true
-                    },
-                    xAxis: {
-                        type: 'category',
-                        boundaryGap: false,
-                        data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
-                    },
-                    yAxis: {
-                        type: 'value'
-                    },
-                    series: [
-                        {
-                            name: '邮件营销',
-                            type: 'line',
-                            stack: '总量',
-                            data: [120, 132, 101, 134, 90, 230, 210]
-                        },
-                        {
-                            name: '联盟广告',
-                            type: 'line',
-                            stack: '总量',
-                            data: [220, 182, 191, 234, 290, 330, 310]
-                        },
-                        {
-                            name: '搜索引擎',
-                            type: 'line',
-                            stack: '总量',
-                            data: [820, 932, 901, 934, 1290, 1330, 1320]
-                        }
-                    ]
-                });
-            },
-            drawPieChart() {
-                this.chartPie = echarts.init(document.getElementById('chartPie'));
-                this.chartPie.setOption({
-                    title: {
-                        text: 'Pie Chart',
-                        subtext: '纯属虚构',
-                        x: 'center'
-                    },
-                    tooltip: {
-                        trigger: 'item',
-                        formatter: "{a} <br/>{b} : {c} ({d}%)"
-                    },
-                    legend: {
-                        orient: 'vertical',
-                        left: 'left',
-                        data: ['直接访问', '邮件营销', '联盟广告', '视频广告', '搜索引擎']
-                    },
-                    series: [
-                        {
-                            name: '访问来源',
-                            type: 'pie',
-                            radius: '55%',
-                            center: ['50%', '60%'],
-                            data: [
-                                { value: 335, name: '直接访问' },
-                                { value: 310, name: '邮件营销' },
-                                { value: 234, name: '联盟广告' },
-                                { value: 135, name: '视频广告' },
-                                { value: 1548, name: '搜索引擎' }
-                            ],
-                            itemStyle: {
-                                emphasis: {
-                                    shadowBlur: 10,
-                                    shadowOffsetX: 0,
-                                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-                                }
-                            }
-                        }
-                    ]
-                });
-            },
-            drawCharts() {
-                this.drawColumnChart()
-                this.drawBarChart()
-                this.drawLineChart()
-                this.drawPieChart()
-            },
-        },
-
-        mounted: function () {
-            this.drawCharts()
-        },
-        updated: function () {
-            this.drawCharts()
-        }
-    }
-</script>
-
-<style scoped>
-    .chart-container {
-        width: 100%;
-        float: left;
-    }
-    /*.chart div {
-        height: 400px;
-        float: left;
-    }*/
-
-    .el-col {
-        padding: 30px 20px;
-    }
-</style>

+ 22 - 29
ys_vue/src/views/detection/detection.vue

@@ -22,36 +22,29 @@
 
     <!--列表-->
     <el-table
-      :data="moulds"
-      :height="tableHeight"
-      highlight-current-row
-      v-loading="listLoading"
-      style="width: 100%;"
+        :data="moulds"
+        :height="tableHeight"
+        highlight-current-row
+        v-loading="listLoading"
+        style="width: 100%;"
     >
-      <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
-      <el-table-column label="模具名称" width="200" sortable>
-        <template slot-scope="scope">
-          <a
-            style="color: #409EFF; cursor: pointer"
-            @click="toMaintenance(scope.row.id)"
-          >{{scope.row.modelName}}</a>
-        </template>
-      </el-table-column>
-      <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
-      <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
-      <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
-      <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
-      <el-table-column prop="runTimes" label="运行次数" width="100" sortable></el-table-column>
-      <el-table-column prop="ocCycle" label="每模平均周期" width="140" sortable></el-table-column>
-      <el-table-column prop="hillNumber" label="电量" width="80" sortable></el-table-column>
-      <el-table-column prop="state" label="当前状态" width="100" sortable></el-table-column>
-      <el-table-column label="模具保养" width="100">
-        <template slot-scope="scope">
-          <span v-if="scope.row.runTimes > scope.row.initialModulus">需要</span>
-          <span v-else>不需要</span>
-        </template>
-      </el-table-column>
+        <el-table-column type="index" width="60"></el-table-column>
+        <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
+        <el-table-column prop="modelName" label="模具名称" width="200" sortable></el-table-column>
+        <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
+        <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
+        <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
+        <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
+        <el-table-column prop="runTimes" label="运行次数" align="center" width="100" sortable></el-table-column>
+        <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
+        <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
+        <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
+        <el-table-column label="模具保养" align="center" fixed="right" width="100">
+            <template slot-scope="scope">
+                <span v-if="scope.row.runTimes > scope.row.initialModulus"><a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">需要</a></span>
+                <span v-else><a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">不需要</a></span>
+            </template>
+        </el-table-column>
     </el-table>
 
     <!--工具条-->

+ 45 - 45
ys_vue/src/views/detection/maintenance.vue

@@ -2,64 +2,64 @@
   <section>
     <!--工具条-->
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true">
-        <el-form-item>
-          <el-button type="text" @click="backToDetection" icon="el-icon-back" class="back">返回</el-button>
-        </el-form-item>
-        <el-form-item class="divLine"></el-form-item>
-        <el-form-item>
-          当前保养状态:
-          <span style="color: #ff4949; margin-right: 16px;">需要</span>
-          <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
-        </el-form-item>
-        <el-form-item style="float:right;">
-          保养提醒
-          <el-switch v-model="prompt" active-color="#ff4949" disabled></el-switch>
-        </el-form-item>
-      </el-form>
+        <el-form :inline="true">
+            <el-form-item>
+                <el-button type="text" @click="backToDetection" icon="el-icon-back" class="back">返回</el-button>
+            </el-form-item>
+            <el-form-item class="divLine"></el-form-item>
+            <el-form-item>
+                当前保养状态:
+                <span style="color: #ff4949; margin-right: 16px;">需要</span>
+                <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
+            </el-form-item>
+            <el-form-item style="float:right;">
+                保养提醒
+                <el-switch v-model="prompt" active-color="#ff4949" disabled></el-switch>
+            </el-form-item>
+        </el-form>
     </el-col>
 
     <!--列表-->
     <el-table
-      :data="moulds"
-      highlight-current-row
-      :height="tableHeight"
-      v-loading="listLoading"
-      style="width: 100%;"
+        :data="moulds"
+        highlight-current-row
+        :height="tableHeight"
+        v-loading="listLoading"
+        style="width: 100%;"
     >
-      <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="maintenancer" label="保养人" width="100" sortable></el-table-column>
-      <el-table-column prop="plan" label="保养方案" width="100" sortable></el-table-column>
-      <el-table-column prop="picture" label="保养照片" width="100" sortable></el-table-column>
-      <el-table-column prop="closeTime" label="关闭时间" width="100" sortable></el-table-column>
-      <el-table-column prop="state" label="状态" width="100" sortable></el-table-column>
-      <el-table-column label="操作" width="220" sortable>
-        <el-button size="small">浏览</el-button>
-        <el-button size="small">下载</el-button>
-        <el-button type="danger" size="small">删除</el-button>
-      </el-table-column>
+        <el-table-column type="index" width="60"></el-table-column>
+        <el-table-column prop="maintenancer" label="保养人" width="100" sortable></el-table-column>
+        <el-table-column prop="plan" label="保养方案" sortable></el-table-column>
+        <el-table-column prop="picture" label="保养照片" width="100" sortable></el-table-column>
+        <el-table-column prop="closeTime" label="关闭时间" width="100" sortable></el-table-column>
+        <el-table-column prop="state" label="状态" align="center" width="100" sortable></el-table-column>
+        <el-table-column label="操作" width="220" align="center" sortable>
+            <el-button size="small">浏览</el-button>
+            <el-button size="small">下载</el-button>
+            <el-button type="danger" size="small">删除</el-button>
+        </el-table-column>
     </el-table>
 
     <!--工具条-->
     <el-col :span="24" class="toolbar">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[20 , 50 , 80 , 100 , 200]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[20 , 50 , 80 , 100 , 200]"
+            :page-size="20"
+            layout="total, sizes, prev, pager, next"
+            :total="total"
+            style="float:right;"
+        ></el-pagination>
     </el-col>
 
     <!--新增界面-->
     <el-dialog
-      title="处理保养"
-      v-if="maintenanceFormVisible"
-      :visible.sync="maintenanceFormVisible"
-      :close-on-click-modal="false"
-      customClass="customWidth"
+        title="处理保养"
+        v-if="maintenanceFormVisible"
+        :visible.sync="maintenanceFormVisible"
+        :close-on-click-modal="false"
+        customClass="customWidth"
     >
       <el-form
         :model="maintenanceForm"

+ 1 - 2
ys_vue/src/views/map/map.vue

@@ -39,14 +39,13 @@
                             marker.setMap(map);	
                             marker.msg = data[i];
                             marker.on('click', function(data){
-                                console.log(data)
                                 var str = "<div class='window'>" +
                                     "<div class='info-top'><div>"+ data.target.msg.companyName +"</div><i class='el-icon-close' @click='closeInfoWindow()'></i></div>" +
                                     "<div class='info-middle'>";
                                     for(var i in data.target.msg.list){
                                         str += "<div class='info-item'><a @click='jumpToMold("+ data.target.msg.list[i].id +")'>" + data.target.msg.list[i].modelName + "(" + data.target.msg.list[i].modelNo + ")</a>"
                                             if(data.target.msg.list[i].state=='0'){
-                                                str += "<span class='info-state'><span class='info-ball' style='background:#CD2626;'></span>静止</span>"
+                                                str += "<span class='info-state'><span class='info-ball' style='background:#999999;'></span>静止</span>"
                                             } else {
                                                 str += "<span class='info-state'><span class='info-ball' style='background:#00CD66;'></span>运行</span>"
                                             }

+ 76 - 73
ys_vue/src/views/message.vue

@@ -1,84 +1,87 @@
 <template>
-  <section>
-    <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true">
-        <el-col :span="2">
-          <el-form-item>全部消息</el-form-item>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true">
+                <el-col :span="2">
+                    <el-form-item>全部消息</el-form-item>
+                </el-col>
+            </el-form>
         </el-col>
-      </el-form>
-    </el-col>
-
-    <div class="message-div" v-for="item in messages">
-      <p>
-        <span class="message-type" v-if="item.noticeType == 0">【审批】</span>
-        <span class="message-type" v-else-if="item.noticeType == 1">【警告】</span>
-        <span class="message-type" v-else-if="item.noticeType == 2">【保养】</span>
-        <span class="message-title">{{item.projectName}}</span>
-        <span class="message-time">{{item.indate}}</span>
-      </p>
-      <p class="message-article">{{item.content}}</p>
-    </div>
-  </section>
+        <div class="message-div" v-for="item in messages">
+            <p>
+                <span class="message-type" v-if="item.noticeType == 0">【审批】</span>
+                <span class="message-type" v-else-if="item.noticeType == 1">【警告】</span>
+                <span class="message-type" v-else-if="item.noticeType == 2">【保养】</span>
+                <span class="message-title">{{item.projectName}}</span>
+                <span class="message-time">{{item.indate}}</span>
+            </p>
+            <p class="message-article">{{item.content}}</p>
+        </div>
+    </section>
 </template>
 
 <script>
-import util from "../common/js/util";
-export default {
-  data() {
-    return {
-      messages: []
-    };
-  },
-  methods: {
-    //读取消息提示
-    loadNotice() {
-      this.http.post(
-        this.port.notice.list,
-        {},
-        res => {
-          if (res.code == "ok") {
-            this.messages = res.data.list;
-            console.log(this.messages);
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
+    import util from "../common/js/util";
+    export default {
+        data() {
+            return {
+            messages: []
+            };
         },
-        error => {
-          this.$message({
-            message: error,
-            type: "error"
-          });
+        methods: {
+            //读取消息提示
+            loadNotice() {
+            this.http.post(
+                this.port.notice.list,
+                {},
+                res => {
+                if (res.code == "ok") {
+                    this.messages = res.data.list;
+                    console.log(this.messages);
+                } else {
+                    this.$message({
+                    message: res.msg,
+                    type: "error"
+                    });
+                }
+                },
+                error => {
+                this.$message({
+                    message: error,
+                    type: "error"
+                });
+                }
+            );
+            }
+        },
+        created() {},
+        mounted() {
+            this.loadNotice();
         }
-      );
-    }
-  },
-  created() {},
-  mounted() {
-    this.loadNotice();
-  }
-};
+    };
 </script>
 
 <style scoped>
-.message-div {
-  padding: 5px 0;
-}
-.message-div > p {
-  line-height: 25px;
-  margin: 0;
-}
-.message-type {
-  font-weight: 700;
-}
-.message-time {
-  padding-left: 30px;
-  color: #777;
-}
-.message-article {
-  color: #555;
-}
+    .message-div {
+        padding: 5px 0;
+    }
+
+    .message-div > p {
+        line-height: 25px;
+        margin: 0;
+    }
+
+    .message-type {
+        font-weight: 700;
+    }
+
+    .message-time {
+        padding-left: 30px;
+        color: #777;
+    }
+
+    .message-article {
+        color: #555;
+    }
 </style>

+ 1 - 1
ys_vue/src/views/mold/moldDetail.vue

@@ -12,7 +12,7 @@
             </el-form-item>
             <el-form-item class="state">
                 当前状态:
-                <a style="color: #CD2626; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 0">静止</a>
+                <a style="color: #999999; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 0">静止</a>
                 <a style="color: #00CD66; cursor: pointer" @click="toDetection" v-if="moldDetail.state == 1">运行</a>
                 <span class="tips">(点击查看运行状态)</span>
             </el-form-item>

+ 1 - 1
ys_vue/src/views/mold/moldList.vue

@@ -52,7 +52,7 @@
             <el-table-column label="状态" width="100" align="center" sortable>
                     <template slot-scope="scope">
                     <span v-if="scope.row.state == 1" style="color:#00CD66;">运行</span>
-                    <span v-else style="color:#CD2626;">静止</span>
+                    <span v-else style="color:#999999;">静止</span>
                     </template>
             </el-table-column>
             <el-table-column label="操作" width="150" align="center" fixed="right" sortable v-if="user.parentId == 1">

+ 0 - 103
ys_vue/src/views/nav1/Form.vue

@@ -1,103 +0,0 @@
-<template>
-	<el-form ref="form" :model="form" label-width="80px" @submit.prevent="onSubmit" style="margin:20px;width:60%;min-width:600px;">
-		<el-form-item label="活动名称">
-			<el-input v-model="form.name"></el-input>
-		</el-form-item>
-		<el-form-item label="活动区域">
-			<el-select v-model="form.region" placeholder="请选择活动区域">
-				<el-option label="区域一" value="shanghai"></el-option>
-				<el-option label="区域二" value="beijing"></el-option>
-			</el-select>
-		</el-form-item>
-		<el-form-item label="活动时间">
-			<el-col :span="11">
-				<el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker>
-			</el-col>
-			<el-col class="line" :span="2">-</el-col>
-			<el-col :span="11">
-				<el-time-picker type="fixed-time" placeholder="选择时间" v-model="form.date2" style="width: 100%;"></el-time-picker>
-			</el-col>
-		</el-form-item>
-		<el-form-item label="即时配送">
-			<el-switch on-text="" off-text="" v-model="form.delivery"></el-switch>
-		</el-form-item>
-		<el-form-item label="活动性质">
-			<el-checkbox-group v-model="form.type">
-				<el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
-				<el-checkbox label="地推活动" name="type"></el-checkbox>
-				<el-checkbox label="线下主题活动" name="type"></el-checkbox>
-				<el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
-			</el-checkbox-group>
-		</el-form-item>
-		<el-form-item label="特殊资源">
-			<el-radio-group v-model="form.resource">
-				<el-radio label="线上品牌商赞助"></el-radio>
-				<el-radio label="线下场地免费"></el-radio>
-			</el-radio-group>
-		</el-form-item>
-		<el-form-item label="活动形式">
-			<el-input type="textarea" v-model="form.desc"></el-input>
-		</el-form-item>
-		<el-form-item>
-			<el-button type="primary" @click.native="onSubmit()">立即创建</el-button>
-			<el-button @click.native.prevent>取消</el-button>
-		</el-form-item>
-	</el-form>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				form: {
-					name: '',
-					region: '',
-					date1: '',
-					date2: '',
-					delivery: false,
-					type: [],
-					resource: '',
-					desc: ''
-				}
-			}
-		},
-		methods: {
-			onSubmit() {
-                console.log(this.form)
-                console.log(123123)
-                this.markLocation('江苏省南京市雨花台区环山西路与艺苑路交叉口');
-				console.log('submit!');
-            },
-            markLocation: function(address) {
-                console.log(11123)
-                AMap.plugin('AMap.Geocoder', function() {
-                    var geocoder = new AMap.Geocoder();            
-                    geocoder.getLocation(address, function(status, result) {
-                        if (status === 'complete' && result.info === 'OK') {
-
-                            // 经纬度                      
-                            var lng = result.geocodes[0].location.lng;
-                            var lat = result.geocodes[0].location.lat;
-                            console.log(result.geocodes)
-                            // 地图实例
-                            // var map = new AMap.Map(mapId, {
-                            //     resizeEnable: true, // 允许缩放
-                            //     center: [lng, lat], // 设置地图的中心点
-                            //     zoom: 15        // 设置地图的缩放级别,0 - 20
-                            // });
-                                    
-                            // // 添加标记
-                            // var marker = new AMap.Marker({
-                            //     map: map,
-                            //     position: new AMap.LngLat(lng, lat),   // 经纬度
-                            // });
-                        } else {
-                            console.log('定位失败!');
-                        }
-                    });
-                });
-            }
-		}
-	}
-
-</script>

+ 0 - 303
ys_vue/src/views/nav1/Table.vue

@@ -1,303 +0,0 @@
-<template>
-	<section>
-		<!--工具条-->
-		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-			<el-form :inline="true" :model="filters">
-				<el-form-item>
-					<el-input v-model="filters.name" placeholder="姓名"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" v-on:click="getUsers">查询</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="handleAdd">新增</el-button>
-				</el-form-item>
-			</el-form>
-		</el-col>
-
-		<!--列表-->
-		<el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
-			<el-table-column type="selection" width="55">
-			</el-table-column>
-			<el-table-column type="index" width="60">
-			</el-table-column>
-			<el-table-column prop="name" label="姓名" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
-			</el-table-column>
-			<el-table-column prop="age" label="年龄" width="100" sortable>
-			</el-table-column>
-			<el-table-column prop="birth" label="生日" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="addr" label="地址" min-width="180" sortable>
-			</el-table-column>
-			<el-table-column label="操作" width="150">
-				<template slot-scope="scope">
-					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-
-		<!--工具条-->
-		<el-col :span="24" class="toolbar">
-			<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
-			<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="20" :total="total" style="float:right;">
-			</el-pagination>
-		</el-col>
-
-		<!--编辑界面-->
-		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
-			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="editForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
-				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="editForm.addr"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="editFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
-			</div>
-		</el-dialog>
-
-		<!--新增界面-->
-		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
-			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="addForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>
-				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.birth"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="addForm.addr"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="addFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
-			</div>
-		</el-dialog>
-	</section>
-</template>
-
-<script>
-	import util from '../../common/js/util'
-	//import NProgress from 'nprogress'
-	import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser } from '../../api/api';
-
-	export default {
-		data() {
-			return {
-				filters: {
-					name: ''
-				},
-				users: [],
-				total: 0,
-				page: 1,
-				listLoading: false,
-				sels: [],//列表选中列
-
-				editFormVisible: false,//编辑界面是否显示
-				editLoading: false,
-				editFormRules: {
-					name: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据
-				editForm: {
-					id: 0,
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				},
-
-				addFormVisible: false,//新增界面是否显示
-				addLoading: false,
-				addFormRules: {
-					name: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-					]
-				},
-				//新增界面数据
-				addForm: {
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				}
-
-			}
-		},
-		methods: {
-			//性别显示转换
-			formatSex: function (row, column) {
-				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
-			},
-			handleCurrentChange(val) {
-				this.page = val;
-				this.getUsers();
-			},
-			//获取用户列表
-			getUsers() {
-				let para = {
-					page: this.page,
-					name: this.filters.name
-				};
-				this.listLoading = true;
-				//NProgress.start();
-				getUserListPage(para).then((res) => {
-					this.total = res.data.total;
-					this.users = res.data.users;
-					this.listLoading = false;
-					//NProgress.done();
-				});
-			},
-			//删除
-			handleDel: function (index, row) {
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { id: row.id };
-					removeUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
-				});
-			},
-			//显示编辑界面
-			handleEdit: function (index, row) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面
-			handleAdd: function () {
-				this.addFormVisible = true;
-				this.addForm = {
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				};
-			},
-			//编辑
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗?', '提示', {}).then(() => {
-							this.editLoading = true;
-							//NProgress.start();
-							let para = Object.assign({}, this.editForm);
-							para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
-							editUser(para).then((res) => {
-								this.editLoading = false;
-								//NProgress.done();
-								this.$message({
-									message: '提交成功',
-									type: 'success'
-								});
-								this.$refs['editForm'].resetFields();
-								this.editFormVisible = false;
-								this.getUsers();
-							});
-						});
-					}
-				});
-			},
-			//新增
-			addSubmit: function () {
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗?', '提示', {}).then(() => {
-							this.addLoading = true;
-							//NProgress.start();
-							let para = Object.assign({}, this.addForm);
-							para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
-							addUser(para).then((res) => {
-								this.addLoading = false;
-								//NProgress.done();
-								this.$message({
-									message: '提交成功',
-									type: 'success'
-								});
-								this.$refs['addForm'].resetFields();
-								this.addFormVisible = false;
-								this.getUsers();
-							});
-						});
-					}
-				});
-			},
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-			//批量删除
-			batchRemove: function () {
-				var ids = this.sels.map(item => item.id).toString();
-				this.$confirm('确认删除选中记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { ids: ids };
-					batchRemoveUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
-				});
-			}
-		},
-		mounted() {
-			this.getUsers();
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 77
ys_vue/src/views/nav1/user.vue

@@ -1,77 +0,0 @@
-<template>
-	<section>
-		<!--工具条-->
-		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-			<el-form :inline="true" :model="filters">
-				<el-form-item>
-					<el-input v-model="filters.name" placeholder="姓名"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" v-on:click="getUser">查询</el-button>
-				</el-form-item>
-			</el-form>
-		</el-col>
-
-		<!--列表-->
-		<template>
-			<el-table :data="users" highlight-current-row v-loading="loading" style="width: 100%;">
-				<el-table-column type="index" width="60">
-				</el-table-column>
-				<el-table-column prop="name" label="姓名" width="120" sortable>
-				</el-table-column>
-				<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
-				</el-table-column>
-				<el-table-column prop="age" label="年龄" width="100" sortable>
-				</el-table-column>
-				<el-table-column prop="birth" label="生日" width="120" sortable>
-				</el-table-column>
-				<el-table-column prop="addr" label="地址" min-width="180" sortable>
-				</el-table-column>
-			</el-table>
-		</template>
-
-	</section>
-</template>
-<script>
-	import { getUserList } from '../../api/api';
-	//import NProgress from 'nprogress'
-	export default {
-		data() {
-			return {
-				filters: {
-					name: ''
-				},
-				loading: false,
-				users: [
-				]
-			}
-		},
-		methods: {
-			//性别显示转换
-			formatSex: function (row, column) {
-				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
-			},
-			//获取用户列表
-			getUser: function () {
-				let para = {
-					name: this.filters.name
-				};
-				this.loading = true;
-				//NProgress.start();
-				getUserList(para).then((res) => {
-					this.users = res.data.users;
-					this.loading = false;
-					//NProgress.done();
-				});
-			}
-		},
-		mounted() {
-			this.getUser();
-		}
-	};
-
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 33
ys_vue/src/views/nav2/Page4.vue

@@ -1,33 +0,0 @@
-<template>
-  <div>
-    <h1>vuex 测试</h1>
-    Clicked: {{ getCount }} times
-    <button @click="increment">+</button>
-    <button @click="decrement">-</button>
-  </div>
-</template>
-
-<script>
-  import { mapGetters } from 'vuex'
-  import { mapActions } from 'vuex'
-
-  export default {
-    computed: {
-  	// 使用对象展开运算符将 getters 混入 computed 对象中
-    ...mapGetters([
-      'getCount'
-      // ...
-    ])
-    },
-    methods: {
-    ...mapActions([
-      'increment', // 映射 this.increment() 为 this.$store.dispatch('increment')
-      'decrement'
-    ])
-      //...mapActions({
-      //  add: 'increment' // 映射 this.add() 为 this.$store.dispatch('increment')
-      //})
-    }
-  }
-
-</script>

+ 0 - 4
ys_vue/src/views/nav2/Page5.vue

@@ -1,4 +0,0 @@
-<template>
-	<section>page5...
-	</section>
-</template>

+ 0 - 4
ys_vue/src/views/nav3/Page6.vue

@@ -1,4 +0,0 @@
-<template>
-	<section>page6...
-	</section>
-</template>

+ 3 - 5
ys_vue/src/views/project/project.vue

@@ -24,9 +24,9 @@
                     <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.projectName}}</el-link>
 				</template>
 			</el-table-column>
-            <el-table-column prop="customCompaniesStr" label="生产方公司" width="550">
+            <el-table-column prop="customCompaniesStr" label="生产方公司" width="500">
 			</el-table-column>
-            <el-table-column prop="manager" label="项目经理" align="center" sortable>
+            <el-table-column prop="manager" label="项目经理" width="100" align="center" sortable>
 			</el-table-column>
 			<!-- <el-table-column prop="creator" label="项目创建人" align="center"  sortable>
 			</el-table-column> -->
@@ -126,9 +126,7 @@
 				addForm: {
 					projectName: '',
                     customerCompany: [],
-                    managerId: '',
-                    // userA: [],
-                    // userB: []
+                    managerId: ''
 				}
 
 			}