Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

components/page/dataGrid.vue

@@ -111,7 +111,7 @@
         <slot name="batch"></slot>
       </div>
 
-      <Button @click="cancelFooterToolbar">取消</Button>
+      <Button @click="cancelFooterToolbar" class="btn">取消</Button>
     </FooterToolbar>
   </div>
 </template>
@@ -477,10 +477,9 @@ export default {
     selectAll(status) {
       this.$refs.table.selectAll(status);
     },
-    cancelFooterToolbar()
-    {
+    cancelFooterToolbar() {
       this.$refs.table.selectAll(false);
-      this.footerToolbar=false
+      this.footerToolbar = false;
     }
   },
   computed: {

pages/account/login/index.vue

@@ -14,9 +14,9 @@
         <div class="bg bg3">1</div>
       </CarouselItem>
     </Carousel>
-    <div v-if="showI18n" class="page-account-header">
+    <!-- <div v-if="showI18n" class="page-account-header">
       <i-header-i18n />
-    </div>
+    </div> -->
     <div class="main">
       <div class="ad">
         <img src="@/assets/images/login/ad.png" />

pages/aps/dispatch/dispatch.less

@@ -31,6 +31,13 @@
     .dispatch_part_body{
         padding: 10px;
         overflow-y: auto;
+        .h3_bg{
+            background: #a5adbf;
+            padding: 0 0 0 10px;
+            .h3_tag{
+                margin-left: 15px!important;
+            }
+        }
         .dispatch_card{
             margin: 10px 0;
             .card{

pages/resourceManagement/productionResources/api.js

@@ -17,6 +17,9 @@ export default {
     update(params) {
         return Api.post(`${systemUrl}/equipcalendarwork/createorupdate`, params);
     },
+    set(params) {
+        return Api.post(`${systemUrl}/planresource/setplanresource`, params);
+    },
     //删除：
     delete(params) {
         return Api.delete(`${systemUrl}/planresource/delete`, { params: params });

pages/resourceManagement/productionResources/index.vue

 <template>
-  <div>
-    <DataGrid :columns="columns" ref="grid" :action="action" :high="false">
+  <div class="resources-p">
+    <DataGrid
+      :columns="columns"
+      ref="grid"
+      :action="action"
+      :high="false"
+      @on-selection-change="onSelect"
+    >
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
-            <Input placeholder="请输入关键字资源名称/资源编号/资源类型/部门" v-model="easySearch.keys.value" />
+            <Input placeholder="请输入资源名称/编号/类型/部门" v-model="easySearch.keys.value" />
           </FormItem>
           <FormItem>
             <Button type="primary" @click="search">查询</Button>
           </FormItem>
         </Form>
       </template>
+      <template slot="batch">
+        <Form ref="form" :model="entity" :rules="rules" :label-width="90" class="form-row">
+          <Row>
+            <Col span="8">
+              <FormItem :label="l('isimportant')" prop="isimportant">
+                <RadioGroup v-model="entity.isimportant">
+                  <Radio label="0">是</Radio>
+                  <Radio label="1">否</Radio>
+                </RadioGroup>
+              </FormItem>
+            </Col>
+            <Col span="12">
+              <FormItem :label="l('capabilityValue')">
+                <InputNumber v-model="entity.capabilityValue"></InputNumber>
+              </FormItem>
+            </Col>
+            <Col span="4">
+              <FormItem>
+                <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
+              </FormItem>
+            </Col>
+          </Row>
+        </Form>
+      </template>
     </DataGrid>
 
     <Modal v-model="editModal" title="编辑" footer-hide>
@@ -38,14 +68,23 @@ export default {
       easySearch: {
         keys: { op: "title,code,type,departTitle", value: null }
       },
-
+      entity: {},
+      disabled: false,
+      ids: [],
       editModal: false,
-
       deletelModal: false,
       curId: 0,
+      rules: {
+        isimportant: [{ required: true, message: "必填", trigger: "blur" }],
+        capabilityValue: [{ required: true, message: "必填", trigger: "blur" }]
+      },
       columns: [
         { key: "id", title: this.l("id"), hide: true, align: "left" },
-
+        {
+          type: "selection",
+          width: 70,
+          align: "center"
+        },
         // {
         //   key: "deleterUserId",
         //   title: this.l("deleterUserId"),
@@ -194,6 +233,46 @@ export default {
       this.editModal = false;
       this.deletedlModal = false;
     },
+    onSelect(a, b) {
+      console.log(a);
+      //批量选择
+      let selectRows = a;
+      this.ids = [];
+      selectRows.forEach(e => {
+        this.ids.push(e.id);
+      });
+    },
+
+    handleSubmit() {
+      this.$refs.form.validate(v => {
+        if (v) {
+          this.disabled = true;
+          let data = {
+            ids: this.ids,
+            isimportant: this.entity.isimportant,
+            capabilityValue: this.entity.capabilityValue
+          };
+          Api.set(data)
+            .then(r => {
+              this.disabled = false;
+              if (r.success) {
+                this.$Message.success("保存成功");
+              } else {
+                this.$Message.error("保存失败");
+              }
+            })
+            .catch(err => {
+              this.disabled = false;
+              this.$Message.error("保存失败");
+              console.warn(err);
+            });
+        }
+      });
+    },
+    handleClose() {
+      this.footer = false;
+      this.handleSelectAll(false);
+    },
     l(key) {
       let vkey = "plan_resource" + "." + key;
       return this.$t(vkey) || key;
@@ -202,4 +281,24 @@ export default {
 };
 </script>
 <style lang="less">
+.resources-p {
+  .form-row {
+    width: 600px;
+    margin-left: 50px;
+    margin-top: -45px;
+
+    .ivu-form-item-label {
+      color: #fff !important;
+    }
+  }
+  .ivu-footer-toolbar-right {
+    width: 1100px;
+    position: relative !important;
+  }
+  .btn {
+    position: absolute !important;
+    top: 12px !important;
+    right: 40px !important;
+  }
+}
 </style>
\ No newline at end of file

plugins/request/index.js

 import axios from 'axios';
-import util from '@/libs/util';
+import util from '@/libs/util'; 
 import Setting from '@/setting';
 import QS from 'querystring';
 import { Message, Notice } from 'view-design';

static/Dockerfile

+FROM  nginx
+WORKDIR /usr/share/nginx/html
+COPY dist/ .
+COPY nginx.conf /etc/nginx/nginx.conf 
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+EXPOSE 3006
+ENTRYPOINT ["nginx", "-g","daemon off;"]

static/nginx.conf

+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+	  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+						  '$status $body_bytes_sent "$http_referer" '
+						  '"$http_user_agent" "$http_x_forwarded_for"';
+	  access_log  /var/log/nginx/access.log  main;
+	  
+	  sendfile            on;
+	  tcp_nopush          on;
+	  tcp_nodelay         on;
+	  keepalive_timeout   65;
+	  types_hash_max_size 2048;
+
+	  include             /etc/nginx/mime.types;
+	  default_type        application/octet-stream;
+	  include /etc/nginx/conf.d/*.conf;
+
+	  server {
+	   listen 3006;
+	   root  /usr/share/nginx/html;
+
+	   location / {
+			 try_files  $uri $uri/ @router;
+			 index  index.html  index.htm;
+	   }
+	   location @router {
+		  rewrite ^.*$.index.html last;
+	   }
+	 }
+  
+}
+