diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8c68c6b..5f24dd5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/jinzhi/jinzhi.iml" filepath="$PROJECT_DIR$/jinzhi/jinzhi.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jisuan/jisuan.iml" filepath="$PROJECT_DIR$/jisuan/jisuan.iml" />
       <module fileurl="file://$PROJECT_DIR$/test6298.iml" filepath="$PROJECT_DIR$/test6298.iml" />
     </modules>
   </component>
diff --git a/jisuan/jisuan.iml b/jisuan/jisuan.iml
new file mode 100644
index 0000000..c90834f
--- /dev/null
+++ b/jisuan/jisuan.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/jisuan/src/Main.java b/jisuan/src/Main.java
new file mode 100644
index 0000000..3e59c38
--- /dev/null
+++ b/jisuan/src/Main.java
@@ -0,0 +1,5 @@
+public class Main {
+    public static void main(String[] args) {
+        System.out.println("Hello world!");
+    }
+}
\ No newline at end of file
diff --git a/jisuan/src/jisuan1.java b/jisuan/src/jisuan1.java
new file mode 100644
index 0000000..6f7cfb1
--- /dev/null
+++ b/jisuan/src/jisuan1.java
@@ -0,0 +1,211 @@
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class jisuan1{
+    public static void main(String[] args) {
+        JS win=new JS();
+    }
+}
+class JS extends JFrame implements ActionListener{
+    private StringBuilder sBuilder = new StringBuilder();
+    JTextArea text=new JTextArea();
+    double a,b;
+    Double sum;
+    int i;
+    public JS()
+    {
+        setBounds(100,100,400,400);
+        setTitle("计算器");
+        this.setLayout(new BorderLayout());
+        JPanel p1=new JPanel();
+        JPanel p2=new JPanel();
+        text.setPreferredSize(new Dimension (370,60));
+        p2.setLayout(new FlowLayout());
+        p1.add(text);
+        this.add(p1,BorderLayout.NORTH);
+
+
+        p2.setLayout(new GridLayout(5,4));
+        JButton button[]=new JButton[20];
+        button[0]=new JButton("C");
+        button[1]=new JButton(" ");
+        button[2]=new JButton("%");
+        button[3]=new JButton("÷");
+        button[4]=new JButton("7");
+        button[5]=new JButton("8");
+        button[6]=new JButton("9");
+        button[7]=new JButton("x");
+        button[8]=new JButton("4");
+        button[9]=new JButton("5");
+        button[10]=new JButton("6");
+        button[11]=new JButton("—");
+        button[12]=new JButton("1");
+        button[13]=new JButton("2");
+        button[14]=new JButton("3");
+        button[15]=new JButton("+");
+        button[16]=new JButton("");
+        button[17]=new JButton("0");
+        button[18]=new JButton(".");
+        button[19]=new JButton("=");
+
+        for(int i=0;i<button.length;i++ )
+            p2.add(button[i]);
+        p2.add(button[19]);
+        add(p2,BorderLayout.CENTER);
+
+        for(int i=0;i<button.length;i++)
+            button[i].addActionListener(this);
+        this.setVisible(true);
+        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    }
+
+    public void actionPerformed(ActionEvent e)
+    {
+        String lab=e.getActionCommand();
+
+        if(lab.equals("0"))
+        {
+            sBuilder.append("0");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("1"))
+        {
+            sBuilder.append("1");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("2"))
+        {
+            sBuilder.append("2");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("3"))
+        {
+            sBuilder.append("3");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("4"))
+        {
+            sBuilder.append("4");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("5"))
+        {
+            sBuilder.append("5");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("6"))
+        {
+            sBuilder.append("6");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("7"))
+        {
+            sBuilder.append("7");
+            text.setText(sBuilder.toString());
+        }
+
+        else if(lab.equals("8"))
+        {
+            sBuilder.append("8");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("9"))
+        {
+            sBuilder.append("9");
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("C"))
+        {
+            sBuilder = new StringBuilder();
+            text.setText(sBuilder.toString());
+        }
+        else if(lab.equals("."))
+        {
+            sBuilder.append(".");
+            text.setText(sBuilder.toString());
+        }
+
+        else if(lab.equals("+"))
+        {
+            a = Double.parseDouble(sBuilder.toString());
+            i=0;
+            sBuilder = new StringBuilder();
+            text.setText("+");
+        }
+        else if(lab.equals("—"))
+        {
+            a = Double.parseDouble(sBuilder.toString());
+            i=1;
+            sBuilder = new StringBuilder();
+            text.setText("—");
+        }
+        else if(lab.equals("x"))
+        {
+            a = Double.parseDouble(sBuilder.toString());
+            i=2;
+            sBuilder = new StringBuilder();
+            text.setText("x");
+        }
+        else if(lab.equals("÷"))
+        {
+            i=3;
+            a = Double.parseDouble(sBuilder.toString());
+            sBuilder = new StringBuilder();
+            text.setText("÷");
+        }
+
+        else if(lab.equals("%"))
+        {
+            a = Double.parseDouble(sBuilder.toString());
+            i=4;
+            sBuilder = new StringBuilder();
+            text.setText("%");
+        }
+        else if(lab.equals("="))
+        {
+            b = Double.parseDouble(sBuilder.toString());
+            if (i == 0)
+            {
+                sum=a+b;
+                text.setText(sum.toString());
+                sBuilder = new StringBuilder();
+                sBuilder.append(sum);
+            }
+            else if (i == 1)
+            {
+                sum = a - b;
+                text.setText(sum.toString());
+                sBuilder = new StringBuilder();
+                sBuilder.append(sum);
+            }
+            else if (i == 2)
+            {
+                sum = a * b;
+                text.setText(sum.toString());
+                sBuilder = new StringBuilder();
+                sBuilder.append(sum);
+            }
+            else if (i == 3)
+            {
+                sum = a / b;
+                text.setText(sum.toString());
+                sBuilder = new StringBuilder();
+                sBuilder.append(sum);
+            }
+            else if (i == 4)
+            {
+                sum=a % b;
+                int m=(int)a;
+                int n=(int)b;
+                sum=(double)m % n;
+                text.setText(sum.toString());
+                sBuilder = new StringBuilder();
+                sBuilder.append(sum);
+            }
+            else
+                text.setText(sBuilder.toString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/out/production/jisuan/JS.class b/out/production/jisuan/JS.class
new file mode 100644
index 0000000..b82e548
Binary files /dev/null and b/out/production/jisuan/JS.class differ
diff --git a/out/production/jisuan/Main.class b/out/production/jisuan/Main.class
new file mode 100644
index 0000000..baa3095
Binary files /dev/null and b/out/production/jisuan/Main.class differ
diff --git a/out/production/jisuan/jisuan1.class b/out/production/jisuan/jisuan1.class
new file mode 100644
index 0000000..cb33213
Binary files /dev/null and b/out/production/jisuan/jisuan1.class differ